df7330352f
- survive new ruby without autoreconf OBS-URL: https://build.opensuse.org/request/show/124476 OBS-URL: https://build.opensuse.org/package/show/graphics/graphviz?expand=0&rev=44
49 lines
2.1 KiB
Diff
49 lines
2.1 KiB
Diff
Index: configure.ac
|
|
===================================================================
|
|
--- configure.ac.orig 2012-06-11 16:25:59.960684453 +0200
|
|
+++ configure.ac 2012-06-11 16:26:07.060351640 +0200
|
|
@@ -1055,8 +1055,8 @@ else
|
|
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"
|
|
+ PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php5/extensions"
|
|
+ PHP_INSTALL_DATADIR="/usr/share/php5"
|
|
PHP_LIBS=
|
|
save_CPPFLAGS=$CPPFLAGS
|
|
CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
|
|
@@ -1597,7 +1597,7 @@ if test "x$use_tcl" = "x"; then
|
|
AC_MSG_WARN([Unable to find tclConfig.sh. The Tcl packages will not be built])
|
|
use_tcl="No (missing tclConfig.sh)"
|
|
fi
|
|
- TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}"
|
|
+ TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}"
|
|
fi
|
|
|
|
if test "x$use_tcl" = "x"; then
|
|
Index: configure
|
|
===================================================================
|
|
--- configure.orig 2012-06-11 16:25:59.000000000 +0200
|
|
+++ configure 2012-06-11 16:27:00.874828987 +0200
|
|
@@ -21022,8 +21022,8 @@ fi
|
|
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"
|
|
+ PHP_INSTALL_DIR="/usr/lib${LIBPOSTFIX}/php5/extensions"
|
|
+ PHP_INSTALL_DATADIR="/usr/share/php5"
|
|
PHP_LIBS=
|
|
save_CPPFLAGS=$CPPFLAGS
|
|
CPPFLAGS="$CPPFLAGS $PHP_INCLUDES"
|
|
@@ -22032,7 +22032,7 @@ $as_echo "using $TCLCONFIG" >&6; }
|
|
$as_echo "$as_me: WARNING: Unable to find tclConfig.sh. The Tcl packages will not be built" >&2;}
|
|
use_tcl="No (missing tclConfig.sh)"
|
|
fi
|
|
- TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}/tcl${TCL_VERSION_FOUND}"
|
|
+ TCL_INSTALL_DIR="${TCLSH_EXEC_PREFIX}/lib${LIBPOSTFIX}"
|
|
fi
|
|
|
|
if test "x$use_tcl" = "x"; then
|