Changeset 797 for trunk/zoo-project/zoo-kernel/configure.ac

Timestamp:

Jan 10, 2017, 5:21:45 PM (7 years ago)

Author:

djay

Message:

Return an ExceptionReport? in case any inpts failed to be downloaded.

File:

• trunk/zoo-project/zoo-kernel/configure.ac (modified) (5 diffs)

trunk/zoo-project/zoo-kernel/configure.ac

@@ -422 +422 @@
         if test  "$PYTHON_PATH" = "yes"
         then
-                # PHP was not specified, so search within the current path
+                # PYTHON was not specified, so search within the current path
                 PYTHONCFG_PATH=`which python${PYTHON_VERS}-config`
                 if test -z "${PYTHONCFG_PATH}" ; then
@@ -529 +529 @@
         [PHP_PATH="$withval"; PHP_ENABLED="-DUSE_PHP"], [PHP_ENABLED=""])
 
+AC_ARG_WITH([php-version], 
+        [AS_HELP_STRING([--with-phpvers=NUM], [To use a specific php version])], 
+        [PHP_VERS="$withval"], [PHP_VERS=""])
+
 
 if test -z "$PHP_ENABLED"
@@ -535 +539 @@
 else
         PHPCONFIG="$PHP_PATH/bin/php-config"
-        PHP_FILE="service_internal_php.o"
+        if test "x$PHP_VERS" = "x7"
+        then
+                PHP_FILE="service_internal_php7.o"
+        else
+                PHP_FILE="service_internal_php.o"
+        fi
         if test  "$PHP_PATH" = "yes"
         then
@@ -545 +554 @@
 
         # Extract the linker and include flags 
-        PHP_LDFLAGS="-L/`$PHPCONFIG --prefix`/lib -lphp5"
+        if test "x$PHP_VERS" = "x7"
+        then
+                PHP_LDFLAGS="-L/`$PHPCONFIG --prefix`/lib64 -lphp7"
+        else
+                PHP_LDFLAGS="-L/`$PHPCONFIG --prefix`/lib -lphp5"
+        fi
         PHP_CPPFLAGS=`$PHPCONFIG --includes`
 
@@ -558 +572 @@
         LIBS="$PHP_LDFLAGS"
         # Shouldn't we get php here rather than php5 :) ??
-        AC_CHECK_LIB([php5], [call_user_function], [], [AC_MSG_ERROR([could not find libphp])], [])
+        if test "x$PHP_VERS" = "x7"
+        then
+                echo $LIBS
+                #AC_CHECK_LIB([php7], [call_user_function], [], [AC_MSG_ERROR([could not find libphp])], [])
+        else
+                AC_CHECK_LIB([php5], [call_user_function], [], [AC_MSG_ERROR([could not find libphp])], [])
+        fi
         LIBS="$LIBS_SAVE"
         AC_SUBST([PHP_CPPFLAGS])