Browse files

Fix for 5.4 buildsystem changes

  • Loading branch information...
1 parent b699dd0 commit 6ea692f9242e4de110cd9fc0ca34981477be14c0 @johannes committed May 10, 2012
Showing with 8 additions and 13 deletions.
  1. +2 −0 Makefile.frag
  2. +6 −13 config.m4
View
2 Makefile.frag
@@ -1,3 +1,5 @@
+pconn: $(SAPI_PCONN_PATH)
+
$(SAPI_PCONN_PATH): $(PHP_GLOBAL_OBJS) $(PHP_SAPI_OBJS) $(PHP_PCONN_OBJS)
$(BUILD_PCONN)
View
19 config.m4
@@ -8,22 +8,15 @@ PHP_ARG_ENABLE(pconn,,
[ --enable-pconn Build PHP as pconn test module (for extension developers], no)
if test "$PHP_PCONN" != "no"; then
- PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/pconn/Makefile.frag,$abs_srcdir/pconn/pconn,sapi/pconn)
+ PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/sapi/pconn/Makefile.frag)
SAPI_PCONN_PATH=sapi/pconn/pconn
PHP_SUBST(SAPI_PCONN_PATH)
- PHP_SELECT_SAPI(pconn, program, main.c pconnect-module.c pconnect-sapi.c, "", '$(SAPI_PCONN_PATH)')
- case $host_alias in
- *darwin*)
- BUILD_PCONN="\$(CC) \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(NATIVE_RPATHS) \$(PHP_GLOBAL_OBJS:.lo=.o) \$(PHP_SAPI_OBJS:.lo=.o) \$(PHP_FRAMEWORKS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_PCONN_PATH)"
- ;;
- *cygwin*)
- SAPI_PCONN_PATH=sapi/pconn/pconn.exe
+ PHP_SELECT_SAPI(pconn, program, main.c pconnect-module.c pconnect-sapi.c, "", '$(SAPI_PCONN_PATH)')
+ if test $PHP_VERSION_ID -ge 50400; then
+ BUILD_PCONN="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_BINARY_OBJS) \$(PHP_PCONN_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_PCONN_PATH)"
+ else
BUILD_PCONN="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_PCONN_PATH)"
- ;;
- *)
- BUILD_PCONN="\$(LIBTOOL) --mode=link \$(CC) -export-dynamic \$(CFLAGS_CLEAN) \$(EXTRA_CFLAGS) \$(EXTRA_LDFLAGS_PROGRAM) \$(LDFLAGS) \$(PHP_RPATHS) \$(PHP_GLOBAL_OBJS) \$(PHP_SAPI_OBJS) \$(EXTRA_LIBS) \$(ZEND_EXTRA_LIBS) -o \$(SAPI_PCONN_PATH)"
- ;;
- esac
+ fi
PHP_SUBST(BUILD_PCONN)
fi

0 comments on commit 6ea692f

Please sign in to comment.