CVS update: php3

Date: Sunday June 20, 1999 @ 8:38 Author: sas Update of /repository/php3 In directory php:/tmp/cvs-serv3129 Modified Files: Makefile.in acconfig.h aclocal.m4 config.h.in configure.in libphp3.module.in Log Message: - fix VPATH APXS compile - add --enable-ucd-snmp-hack - unified autoconf scheme for adding libraries, include and link paths (see comments in aclocal.m4) - add base directory choice for XML/Freetype - some configure.in cleanups Index: php3/Makefile.in diff -u php3/Makefile.in:1.321 php3/Makefile.in:1.322 --- php3/Makefile.in:1.321 Fri Jun 18 21:22:07 1999 +++ php3/Makefile.in Sun Jun 20 08:38:37 1999 @@ -24,7 +24,7 @@ # +----------------------------------------------------------------------+ # -# $Id: Makefile.in,v 1.321 1999/06/19 01:22:07 jim Exp $ +# $Id: Makefile.in,v 1.322 1999/06/20 12:38:37 sas Exp $ # prefix = @prefix@ @@ -34,10 +34,11 @@ bindir = @bindir@ CC = @CC@ +LN_S = @LN_S@ AR = ar rc BINNAME = @BINNAME@ INSTALL_IT = @INSTALL_IT@ -INCLUDE = -I$(srcdir) -I. @DBA_INCLUDE@ @GDBM_INCLUDE@ @ORACLE_INCLUDE@ @APACHE_INCLUDE@ @FHTTPD_INCLUDE@ @ADA_INCLUDE@ @IODBC_INCLUDE@ @SYBASE_INCLUDE@ @SYBASE_CT_INCLUDE@ @MYSQL_INCLUDE@ @MSQL_INCLUDE@ @SOLID_INCLUDE@ @EMPRESS_INCLUDE@ @OPENLINK_INCLUDE@ @PGSQL_INCLUDE@ @LDAP_INCLUDE@ @MCK_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ASPELL_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@ @CPDFLIB_INCLUDE@ @FDFLIB_INCLUDE@ @IFX_INCLUDE@ @SNMP_INCLUDE@ @IBASE_INCLUDE@ @GETTEXT_INCLUDE@ @IMAGICK_INCLUDE@ @INCLUDES@ +INCLUDE = -I$(srcdir) -I. @GDBM_INCLUDE@ @ORACLE_INCLUDE@ @APACHE_INCLUDE@ @FHTTPD_INCLUDE@ @ADA_INCLUDE@ @IODBC_INCLUDE@ @SYBASE_INCLUDE@ @SYBASE_CT_INCLUDE@ @SOLID_INCLUDE@ @EMPRESS_INCLUDE@ @OPENLINK_INCLUDE@ @MCK_INCLUDE@ @VELOCIS_INCLUDE@ @CODBC_INCLUDE@ @GD_INCLUDE@ @IMAP_INCLUDE@ @ZLIB_INCLUDE@ @PDFLIB_INCLUDE@ @CPDFLIB_INCLUDE@ @FDFLIB_INCLUDE@ @IFX_INCLUDE@ @SNMP_INCLUDE@ @IBASE_INCLUDE@ @GETTEXT_INCLUDE@ @INCLUDES@ PROF_CFLAGS = CFLAGS_SHLIB = @CFLAGS_SHLIB@ LDFLAGS_SHLIB = @LDFLAGS_SHLIB@ @@ -101,7 +102,7 @@ FUNCTIONS = $(FUNCTIONS_SOURCE:.c=.o) -LIBS = @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @PCRE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ASPELL_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @CPDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @IMAGICK_LFLAGS@ @IMAGICK_LIBS@ @DBA_LFLAGS@ @DBA_LIBS@ @EXTRA_LIBS@ @LIBS@ +LIBS = @RPATHS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @DBASE_LIB@ @PCRE_LIB@ @REGEX_LIB@ @DBM_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @CPDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @EXTRA_LIBS@ @LIBS@ all: $(BINNAME) php: $(OBJS) $(FUNCTIONS) @PCRE_LIB@ @REGEX_LIB@ @FHTTPD_LIB@ @DBASE_LIB@ @@ -120,7 +121,8 @@ $(RANLIB) libmodphp3-so.a libphp3.so: mod_php3.c libmodphp3-so.a @DBASE_LIB@ @PCRE_LIB@ - $(APXS) -c -o libphp3.so $(APXS_LDFLAGS) mod_php3.c libmodphp3-so.a @PCRE_LIBS@ + -@test -f mod_php3.c || test -L mod_php3.c || $(LN_S) $(srcdir)/mod_php3.c mod_php3.c + $(APXS) -c -o libphp3.so -I$(srcdir) -I. $(APXS_LDFLAGS) mod_php3.c libmodphp3-so.a @PCRE_LIBS@ pcrelib/libpcre.a: (cd pcrelib; $(MAKE)) @@ -183,7 +185,7 @@ cd test && ./testall config.status: configure - cd $(srcdir) && ./config.status --recheck + ./config.status --recheck build-defs.h config.h: stamp-h stamp-h: config.h.in config.status Index: php3/acconfig.h diff -u php3/acconfig.h:1.100 php3/acconfig.h:1.101 --- php3/acconfig.h:1.100 Wed Jun 16 08:05:27 1999 +++ php3/acconfig.h Sun Jun 20 08:38:41 1999 @@ -1,3 +1,6 @@ + +#undef UCD_SNMP_HACK + /* Define if you want dmalloc checking */ #define HAVE_DMALLOC 0 Index: php3/aclocal.m4 diff -u php3/aclocal.m4:1.37 php3/aclocal.m4:1.38 --- php3/aclocal.m4:1.37 Wed May 12 13:54:23 1999 +++ php3/aclocal.m4 Sun Jun 20 08:38:41 1999 @@ -1,10 +1,72 @@ -dnl $Id: aclocal.m4,v 1.37 1999/05/12 17:54:23 sas Exp $ +dnl $Id: aclocal.m4,v 1.38 1999/06/20 12:38:41 sas Exp $ dnl dnl This file contains local autoconf functions. dnl dummy function for PHP4 compatibility AC_DEFUN(PHP_EXTENSION,[]) +dnl +dnl AC_PHP_ONCE(namespace, variable, code) +dnl +dnl execute code, if variable is not set in namespace +dnl +AC_DEFUN(AC_PHP_ONCE,[ + unique=echo $ac_n "$2$ac_c" | tr -c a-zA-Z0-9 x + cmd="echo $ac_n \"\$$1$unique$ac_c\"" + if test -n "$unique" && test "eval $cmd" = "" ; then + eval "$1$unique=set" + $3 + fi +]) + +dnl +dnl AC_ADD_LIBPATH(path) +dnl +dnl add a library to linkpath/runpath +dnl +AC_DEFUN(AC_ADD_LIBPATH,[ + AC_PHP_ONCE(LIBPATH, $1, [ + EXTRA_LIBS="$EXTRA_LIBS -L$1" + if test -n "$APXS" ; then + RPATHS="$RPATHS ${apxs_runpath_switch}$1'" + else + RPATHS="$RPATHS ${ld_runpath_switch}$1" + fi + ]) +]) + +dnl +dnl AC_ADD_INCLUDE(path) +dnl +dnl add a include path +dnl +AC_DEFUN(AC_ADD_INCLUDE,[ + AC_PHP_ONCE(INCLUDEPATH, $1, [ + INCLUDES="$INCLUDES -I$1" + ]) +]) + +dnl +dnl AC_ADD_LIBRARY(library) +dnl +dnl add a library to the link line +dnl +AC_DEFUN(AC_ADD_LIBRARY,[ + AC_PHP_ONCE(LIBRARY, $1, [ + EXTRA_LIBS="$EXTRA_LIBS -l$1" + ]) +]) + +dnl +dnl AC_ADD_LIBRARY_WITH_PATH(library, path) +dnl +dnl add a library to the link line and path to linkpath/runpath +dnl +AC_DEFUN(AC_ADD_LIBRARY_WITH_PATH,[ + AC_ADD_LIBPATH($2) + AC_ADD_LIBRARY($1) +]) + AC_DEFUN(AC_TEMP_LDFLAGS,[ old_LDFLAGS="$LDFLAGS" LDFLAGS="$1 $LDFLAGS" @@ -132,8 +194,8 @@ dnl Assign INCLUDE/LFLAGS from PREFIX AC_DEFUN(AC_DBA_STD_ASSIGN,[ if test "$THIS_PREFIX" != "" -a "$THIS_PREFIX" != "/usr"; then - THIS_INCLUDE="-I$THIS_PREFIX/include" - THIS_LFLAGS="-L$THIS_PREFIX/lib" + THIS_INCLUDE="$THIS_PREFIX/include" + THIS_LFLAGS="$THIS_PREFIX/lib" fi ]) @@ -151,9 +213,8 @@ dnl Attach THIS_x to DBA_x AC_DEFUN(AC_DBA_STD_ATTACH,[ - DBA_INCLUDE="$DBA_INCLUDE $THIS_INCLUDE" - DBA_LIBS="$DBA_LIBS $THIS_LIBS" - DBA_LFLAGS="$DBA_LFLAGS $THIS_LFLAGS" + AC_ADD_INCLUDE($THIS_INCLUDE) + AC_ADD_LIBRARY_WITH_PATH($THIS_LIBS, $THIS_LFLAGS) THIS_INCLUDE="" THIS_LIBS="" Index: php3/config.h.in diff -u php3/config.h.in:1.168 php3/config.h.in:1.169 --- php3/config.h.in:1.168 Wed Jun 16 07:34:10 1999 +++ php3/config.h.in Sun Jun 20 08:38:41 1999 @@ -65,6 +65,8 @@ /* Define to `int' if <sys/types.h> doesn't define. */ #undef uid_t +#undef UCD_SNMP_HACK + /* Define if you want dmalloc checking */ #define HAVE_DMALLOC 0 @@ -375,6 +377,9 @@ /* Define if you have the t1 library (-lt1). */ #undef HAVE_LIBT1_OUTLINE +#define HAVE_LIBTTF 0 +#define HAVE_POSIX 0 + /* The number of bytes in a int. */ #undef SIZEOF_INT @@ -608,10 +613,3 @@ /* Define if you have the resolv library (-lresolv). */ #undef HAVE_LIBRESOLV - -/* Define if you have the ttf library (-lttf). */ -#undef HAVE_LIBTTF - -/* Define if you want Posix functions included */ -#undef HAVE_POSIX - Index: php3/configure.in diff -u php3/configure.in:1.397 php3/configure.in:1.398 --- php3/configure.in:1.397 Fri Jun 18 20:56:02 1999 +++ php3/configure.in Sun Jun 20 08:38:41 1999 @@ -1,4 +1,4 @@ -dnl $Id: configure.in,v 1.397 1999/06/19 00:56:02 jim Exp $ +dnl $Id: configure.in,v 1.398 1999/06/20 12:38:41 sas Exp $ dnl Process this file with autoconf to produce a configure script. AC_INIT(main.c) @@ -28,6 +28,7 @@ AC_PROG_CC AC_PROG_RANLIB AC_PROG_CC_C_O +AC_PROG_LN_S AC_PATH_PROG(PERL_PATH, perl) dnl Ugly hack to get around a problem with gcc on AIX. @@ -248,7 +249,7 @@ withval=apxs fi APXS="$withval" - APXS_LDFLAGS="@SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @ASPELL_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @CPDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @XML_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @IMAGICK_LFLAGS@ @IMAGICK_LIBS@ @DBM_LIB@ @IMAP_LIBS@ @DBASE_LIBS@ @DBA_LFLAGS@ @DBA_LIBS@ @PCRE_LIB@ @EXTRA_LIBS@" + APXS_LDFLAGS="@RPATHS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @FHTTPD_LIB@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @EMPRESS_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @MCK_LFLAGS@ @MCK_LIBS@ @VELOCIS_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @PDFLIB_LIBS@ @CPDFLIB_LIBS@ @FDFLIB_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @DBM_LIB@ @IMAP_LIBS@ @DBASE_LIBS@ @PCRE_LIB@ @EXTRA_LIBS@" APACHE_INCLUDE="-I$APXS -q INCLUDEDIR" BINNAME=libphp3.so @@ -665,25 +666,25 @@ [ --with-aspell[=DIR] Include ASPELL support.], [ if test "$withval" != "no"; then - if test "$withval" = "yes"; then - ASPELL_DIR=/usr/local - else - ASPELL_DIR=$withval + if test "$withval" = "yes"; then + ASPELL_DIR=/usr/local + else + ASPELL_DIR=$withval fi - ASPELL_INCLUDE="-I$ASPELL_DIR/include/" - ASPELL_LIBS=" -laspell " - if test ! -f $ASPELL_DIR/include/aspell-c.h; then - AC_MSG_ERROR(could not find aspell-c.h in $ASPELL_DIR/include ! Please manually copy it from the aspell sources to $ASPELL_DIR/include) - fi - AC_SUBST(ASPELL_INCLUDE) - AC_SUBST(ASPELL_LIBS) - AC_DEFINE(HAVE_ASPELL) - AC_MSG_RESULT(yes) - else - AC_MSG_ERROR(could not find ASPELL library!) - fi + + AC_ADD_INCLUDE($ASPELL_DIR/include) + AC_ADD_LIBRARY_WITH_PATH(aspell, $ASPELL_DIR/lib) + + if test ! -f "$ASPELL_DIR/include/aspell-c.h"; then + AC_MSG_ERROR(Could not find aspell-c.h in $ASPELL_DIR/include - please copy it manually from the aspell sources to $ASPELL_DIR/include) + fi + AC_DEFINE(HAVE_ASPELL) + AC_MSG_RESULT(yes) + else + AC_MSG_ERROR(no) + fi ],[ - AC_MSG_RESULT(no) + AC_MSG_RESULT(no) ]) AC_MSG_CHECKING(whether to include GD support) @@ -740,14 +741,36 @@ fi AC_SUBST(GD_INCLUDE) if test "$ac_cv_lib_gd_gdImageLine" = "yes"; then - AC_CHECK_LIB(ttf, TT_Open_Face, [ - AC_CHECK_HEADER(freetype.h, [ - LIBS="$LIBS -lttf" - AC_DEFINE(HAVE_LIBTTF) - ]) + AC_ARG_WITH(ttf, + [ --with-ttf[=DIR] Include Freetype support],[ + if test "$withval" != "no" ; then + CHECK_TTF="$withval" + fi ]) + + AC_MSG_CHECKING(whether to include ttf support) + if test -n "$CHECK_TTF" ; then + for i in /usr /usr/local "$CHECK_TTF" ; do + if test -f "$i/include/freetype.h" ; then + TTF_DIR="$i" + fi + done + + if test -n "$TTF_DIR" ; then + AC_DEFINE(HAVE_LIBTTF) + AC_ADD_LIBRARY_WITH_PATH(ttf, $TTF_DIR/lib) + AC_ADD_INCLUDE($TTF_DIR/include) + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi + else + AC_MSG_RESULT(no) + fi fi + + AC_MSG_CHECKING(whether to enable t1lib support with GD) AC_ARG_ENABLE(t1lib, [ --enable-t1lib Compile GD with t1lib support.],[ @@ -832,30 +855,30 @@ fi AC_MSG_RESULT(yes) AC_PATH_X - IMAGICK_LIBS="-lMagick -lX11" - IMAGICK_INCLUDE="-I$IMAGICK_INCDIR -I${ac_x_includes}/X11" - if test -n "$APXS"; then - IMAGICK_LFLAGS="${apxs_runpath_switch}$IMAGICK_LIBDIR' ${apxs_runpath_switch}${ac_x_libraries}' -L$IMAGICK_LIBDIR -L${ac_x_libraries}" - else - IMAGICK_LFLAGS="${ld_runpath_switch}$IMAGICK_LIBDIR ${ld_runpath_switch}${ac_x_libraries} -L$IMAGICK_LIBDIR -L${ac_x_libraries}" - fi - O_CPPFLAGS="$CPPFLAGS" + AC_ADD_LIBPATH($IMAGICK_LIBDIR) + AC_ADD_LIBPATH(${ac_x_libraries}) + AC_ADD_LIBRARY(Magick) + AC_ADD_LIBRARY(X11) + AC_ADD_INCLUDE($IMAGICK_INCDIR) + AC_ADD_INCLUDE(${ac_x_includes}/X11) + + O_CPPFLAGS="$CPPFLAGS" O_LDFLAGS=$LDFLAGS CPPFLAGS="$CPPFLAGS -I${ac_x_includes}/X11" LDFLAGS="$LDFLAGS -L${ac_x_libraries}" dnl check for a whole whack of possible required libraries - AC_CHECK_LIB(bz2, bzBuffToBuffCompress, IMAGICK_LIBS="$IMAGICK_LIBS -lbz2",,) - AC_CHECK_LIB(Xext,XShapeCombineMask, IMAGICK_LIBS="$IMAGICK_LIBS -lXext",,) - AC_CHECK_LIB(dps,DPSInitialize, IMAGICK_LIBS="$IMAGICK_LIBS -ldps",,) - AC_CHECK_LIB(dpstk,XDPSPixelsPerPoint, IMAGICK_LIBS="$IMAGICK_LIBS -ldpstk",,) - AC_CHECK_LIB(tiff,TIFFOpen, IMAGICK_LIBS="$IMAGICK_LIBS -ltiff",,) - AC_CHECK_LIB(jpeg,jpeg_read_header, IMAGICK_LIBS="$IMAGICK_LIBS -ljpeg",,) - AC_CHECK_LIB(z,compress, IMAGICK_LIBS="$IMAGICK_LIBS -lz",,) - AC_CHECK_LIB(fpx,FPX_OpenImageByFilename, IMAGICK_LIBS="$IMAGICK_LIBS -lfpx",,) - AC_CHECK_LIB(png,png_info_init, IMAGICK_LIBS="$IMAGICK_LIBS -lpng",,) - AC_CHECK_LIB(ttf,TT_Init_FreeType, IMAGICK_LIBS="$IMAGICK_LIBS -lttf",,) - AC_CHECK_LIB(df,DFANputlabel, IMAGICK_LIBS="$IMAGICK_LIBS -ldf",,) - AC_CHECK_LIB(jbig,jbg_dec_init, IMAGICK_LIBS="$IMAGICK_LIBS -ljbig",,) + AC_CHECK_LIB(bz2, bzBuffToBuffCompress, AC_ADD_LIBRARY(bz2),,) + AC_CHECK_LIB(Xext,XShapeCombineMask, AC_ADD_LIBRARY(Xext),,) + AC_CHECK_LIB(dps,DPSInitialize, AC_ADD_LIBRARY(dps),,) + AC_CHECK_LIB(dpstk,XDPSPixelsPerPoint, AC_ADD_LIBRARY(dpstk),,) + AC_CHECK_LIB(tiff,TIFFOpen, AC_ADD_LIBRARY(tiff),,) + AC_CHECK_LIB(jpeg,jpeg_read_header, AC_ADD_LIBRARY(jpeg),,) + AC_CHECK_LIB(z,compress, AC_ADD_LIBRARY(z),,) + AC_CHECK_LIB(fpx,FPX_OpenImageByFilename, AC_ADD_LIBRARY(fpx),,) + AC_CHECK_LIB(png,png_info_init, AC_ADD_LIBRARY(png),,) + AC_CHECK_LIB(ttf,TT_Init_FreeType, AC_ADD_LIBRARY(ttf),,) + AC_CHECK_LIB(df,DFANputlabel, AC_ADD_LIBRARY(df),,) + AC_CHECK_LIB(jbig,jbg_dec_init, AC_ADD_LIBRARY(jbig),,) CPPFLAGS=$O_CPPFLAGS LDFLAGS=$O_LDFLAGS @@ -867,9 +890,6 @@ ],[ AC_MSG_RESULT(no) ]) -AC_SUBST(IMAGICK_LIBS) -AC_SUBST(IMAGICK_LFLAGS) -AC_SUBST(IMAGICK_INCLUDE) AC_MSG_CHECKING(for Oracle support) AC_ARG_WITH(oracle, @@ -1232,20 +1252,15 @@ AC_MSG_ERROR(Invalid MySQL directory - unable to find mysql.h under $withval) fi fi - MYSQL_INCLUDE=-I$MYSQL_INCDIR - if test -n "$APXS"; then - MYSQL_LFLAGS="${apxs_runpath_switch}$MYSQL_LIBDIR' -L$MYSQL_LIBDIR" - else - MYSQL_LFLAGS="${ld_runpath_switch}$MYSQL_LIBDIR -L$MYSQL_LIBDIR" - fi - MYSQL_LIBS=-lmysqlclient + AC_ADD_LIBRARY_WITH_PATH(mysqlclient, $MYSQL_LIBDIR) + AC_ADD_INCLUDE($MYSQL_INCDIR) AC_DEFINE(HAVE_MYSQL) AC_MSG_RESULT(yes) dnl check for errmsg.h, which isn't installed by some versions of 3.21 old_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $MYSQL_INCLUDE" + CPPFLAGS="$CPPFLAGS -I$MYSQL_INCDIR" AC_CHECK_HEADERS(errmsg.h mysql.h) CPPFLAGS="$old_CPPFLAGS" else @@ -1254,10 +1269,6 @@ ],[ AC_MSG_RESULT(no) ]) -AC_SUBST(MYSQL_LIBS) -AC_SUBST(MYSQL_LFLAGS) -AC_SUBST(MYSQL_INCLUDE) - AC_MSG_CHECKING(for mSQL support) AC_ARG_WITH(msql, @@ -1272,9 +1283,8 @@ MSQL_INCDIR=$withval/include MSQL_LIBDIR=$withval/lib fi - MSQL_INCLUDE=-I$MSQL_INCDIR - MSQL_LFLAGS=-L$MSQL_LIBDIR - MSQL_LIBS=-lmsql + AC_ADD_LIBRARY_WITH_PATH(msql, $MSQL_LIBDIR) + AC_ADD_INCLUDE($MSQL_INCDIR) AC_DEFINE(HAVE_MSQL) AC_MSG_RESULT(yes) @@ -1285,9 +1295,6 @@ ],[ AC_MSG_RESULT(no) ]) -AC_SUBST(MSQL_LIBS) -AC_SUBST(MSQL_LFLAGS) -AC_SUBST(MSQL_INCLUDE) AC_MSG_CHECKING(for PostgresSQL support) AC_ARG_WITH(pgsql, @@ -1310,6 +1317,8 @@ PGSQL_INCLUDE=-I$PGSQL_INCDIR PGSQL_LFLAGS=-L$PGSQL_LIBDIR PGSQL_LIBS=-lpq + AC_ADD_LIBRARY_WITH_PATH(pq, $PGSQL_LIBDIR) + AC_ADD_INCLUDE($PGSQL_INCDIR) old_CFLAGS=$CFLAGS; old_LDFLAGS=$LDFLAGS; old_LIBS=$LIBS CFLAGS="$CFLAGS $PGSQL_INCLUDE" @@ -1325,11 +1334,7 @@ ],[ AC_MSG_RESULT(no) ]) -AC_SUBST(PGSQL_LIBS) -AC_SUBST(PGSQL_LFLAGS) -AC_SUBST(PGSQL_INCLUDE) - AC_MSG_CHECKING(for Solid support) AC_ARG_WITH(solid, [ --with-solid[=DIR] Include Solid support. DIR is the Solid base @@ -1426,33 +1431,32 @@ dnl these here if necessary. -RL if test uname = "Linux"; then - LDAP_PTHREAD="-lpthread" + LDAP_PTHREAD="pthread" else LDAP_PTHREAD= fi if test -f $LDAP_LIBDIR/liblber.a; then - LDAP_LIBS="-lldap -llber" + AC_ADD_LIBRARY(ldap) + AC_ADD_LIBRARY(lber) elif test -f $LDAP_LIBDIR/libldapssl30.so; then - LDAP_LIBS="-lldapssl30 $LDAP_PTHREAD" + AC_ADD_LIBRARY(ldapssl30) + AC_ADD_LIBRARY($LDAP_PTHREAD) AC_DEFINE(HAVE_NSLDAP) elif test -f $LDAP_LIBDIR/libldapssl30.sl; then - LDAP_LIBS="-lldapssl30" + AC_ADD_LIBRARY(ldapssl30) AC_DEFINE(HAVE_NSLDAP) elif test -f $LDAP_LIBDIR/libldap30.so; then - LDAP_LIBS="-lldap30 $LDAP_PTHREAD" + AC_ADD_LIBRARY(ldap30) + AC_ADD_LIBRARY($LDAP_PTHREAD) AC_DEFINE(HAVE_NSLDAP) elif test -f $LDAP_LIBDIR/libldap30.sl; then - LDAP_LIBS="-lldap30" + AC_ADD_LIBRARY(ldap30) AC_DEFINE(HAVE_NSLDAP) fi - if test -n "$APXS"; then - LDAP_LFLAGS="-L$LDAP_LIBDIR ${apxs_runpath_switch}$LDAP_LIBDIR'" - else - LDAP_LFLAGS="-L$LDAP_LIBDIR ${ld_runpath_switch}$LDAP_LIBDIR" - fi - LDAP_INCLUDE=-I$LDAP_INCDIR + AC_ADD_LIBPATH($LDAP_LIBDIR) + AC_ADD_INCLUDE($LDAP_INCDIR) AC_DEFINE(HAVE_LDAP) @@ -1463,9 +1467,6 @@ ],[ AC_MSG_RESULT(no) ]) -AC_SUBST(LDAP_LIBS) -AC_SUBST(LDAP_LFLAGS) -AC_SUBST(LDAP_INCLUDE) AC_MSG_CHECKING(for Cybercash MCK support) AC_ARG_WITH(mck, @@ -1738,21 +1739,30 @@ AC_MSG_RESULT(no) ]) - AC_MSG_CHECKING(for XML support) AC_ARG_WITH(xml, [ --with-xml Include XML support],[ - if test "$withval" = "yes"; then + if test "$withval" != "no" ; then + for i in /usr /usr/local $withval ; do + if test -e "$i/include/xml/xmltok.h" ; then + XML_DIR=$i + fi + done + + if test "$XML_DIR" = "" ; then + AC_MSG_ERROR(cannot find XML include files) + fi + AC_DEFINE(HAVE_LIBEXPAT, 1) AC_MSG_RESULT(yes) - XML_LIBS="-lexpat" + AC_ADD_LIBRARY_WITH_PATH(expat, $XML_DIR/lib) + AC_ADD_INCLUDE($XML_DIR/include) else AC_MSG_RESULT(no) fi ],[ AC_MSG_RESULT(no) ]) -AC_SUBST(XML_LIBS) AC_MSG_CHECKING(whether to include YP support) AC_ARG_WITH(yp, @@ -2426,7 +2436,7 @@ unset ac_cv_lib_gdbm_gdbm_open AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ - AC_CHECK_LIB(gdbm, gdbm_open, [AC_DEFINE(DBA_GDBM, 1) THIS_LIBS="-lgdbm"]) + AC_CHECK_LIB(gdbm, gdbm_open, [AC_DEFINE(DBA_GDBM, 1) THIS_LIBS="gdbm"]) ]) AC_DBA_STD_ASSIGN @@ -2460,7 +2470,7 @@ for LIB in gdbm db1 ndbm c; do AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ - AC_CHECK_LIB($LIB, dbm_open, [AC_DEFINE(DBA_NDBM,1) THIS_LIBS="-l$LIB"]) + AC_CHECK_LIB($LIB, dbm_open, [AC_DEFINE(DBA_NDBM,1) THIS_LIBS="$LIB"]) ]) done @@ -2505,7 +2515,7 @@ for LIB in db db2 c; do AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ - AC_CHECK_LIB($LIB, db_appinit, [AC_DEFINE(DBA_DB2,1) THIS_LIBS="-l$LIB"]) + AC_CHECK_LIB($LIB, db_appinit, [AC_DEFINE(DBA_DB2,1) THIS_LIBS="$LIB"]) ]) done @@ -2528,7 +2538,7 @@ for LIB in gdbm db1 dbm c; do AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ - AC_CHECK_LIB($LIB, dbminit, [AC_DEFINE(DBA_DBM,1) THIS_LIBS="-l$LIB"]) + AC_CHECK_LIB($LIB, dbminit, [AC_DEFINE(DBA_DBM,1) THIS_LIBS="$LIB"]) ]) done @@ -2551,7 +2561,7 @@ for LIB in cdb c; do AC_TEMP_LDFLAGS(-L$THIS_PREFIX/lib,[ - AC_CHECK_LIB($LIB, cdb_bread, [AC_DEFINE(DBA_CDB,1) THIS_LIBS="-l$LIB"]) + AC_CHECK_LIB($LIB, cdb_bread, [AC_DEFINE(DBA_CDB,1) THIS_LIBS="$LIB"]) ]) done @@ -2563,10 +2573,6 @@ AC_MSG_CHECKING(for DBA CDB support) AC_DBA_STD_RESULT -AC_SUBST(DBA_LIBS) -AC_SUBST(DBA_LFLAGS) -AC_SUBST(DBA_INCLUDE) - AC_MSG_CHECKING(whether to enable DBA interface) if test "$HAVE_DBA" = "1"; then AC_MSG_RESULT(yes) @@ -2590,8 +2596,8 @@ if test "$MCRYPT_DIR" = ""; then AC_MSG_ERROR(Please install mcrypt.h and libmcrypt.a as explained in the documentation - I cannot find mcrypt.h) fi - INCLUDES="$INCLUDES -I$MCRYPT_DIR/include" - EXTRA_LIBS="$EXTRA_LIBS -L$MCRYPT_DIR/lib -lmcrypt" + AC_ADD_INCLUDE($MCRYPT_DIR/include) + AC_ADD_LIBRARY_WITH_PATH(mcrypt, $MCRYPT_DIR/lib) AC_DEFINE(HAVE_LIBMCRYPT) @@ -2618,8 +2624,8 @@ if test "$MHASH_DIR" = ""; then AC_MSG_ERROR(Please reinstall libmhash - I cannot find mhash.h) fi - INCLUDES="$INCLUDES -I$MHASH_DIR/include" - EXTRA_LIBS="$EXTRA_LIBS -L$MHASH_DIR/lib -lmhash" + AC_ADD_INCLUDE($MHASH_DIR/include) + AC_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/lib) AC_DEFINE(HAVE_LIBMHASH) @@ -2632,6 +2638,19 @@ AC_MSG_RESULT(no) ]) +AC_MSG_CHECKING(whether to enable UCD SNMP hack) +AC_ARG_ENABLE(ucd-snmp-hack, +[ --enable-ucd-snmp-hack Enable UCD SNMP hack],[ + if test "$enableval" = "yes" ; then + AC_DEFINE(UCD_SNMP_HACK, 1) + AC_MSG_RESULT(yes) + else + AC_MSG_RESULT(no) + fi +],[ + AC_MSG_RESULT(no) +]) + AC_MSG_CHECKING(whether to include PCRE support) AC_ARG_WITH(pcre-regex, [ --without-pcre-regex Don't include Perl Compatible Regular Expressions support],[ @@ -2654,7 +2673,7 @@ AC_MSG_CHECKING(whether to include POSIX support) AC_ARG_WITH(posix, -[ --without-posix Don't include POSIX functions],[ +[ --without-posix Don't include POSIX functions],[ if test "$withval" = "yes"; then AC_DEFINE(HAVE_POSIX, 1) AC_MSG_RESULT(yes) @@ -2701,6 +2720,7 @@ AC_SUBST(LDFLAGS_SHLIB_EXPORT) AC_SUBST(INCLUDES) AC_SUBST(EXTRA_LIBS) +AC_SUBST(RPATHS) dnl Create the necessary directories if building using VPATH if test ! -d functions; then Index: php3/libphp3.module.in diff -u php3/libphp3.module.in:1.25 php3/libphp3.module.in:1.26 --- php3/libphp3.module.in:1.25 Sun Apr 25 18:24:09 1999 +++ php3/libphp3.module.in Sun Jun 20 08:38:41 1999 @@ -1,7 +1,7 @@ Name: php3_module ConfigStart RULE_WANTHSREGEX=@HSREGEX@ - LIBS="@PHP_LIBS@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @MYSQL_LFLAGS@ @MYSQL_LIBS@ @MSQL_LFLAGS@ @MSQL_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @PGSQL_LFLAGS@ @PGSQL_LIBS@ @LDAP_LFLAGS@ @LDAP_LIBS@ @VELOCIS_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @ASPELL_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @PDFLIB_LIBS@ @XML_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @IMAGICK_LFLAGS@ @IMAGICK_LIBS@ @LIBS@ $LIBS @DBM_LIB@ @DBA_LFLAGS@ @DBA_LIBS@ @EXTRA_LIBS@" + LIBS="@RPATHS@ @PHP_LIBS@ @ORACLE_LFLAGS@ @ORACLE_LIBS@ @IODBC_LFLAGS@ @IODBC_LIBS@ @OPENLINK_LFLAGS@ @OPENLINK_LIBS@ @SYBASE_LFLAGS@ @SYBASE_LIBS@ @SYBASE_CT_LFLAGS@ @SYBASE_CT_LIBS@ @ADA_LFLAGS@ @ADA_LIBS@ @SOLID_LIBS@ @VELOCIS_LIBS@ @GD_LIBS@ @ZLIB_LIBS@ @CODBC_LFLAGS@ @CODBC_LIBS@ @IMAP_LIBS@ @IFX_LFLAGS@ @IFX_LIBS@ @SNMP_LFLAGS@ @SNMP_LIBS@ @IBASE_LFLAGS@ @IBASE_LIBS@ @PDFLIB_LIBS@ @GETTEXT_LFLAGS@ @GETTEXT_LIBS@ @LIBS@ $LIBS @DBM_LIB@ @EXTRA_LIBS@" RULE_HIDE=yes ConfigEnd