openbsd-ports/www/php4/patches/patch-configure_in
2005-04-04 21:11:41 +00:00

45 lines
1.3 KiB
Plaintext

$OpenBSD: patch-configure_in,v 1.12 2005/04/04 21:11:42 robert Exp $
--- configure.in.orig Wed Mar 30 16:18:36 2005
+++ configure.in Sun Apr 3 21:47:19 2005
@@ -30,10 +30,7 @@
AC_PREREQ(2.13)
AC_INIT(README.CVS-RULES)
-PHP_CONFIG_NICE(config.nice)
-for arg in $0 "$@"; do
- CONFIGURE_COMMAND="$CONFIGURE_COMMAND '$arg'"
-done
+CONFIGURE_COMMAND="Built via the OpenBSD Ports Tree"
PHP_CANONICAL_HOST
AC_CONFIG_HEADER(main/php_config.h)
@@ -838,7 +835,7 @@
case $php_build_target in
program|static)
- standard_libtool_flag='-prefer-non-pic -static'
+ standard_libtool_flag='-static'
if test -z "$PHP_MODULES"; then
enable_shared=no
fi
@@ -846,8 +843,8 @@
shared)
enable_static=no
case $with_pic in
- yes) standard_libtool_flag='-prefer-pic';;
- no) standard_libtool_flag='-prefer-non-pic';;
+ yes) standard_libtool_flag='';;
+ no) standard_libtool_flag='';;
esac
EXTRA_LDFLAGS="$EXTRA_LDFLAGS -avoid-version -module"
;;
@@ -1032,7 +1029,7 @@
EXPANDED_DATADIR=$datadir
EXPANDED_PHP_CONFIG_FILE_PATH=`eval echo "$PHP_CONFIG_FILE_PATH"`
EXPANDED_PHP_CONFIG_FILE_SCAN_DIR=`eval echo "$PHP_CONFIG_FILE_SCAN_DIR"`
-INCLUDE_PATH=.:$EXPANDED_PEAR_INSTALLDIR
+INCLUDE_PATH=.:$libdir
exec_prefix=$old_exec_prefix
libdir=$old_libdir