summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIlia Alshanetsky <iliaa@php.net>2004-05-30 17:57:37 +0000
committerIlia Alshanetsky <iliaa@php.net>2004-05-30 17:57:37 +0000
commit8ee3553aa46e2f71a08e6d3cd248eae47e5ee2ed (patch)
treebb23f3efdf9fcef555ec5869f8b3151ec767d084
parent12e1c89041fadd3341087b053b008ad9cadf3ddd (diff)
downloadphp-git-8ee3553aa46e2f71a08e6d3cd248eae47e5ee2ed.tar.gz
MFH: Fixed bug #28564 (Problem building informix as a shared extension).
-rw-r--r--NEWS2
-rw-r--r--ext/informix/Makefile.frag3
-rw-r--r--ext/informix/ifx.ec4
3 files changed, 9 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 9ad68f7546..4591d19382 100644
--- a/NEWS
+++ b/NEWS
@@ -1,6 +1,8 @@
PHP 4 NEWS
|||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||||
?? Jun 2004, Version 4.3.7
+- Fixed bug #28564 (Problem building informix as a shared extension).
+ (roques at mti dot ag, Ilia)
25 May 2004, Version 4.3.7RC1
- Upgraded bundled GD library to 2.0.23. (Ilia)
diff --git a/ext/informix/Makefile.frag b/ext/informix/Makefile.frag
index e95934fc3f..2da3a15e7f 100644
--- a/ext/informix/Makefile.frag
+++ b/ext/informix/Makefile.frag
@@ -1,7 +1,10 @@
+OVERALL_TARGET += $(srcdir)/ifx.c
$(srcdir)/ifx.c: $(srcdir)/ifx.ec $(builddir)/libphpifx.a
(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; \
+ mv ifx.c $@ || true; \
else \
touch $@; \
fi)
diff --git a/ext/informix/ifx.ec b/ext/informix/ifx.ec
index bf4fb8081f..765058d288 100644
--- a/ext/informix/ifx.ec
+++ b/ext/informix/ifx.ec
@@ -37,6 +37,10 @@
/* prevent mod_ssl.h's header file from being included. */
#define AP_HOOK_H
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
#include "php.h"
#include "php_globals.h"
#include "ext/standard/php_standard.h"