summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--ext/dba/config.m410
-rw-r--r--ext/icap/config.m48
-rw-r--r--ext/mcrypt/config.m48
-rw-r--r--ext/mhash/config.m48
-rw-r--r--ext/mysql/config.m48
-rw-r--r--ext/pcre/config.m46
-rw-r--r--ext/pcre/config0.m46
-rw-r--r--ext/pgsql/config.m46
-rw-r--r--ext/session/Makefile.in2
-rw-r--r--ext/session/config.m48
-rw-r--r--ext/swf/config.m48
-rw-r--r--ext/zlib/config.m48
12 files changed, 18 insertions, 68 deletions
diff --git a/ext/dba/config.m4 b/ext/dba/config.m4
index 62cba3218e..93315fdb5c 100644
--- a/ext/dba/config.m4
+++ b/ext/dba/config.m4
@@ -33,15 +33,7 @@ AC_DEFUN(AC_DBA_STD_CHECK,[
dnl Attach THIS_x to DBA_x
AC_DEFUN(AC_DBA_STD_ATTACH,[
AC_ADD_INCLUDE($THIS_INCLUDE)
- if test "$ext_shared" = "yes"; then
- if test -z "$THIS_LFLAGS"; then
- DBA_SHARED_LIBADD="$DBA_SHARED_LIBADD -l$THIS_LIBS"
- else
- DBA_SHARED_LIBADD="$DBA_SHARED_LIBADD -R$THIS_LFLAGS -L$THIS_LFLAGS -l$THIS_LIBS"
- fi
- else
- AC_ADD_LIBRARY_WITH_PATH($THIS_LIBS, $THIS_LFLAGS)
- fi
+ AC_ADD_LIBRARY_WITH_PATH($THIS_LIBS, $THIS_LFLAGS, DBA_SHARED_LIBADD)
THIS_INCLUDE=""
THIS_LIBS=""
diff --git a/ext/icap/config.m4 b/ext/icap/config.m4
index 27f1be4c6a..2bd3b6a129 100644
--- a/ext/icap/config.m4
+++ b/ext/icap/config.m4
@@ -8,12 +8,8 @@ if test "$PHP_ICAP" != "no"; then
test "$ICAP_DIR" = "yes" && ICAP_DIR=/usr/local
AC_ADD_INCLUDE($ICAP_DIR)
- if test "$ext_shared" = "yes"; then
- ICAP_SHARED_LIBADD="-R$ICAP_DIR/lib -L$ICAP_DIR/lib -licap"
- PHP_SUBST(ICAP_SHARED_LIBADD)
- else
- AC_ADD_LIBRARY_WITH_PATH(icap, $ICAP_DIR)
- fi
+ PHP_SUBST(ICAP_SHARED_LIBADD)
+ AC_ADD_LIBRARY_WITH_PATH(icap, $ICAP_DIR, ICAP_SHARED_LIBADD)
AC_DEFINE(HAVE_ICAP,1,[ ])
PHP_EXTENSION(icap, $ext_shared)
fi
diff --git a/ext/mcrypt/config.m4 b/ext/mcrypt/config.m4
index 5dcfc33a1b..8fbee13736 100644
--- a/ext/mcrypt/config.m4
+++ b/ext/mcrypt/config.m4
@@ -18,12 +18,8 @@ if test "$PHP_MCRYPT" != "no"; then
fi
AC_ADD_INCLUDE($MCRYPT_DIR/include)
- if test "$ext_shared" = "yes"; then
- MCRYPT_SHARED_LIBADD="-R$MCRYPT_DIR/lib -L$MCRYPT_DIR/lib -lmcrypt"
- PHP_SUBST(MCRYPT_SHARED_LIBADD)
- else
- AC_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib)
- fi
+ PHP_SUBST(MCRYPT_SHARED_LIBADD)
+ AC_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib, MCRYPT_SHARED_LIBADD)
AC_DEFINE(HAVE_LIBMCRYPT,1,[ ])
diff --git a/ext/mhash/config.m4 b/ext/mhash/config.m4
index 18b1324848..3ad4058983 100644
--- a/ext/mhash/config.m4
+++ b/ext/mhash/config.m4
@@ -17,12 +17,8 @@ if test "$PHP_MHASH" != "no"; then
AC_MSG_ERROR(Please reinstall libmhash - I cannot find mhash.h)
fi
AC_ADD_INCLUDE($MHASH_DIR/include)
- if test "$ext_shared" = "yes"; then
- MHASH_SHARED_LIBADD="-R$MHASH_DIR/lib -L$MHASH_DIR/lib -lmhash"
- PHP_SUBST(MHASH_SHARED_LIBADD)
- else
- AC_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/lib)
- fi
+ AC_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/lib, MHASH_SHARED_LIBADD)
+ PHP_SUBST(MHASH_SHARED_LIBADD)
AC_DEFINE(HAVE_LIBMHASH,1,[ ])
diff --git a/ext/mysql/config.m4 b/ext/mysql/config.m4
index 8772e922f2..538a9b47fc 100644
--- a/ext/mysql/config.m4
+++ b/ext/mysql/config.m4
@@ -54,13 +54,7 @@ elif test "$PHP_MYSQL" != "no"; then
AC_MSG_ERROR(Cannot find header files under $PHP_MYSQL)
fi
-
- if test "$ext_shared" = "yes"; then
- MYSQL_SHARED_LIBADD="-R$MYSQL_DIR/lib/mysql -L$MYSQL_DIR/lib/mysql -lmysqlclient"
- else
- AC_ADD_LIBPATH($MYSQL_DIR/lib/mysql)
- AC_ADD_LIBRARY(mysqlclient)
- fi
+ AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_DIR/lib/mysql, MYSQL_SHARED_LIBADD)
AC_ADD_INCLUDE($MYSQL_INC_DIR)
fi
diff --git a/ext/pcre/config.m4 b/ext/pcre/config.m4
index 076dde0752..89d2394143 100644
--- a/ext/pcre/config.m4
+++ b/ext/pcre/config.m4
@@ -49,11 +49,7 @@ if test "$PHP_PCRE_REGEX" != "no"; then
AC_MSG_ERROR(Could not find libpcre.a in $PHP_PCRE_REGEX)
fi
- if test "$ext_shared" = "yes"; then
- PCRE_SHARED_LIBADD="-R$PCRE_LIBDIR -L$PCRE_LIBDIR -lpcre"
- else
- AC_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR)
- fi
+ AC_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR, PCRE_SHARED_LIBADD)
AC_ADD_INCLUDE($PCRE_INCDIR)
AC_DEFINE(HAVE_PCRE, 1, [ ])
diff --git a/ext/pcre/config0.m4 b/ext/pcre/config0.m4
index 076dde0752..89d2394143 100644
--- a/ext/pcre/config0.m4
+++ b/ext/pcre/config0.m4
@@ -49,11 +49,7 @@ if test "$PHP_PCRE_REGEX" != "no"; then
AC_MSG_ERROR(Could not find libpcre.a in $PHP_PCRE_REGEX)
fi
- if test "$ext_shared" = "yes"; then
- PCRE_SHARED_LIBADD="-R$PCRE_LIBDIR -L$PCRE_LIBDIR -lpcre"
- else
- AC_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR)
- fi
+ AC_ADD_LIBRARY_WITH_PATH(pcre, $PCRE_LIBDIR, PCRE_SHARED_LIBADD)
AC_ADD_INCLUDE($PCRE_INCDIR)
AC_DEFINE(HAVE_PCRE, 1, [ ])
diff --git a/ext/pgsql/config.m4 b/ext/pgsql/config.m4
index d3c638d733..3139eaa76a 100644
--- a/ext/pgsql/config.m4
+++ b/ext/pgsql/config.m4
@@ -34,11 +34,7 @@ if test "$PHP_PGSQL" != "no"; then
AC_DEFINE(HAVE_PGSQL,1,[ ])
- if test "$ext_shared" = "yes"; then
- PGSQL_SHARED_LIBADD="-R$PGSQL_LIBDIR -L$PGSQL_LIBDIR -lpq"
- else
- AC_ADD_LIBRARY_WITH_PATH(pq, $PGSQL_LIBDIR)
- fi
+ AC_ADD_LIBRARY_WITH_PATH(pq, $PGSQL_LIBDIR, PGSQL_SHARED_LIBADD)
PHP_EXTENSION(pgsql,$ext_shared)
fi
diff --git a/ext/session/Makefile.in b/ext/session/Makefile.in
index 4893b1be1f..2e1d76edb0 100644
--- a/ext/session/Makefile.in
+++ b/ext/session/Makefile.in
@@ -2,6 +2,6 @@
LTLIBRARY_NAME = libsession.la
LTLIBRARY_SOURCES = session.c mod_files.c mod_mm.c mod_user.c
LTLIBRARY_SHARED_NAME = session.la
-LTLIBRARY_SHARED_LIBADD = $(SESSION_LIBADD)
+LTLIBRARY_SHARED_LIBADD = $(SESSION_SHARED_LIBADD)
include $(top_srcdir)/build/dynlib.mk
diff --git a/ext/session/config.m4 b/ext/session/config.m4
index 8fdbcc4309..72c56732e3 100644
--- a/ext/session/config.m4
+++ b/ext/session/config.m4
@@ -20,12 +20,7 @@ if test "$PHP_MM" != "no"; then
AC_MSG_ERROR(cannot find mm library)
fi
- if test "$ext_shared" = "yes"; then
- PHP_SUBST(SESSION_LIBADD)
- SESSION_LIBADD="-R$MM_DIR/lib -L$MM_DIR/lib -lmm"
- else
- AC_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/lib)
- fi
+ AC_ADD_LIBRARY_WITH_PATH(mm, $MM_DIR/lib, SESSION_SHARED_LIBADD)
AC_ADD_INCLUDE($MM_DIR/include)
AC_DEFINE(HAVE_LIBMM, 1, [Whether you have libmm])
PHP_MODULE_PTR(phpext_ps_mm_ptr)
@@ -37,4 +32,5 @@ fi
if test "$PHP_SESSION" != "no"; then
PHP_EXTENSION(session,$ext_shared)
+ PHP_SUBST(SESSION_SHARED_LIBADD)
fi
diff --git a/ext/swf/config.m4 b/ext/swf/config.m4
index 117fe7c568..da766d36e5 100644
--- a/ext/swf/config.m4
+++ b/ext/swf/config.m4
@@ -20,12 +20,8 @@ if test "$PHP_SWF" != "no"; then
AC_ADD_INCLUDE($SWF_DIR)
- if test "$ext_shared" = "yes"; then
- SWF_SHARED_LIBADD="-R$SWF_DIR -L$SWF_DIR -lswf"
- PHP_SUBST(SWF_SHARED_LIBADD)
- else
- AC_ADD_LIBRARY_WITH_PATH(swf, $SWF_DIR)
- fi
+ PHP_SUBST(SWF_SHARED_LIBADD)
+ AC_ADD_LIBRARY_WITH_PATH(swf, $SWF_DIR, SWF_SHARED_LIBADD)
AC_DEFINE(HAVE_SWF,1,[ ])
PHP_EXTENSION(swf, $ext_shared)
diff --git a/ext/zlib/config.m4 b/ext/zlib/config.m4
index 020c133fcd..3ebb936723 100644
--- a/ext/zlib/config.m4
+++ b/ext/zlib/config.m4
@@ -32,12 +32,8 @@ if test "$PHP_ZLIB" != "no"; then
LIBS="$old_LIBS"
LDFLAGS="$old_LDFLAGS"
- if test "$ext_shared" = "yes"; then
- ZLIB_SHARED_LIBADD="-R$ZLIB_LIBDIR -L$ZLIB_LIBDIR -lz"
- PHP_SUBST(ZLIB_SHARED_LIBADD)
- else
- AC_ADD_LIBRARY_WITH_PATH(z, $ZLIB_LIBDIR)
- fi
+ PHP_SUBST(ZLIB_SHARED_LIBADD)
+ AC_ADD_LIBRARY_WITH_PATH(z, $ZLIB_LIBDIR, ZLIB_SHARED_LIBADD)
AC_ADD_INCLUDE($ZLIB_INCLUDE)
fi
View Lorry Controller Status