Changeset 1754

Timestamp:

14/11/11 14:32:57 (6 months ago)

Author:

Freddie Akeroyd

Message:

Enable python by default. Refs #302

Location:

trunk

Files:

• acinclude.m4 (modified) (2 diffs)
• configure.ac (modified) (2 diffs)

trunk/acinclude.m4

@@ -125 +125 @@
 #                                 path/bin/files and then work out path
 # $4 = file in path to locate
+# $5 = default withval
 #
 # e.g. AC_CHECK_ROOT([tcl],[TCLROOT],[/usr /usr/local],[include/tcl.h])
@@ -136 +137 @@
                        [Specify absolute path to root of $1 install directory.]),
         [if test x$withval != xno -a x$withval != xyes; then $2=$withval; fi], 
-        [with_$1=no])
+        [with_$1=$5])
     if test x$with_$1 != xno; then
         AC_MSG_CHECKING(for $1 root installation directory)

trunk/configure.ac

@@ -244 +244 @@
 
 if test x$with_tcl != xno; then
-    AC_CHECK_ROOT([tcl],[TCLROOT],[/usr /usr/local],[include/tcl.h])
+    AC_CHECK_ROOT([tcl],[TCLROOT],[/usr /usr/local],[include/tcl.h],[no])
 fi
 if test x$with_guile != xno; then
-    AC_CHECK_ROOT([guile],[GUILEROOT],[/usr /usr/local],[include/libguile.h])
+    AC_CHECK_ROOT([guile],[GUILEROOT],[/usr /usr/local],[include/libguile.h],[no])
 fi
 if test x$with_opengenie != xno; then
-    AC_CHECK_ROOT([opengenie],[OPENGENIEROOT],[/usr/local],[genie/genie.so])
+    AC_CHECK_ROOT([opengenie],[OPENGENIEROOT],[/usr/local],[genie/genie.so],[no])
 fi
 if test x$with_python != xno; then
-    AC_CHECK_ROOT([python],[PYTHONROOT],[/usr /usr/local],[bin/python])
+    AC_CHECK_ROOT([python],[PYTHONROOT],[/usr /usr/local],[bin/python],[yes])
     if test x$PYTHONROOT != x; then
         if test -r "$PYTHONROOT/bin/python"; then PYTHON="$PYTHONROOT/bin/python"; fi
@@ -725 +725 @@
 AM_CONDITIONAL(HAVE_F77, [test "$with_f77" != "no"])
 AM_CONDITIONAL(HAVE_F90, [test "$with_f90" != "no"])
-AM_CONDITIONAL(HAVE_PYTHON, [test ! -z "$PYTHONROOT" -a "$PYTHON_numpy" -eq 1])
+AM_CONDITIONAL(HAVE_PYTHON, [test ! -z "$PYTHONROOT" -a "$PYTHON_numpy_found"  = "yes"])
 AM_CONDITIONAL(HAVE_TCL, [test ! -z "$TCLROOT"])
 AM_CONDITIONAL(HAVE_GUILE, [test ! -z "$GUILEROOT"])