Changeset 29 for trunk

Timestamp:

Sep 24, 2010, 4:10:10 PM (14 years ago)

Author:

david

Message:

-modification compilation support python, possibilité de compiler sans le support python

File:

• trunk/zoo-kernel/configure.ac (modified) (1 diff)

trunk/zoo-kernel/configure.ac

@@ -128 +128 @@
 # ===========================================================================
 
+
+
+
 AC_ARG_WITH([python], 
-        [AS_HELP_STRING([--with-python=PATH], [specify an alternative directory for python installation])], 
-        [PYTHONCONFIG="$withval/bin/python-config"], [PYTHONCONFIG=""])
-
-if test "x$PYTHONCONFIG" = "x"; then
-        # PYTHON was not specified, so search within the current path
-        AC_PATH_PROG([PYTHONCONFIG], [python-config])
-
-        # If we couldn't find python-config, display a warning
-        if test "x$PYTHONCONFIG" = "x"; then
-                AC_MSG_ERROR([could not find python-config from libpython within the current path. You may need to try re-running configure with a --with-python parameter.])
-        fi
-else
-        # PYTHON was specified; display a message to the user
-        if test "x$PYTHON" = "xyes"; then
-                AC_MSG_ERROR([you must specify a parameter to --with-python, e.g. --with-python=/path/to/python])
-        else
-                if test -f $PYTHONCONFIG; then
-                        AC_MSG_RESULT([Using user-specified python-config file: $PYTHONCONFIG])
-                else
-                        AC_MSG_ERROR([the user-specified python-config file $PYTHONCONFIG does not exist])
-                fi      
-        fi
-fi
-
-
-# Extract the linker and include flags 
-PYTHON_LDFLAGS=`$PYTHONCONFIG --libs`
-PYTHON_CPPFLAGS=`$PYTHONCONFIG --cflags`
-
-# Check headers file
-CPPFLAGS_SAVE="$CPPFLAGS"
-CPPFLAGS="$PYTHON_CPPFLAGS"
-AC_CHECK_HEADERS([Python.h],
+        [AS_HELP_STRING([--with-python=PATH], [To enabled python support or specify an alternative directory for python installation,  disabled by default])], 
+        [PYTHON_PATH="$withval"; PYTHON_ENABLED="-DUSE_PYTHON"], [PYTHON_ENABLED=""])
+
+
+if test -z "$PYTHON_ENABLED"
+then
+        PYTHON_FILE=""
+else
+        PYTHONCONFIG="$PYTHON_PATH/bin/python-config"
+        PYTHON_FILE="service_internal_python.o"
+        if test  "$PYTHON_PATH" = "yes"
+        then
+                # PHP was not specified, so search within the current path
+                AC_PATH_PROG([PYTHONCONFIG], [python-config])
+        else
+                PYTHONCONFIG="$PYTHON_PATH/bin/python-config"
+        fi
+
+        # Extract the linker and include flags 
+        PYTHON_LDFLAGS=`$PYTHONCONFIG --ldflags`
+        PYTHON_CPPFLAGS=`$PYTHONCONFIG --cflags`
+
+        # Check headers file
+        CPPFLAGS_SAVE="$CPPFLAGS"
+        CPPFLAGS="$PYTHON_CPPFLAGS"
+        AC_CHECK_HEADERS([Python.h],
                  [], [AC_MSG_ERROR([could not find headers include related to libpython])])
 
-# Ensure we can link against libpython
-LIBS_SAVE="$LIBS"
-LIBS="$PYTHON_LDFLAGS"
-# Shouldn't we get python here rather than python2.6 :) ??
-PY_LIB=`$PYTHONCONFIG --libs | sed -e 's/^.*\(python2\..\)$/\1/'`
-AC_CHECK_LIB([$PY_LIB], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])
-
-AC_SUBST([PYTHON_CPPFLAGS])
-AC_SUBST([PYTHON_LDFLAGS])
+        # Ensure we can link against libphp
+        LIBS_SAVE="$LIBS"
+        LIBS="$PYTHON_LDFLAGS"
+        PY_LIB=`$PYTHONCONFIG --libs | sed -e 's/^.*\(python2\..\)$/\1/'`
+        AC_CHECK_LIB([$PY_LIB], [PyObject_CallObject], [], [AC_MSG_ERROR([could not find libpython])], [])
+        AC_SUBST([PYTHON_CPPFLAGS])
+        AC_SUBST([PYTHON_LDFLAGS])
+fi
+
+AC_SUBST([PYTHON_ENABLED])
+AC_SUBST([PYTHON_FILE])
 
 # ===========================================================================