cvs: /php3 ChangeLog aclocal.m4

ssb Fri Mar 10 08:10:54 2000 EDT Modified files: /php3 ChangeLog aclocal.m4 Log: Fix Solid (2.3) support on glibc2 systems (requires -lpthread) Index: php3/ChangeLog diff -u php3/ChangeLog:1.830 php3/ChangeLog:1.831 --- php3/ChangeLog:1.830 Sat Feb 26 01:03:56 2000 +++ php3/ChangeLog Fri Mar 10 08:10:54 2000 @@ -2,6 +2,7 @@ ||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||| ? ?, Version 3.0.16 +- Fix Solid 2.3 support on glibc2 systems (Stig) - Enhance resolution of microtime() on OS/2 by using the high resolution timer API. (Brian Havard) Index: php3/aclocal.m4 diff -u php3/aclocal.m4:1.49 php3/aclocal.m4:1.50 --- php3/aclocal.m4:1.49 Fri Dec 31 18:30:52 1999 +++ php3/aclocal.m4 Fri Mar 10 08:10:54 2000 @@ -1,4 +1,4 @@ -dnl $Id: aclocal.m4,v 1.49 2000/01/01 02:30:52 sas Exp $ +dnl $Id: aclocal.m4,v 1.50 2000/03/10 16:10:54 ssb Exp $ dnl dnl This file contains local autoconf functions. @@ -161,7 +161,25 @@ if test ! -f $SOLID_LIBS; then SOLID_LIBS=echo $1/bcl${ac_solid_os}*.a | cut -d' ' -f1 fi + if test ! -f $SOLID_LIBS; then + SOLID_LIBS="-L$1 -lsolcli" + fi AC_MSG_RESULT(echo $SOLID_LIBS | sed -e 's!.*/!!') + AC_SOLID_PTHREADS +]) + +dnl +dnl Figure out whether Solid needs to be linked with pthreads. +dnl +AC_DEFUN(AC_SOLID_PTHREADS,[ + AC_MSG_CHECKING([whether Solid needs pthreads]) + save_LIBS=$LIBS + LIBS="$SOLID_LIBS" + AC_TRY_LINK_FUNC(SQLAllocEnv, + [LIBS="$save_LIBS" + AC_MSG_RESULT(no)], + [LIBS="-lpthread $save_LIBS" + AC_MSG_RESULT(yes)]) ]) dnl