48abbd4bee
more than one php binaries within one workdir (idea from FreeBSD) - move pdo_sqlite support from core to extensions and also add a pdo_mysql and a pdo_sqlite subpackage - regen patches while here - bump PKGNAMEs
68 lines
2.6 KiB
Plaintext
68 lines
2.6 KiB
Plaintext
$OpenBSD: patch-aclocal_m4,v 1.7 2007/04/01 21:37:27 robert Exp $
|
|
--- aclocal.m4.orig Wed Feb 7 01:47:35 2007
|
|
+++ aclocal.m4 Sun Apr 1 14:04:45 2007
|
|
@@ -194,7 +194,7 @@ dnl the path is interpreted relative to the top build-
|
|
dnl
|
|
dnl which array to append to?
|
|
AC_DEFUN([PHP_ADD_SOURCES],[
|
|
- PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,PHP_GLOBAL_OBJS)))
|
|
+ PHP_ADD_SOURCES_X($1, $2, $3, ifelse($4,cli,PHP_CLI_OBJS,ifelse($4,sapi,PHP_SAPI_OBJS,ifelse($4,cgi,PHP_CGI_OBJS,PHP_GLOBAL_OBJS))))
|
|
])
|
|
|
|
dnl
|
|
@@ -966,12 +966,7 @@ dnl ---------------------------------------------- Sha
|
|
if test "$3" != "shared" && test "$3" != "yes" && test "$4" = "cli"; then
|
|
dnl ---------------------------------------------- CLI static module
|
|
[PHP_]translit($1,a-z_-,A-Z__)[_SHARED]=no
|
|
- if test "$PHP_SAPI" = "cgi"; then
|
|
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,)
|
|
- EXT_STATIC="$EXT_STATIC $1"
|
|
- else
|
|
- PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cli)
|
|
- fi
|
|
+ PHP_ADD_SOURCES(PHP_EXT_DIR($1),$2,$ac_extra,cgi)
|
|
EXT_CLI_STATIC="$EXT_CLI_STATIC $1"
|
|
fi
|
|
PHP_ADD_BUILD_DIR($ext_builddir)
|
|
@@ -1021,17 +1016,12 @@ You either need to build $1 shared or build $2 statica
|
|
build to be successful.
|
|
])
|
|
fi
|
|
- if test "x$is_it_enabled" = "xno" && test "x$3" != "xtrue"; then
|
|
- AC_MSG_ERROR([
|
|
-You've configured extension $1, which depends on extension $2,
|
|
-but you've either not enabled $2, or have disabled it.
|
|
-])
|
|
- fi
|
|
dnl Some systems require that we link $2 to $1 when building
|
|
])
|
|
|
|
dnl -------------------------------------------------------------------------
|
|
dnl Checks for structures, typedefs, broken functions, etc.
|
|
+B
|
|
dnl -------------------------------------------------------------------------
|
|
|
|
dnl
|
|
@@ -2129,10 +2119,9 @@ AC_DEFUN([PHP_SETUP_KERBEROS],[
|
|
if test "$PHP_KERBEROS_DIR"; then
|
|
found_kerberos=yes
|
|
PHP_ADD_LIBPATH($PHP_KERBEROS_DIR/$PHP_LIBDIR, $1)
|
|
- PHP_ADD_LIBRARY(gssapi_krb5, 1, $1)
|
|
PHP_ADD_LIBRARY(krb5, 1, $1)
|
|
- PHP_ADD_LIBRARY(k5crypto, 1, $1)
|
|
- PHP_ADD_LIBRARY(com_err, 1, $1)
|
|
+ PHP_ADD_LIBRARY(crypto, 1, $1)
|
|
+ PHP_ADD_LIBRARY(gssapi, 1, $1)
|
|
PHP_ADD_INCLUDE($PHP_KERBEROS_DIR/include)
|
|
fi
|
|
fi
|
|
@@ -4290,7 +4279,7 @@ openbsd*)
|
|
*) need_version=no ;;
|
|
esac
|
|
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
|
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
|
+ finish_cmds=
|
|
shlibpath_var=LD_LIBRARY_PATH
|
|
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
|
case $host_os in
|