36 lines
1.2 KiB
Diff
36 lines
1.2 KiB
Diff
--- configure.ac
|
|
+++ configure.ac
|
|
@@ -272,7 +272,7 @@
|
|
fi
|
|
|
|
dnl -----------------------------------
|
|
-dnl Check for various typedefs and provide substitutes if they don't exist.
|
|
+dnl Check for various typedefs and provide substitutes if they do not exist.
|
|
|
|
AC_C_CONST
|
|
AC_TYPE_MODE_T
|
|
@@ -821,11 +821,13 @@
|
|
AC_CHECK_PROG(PHP,php,php)
|
|
if test -d /usr/include/php5; then
|
|
PHP_INCLUDES="-I/usr/include/php5 -I/usr/include/php5/main -I/usr/include/php5/Zend -I/usr/include/php5/TSRM"
|
|
+PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php5/extensions"
|
|
+PHP_INSTALL_DATADIR="/usr/share/php5"
|
|
else
|
|
PHP_INCLUDES="-I/usr/include/php -I/usr/include/php/main -I/usr/include/php/Zend -I/usr/include/php/TSRM"
|
|
-fi
|
|
PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php/modules"
|
|
PHP_INSTALL_DATADIR="/usr/share/php"
|
|
+fi
|
|
PHP_LIBS=
|
|
save_CPPFLAGS=$CPPFLAGS
|
|
CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
|
|
@@ -1203,7 +1205,7 @@
|
|
AC_MSG_WARN([Unable to find tclConfig.sh. The Tcl packages will not be built])
|
|
HAVE_TCL=0
|
|
fi
|
|
- TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}"
|
|
+ TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}"
|
|
fi
|
|
|
|
if test "$HAVE_TCL" = "1"; then
|