cvs: php-src / NEWS /ext/informix Makefile.frag config.m4

From: Date: Mon, 27 Jun 2005 18:38:03 +0000
Subject: cvs: php-src / NEWS /ext/informix Makefile.frag config.m4
Groups: php.cvs 
Request: Send a blank email to php-cvs+get-32528@lists.php.net to get a copy of this message
sniper Mon Jun 27 14:38:03 2005 EDT Modified files: /php-src NEWS /php-src/ext/informix Makefile.frag config.m4 Log: - Fixed bug #33469 (Compile error undefined reference to ifx_checkAPI). http://cvs.php.net/diff.php/php-src/NEWS?r1=1.1961&r2=1.1962&ty=u Index: php-src/NEWS diff -u php-src/NEWS:1.1961 php-src/NEWS:1.1962 --- php-src/NEWS:1.1961 Mon Jun 27 13:42:32 2005 +++ php-src/NEWS Mon Jun 27 14:38:03 2005 @@ -5,6 +5,7 @@ usage of buffered queries. - Fixed bug #33491 (crash after extending MySQLi internal class). (Tony) - Fixed bug #33475 (cURL handle is not closed on curl_close(). (Ilia) +- Fixed bug #33469 (Compile error undefined reference to ifx_checkAPI). (Jani) - Fixed bug #32660 (Assignment by reference causes crash when field access is overloaded (__get)). (Dmitry) - Fixed bug #30828 (debug_backtrace() reports incorrect class in overridden http://cvs.php.net/diff.php/php-src/ext/informix/Makefile.frag?r1=1.3&r2=1.4&ty=u Index: php-src/ext/informix/Makefile.frag diff -u php-src/ext/informix/Makefile.frag:1.3 php-src/ext/informix/Makefile.frag:1.4 --- php-src/ext/informix/Makefile.frag:1.3 Sun May 30 13:56:51 2004 +++ php-src/ext/informix/Makefile.frag Mon Jun 27 14:38:03 2005 @@ -1,6 +1,9 @@ + OVERALL_TARGET += $(srcdir)/ifx.c -$(srcdir)/ifx.c: $(srcdir)/ifx.ec $(builddir)/libphpifx.a +CC=$(IFX_CC) + +$(srcdir)/ifx.c: $(srcdir)/ifx.ec (if test -d $(INFORMIXDIR); then \ THREADLIB=POSIX $(INFORMIXDIR)/bin/esql -e $(IFX_ESQL_FLAGS) $(srcdir)/ifx.ec; mv ifx.c $@; \ THREADLIB=POSIX $(INFORMIXDIR)/bin/esql -e $(IFX_ESQL_FLAGS) $(srcdir)/ifx.ec; \ @@ -9,5 +12,3 @@ touch $@; \ fi) -$(builddir)/libphpifx.a: - $(LIBTOOL) --mode=link $(CC) $(IFX_LIBOBJS) -o $@ http://cvs.php.net/diff.php/php-src/ext/informix/config.m4?r1=1.31&r2=1.32&ty=u Index: php-src/ext/informix/config.m4 diff -u php-src/ext/informix/config.m4:1.31 php-src/ext/informix/config.m4:1.32 --- php-src/ext/informix/config.m4:1.31 Sun May 29 19:16:41 2005 +++ php-src/ext/informix/config.m4 Mon Jun 27 14:38:03 2005 @@ -1,5 +1,5 @@ dnl -dnl $Id: config.m4,v 1.31 2005/05/29 23:16:41 sniper Exp $ +dnl $Id: config.m4,v 1.32 2005/06/27 18:38:03 sniper Exp $ dnl PHP_ARG_WITH(informix,for Informix support, @@ -60,11 +60,6 @@ for i in $IFX_LIBS; do case "$i" in - *.o) - IFX_LIBOBJS="$IFX_LIBOBJS $i" - PHP_ADD_LIBPATH($ext_builddir, INFORMIX_SHARED_LIBADD) - PHP_ADD_LIBRARY_DEFER(phpifx, 1, INFORMIX_SHARED_LIBADD) - ;; -lm) ;; -lc) @@ -90,7 +85,14 @@ PHP_SUBST(INFORMIX_SHARED_LIBADD) PHP_SUBST(INFORMIXDIR) - PHP_SUBST(IFX_LIBOBJS) PHP_SUBST(IFX_ESQL_FLAGS) AC_DEFINE(HAVE_IFX,1,[ ]) + + if test "$ext_shared" = "yes"; then + IFX_CC=$CC + with_tags= + else + IFX_CC='$(INFORMIXDIR)/bin/esql' + fi + PHP_SUBST(IFX_CC) fi

« previous php.cvs (#32528) next »