Fix compilation of wddx extension.

PR:		ports/69464
Submitted by:	Vadim Mikhailov <freebsd-bugs@mikhailov.org>
This commit is contained in:
Alex Dupre 2004-07-26 07:16:40 +00:00
parent 952fbc94d3
commit 1a64bae686
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=114745
3 changed files with 48 additions and 1 deletions

View file

@ -329,7 +329,10 @@ CONFIGURE_ARGS+=--enable-tokenizer
.endif
.if ${PHP_MODNAME} == "wddx"
CONFIGURE_ARGS+=--enable-wddx
LIB_DEPENDS+= expat.5:${PORTSDIR}/textproc/expat2
CONFIGURE_ARGS+=--enable-wddx \
--with-expat-dir=${LOCALBASE}
USE_PHP= xml session
USE_PHP_BUILD= yes

View file

@ -0,0 +1,31 @@
--- config.m4.orig Mon Jul 26 09:05:10 2004
+++ config.m4 Mon Jul 26 09:07:46 2004
@@ -5,6 +5,9 @@
PHP_ARG_ENABLE(wddx,whether to enable WDDX support,
[ --enable-wddx Enable WDDX support.])
+PHP_ARG_WITH(expat-dir, external libexpat install dir,
+[ --with-expat-dir=<DIR> WDDX: external libexpat install dir], no, no)
+
if test "$PHP_WDDX" != "no"; then
if test "$ext_shared" != "yes" && test "$enable_xml" = "no"; then
AC_MSG_WARN(Activating XML)
@@ -12,4 +15,18 @@
fi
AC_DEFINE(HAVE_WDDX, 1, [ ])
PHP_NEW_EXTENSION(wddx, wddx.c, $ext_shared)
+
+ for i in $PHP_EXPAT_DIR; do
+ if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.$SHLIB_SUFFIX_NAME ; then
+ EXPAT_DIR=$i
+ fi
+ done
+
+ if test -z "$EXPAT_DIR"; then
+ AC_MSG_ERROR(not found. Please reinstall the expat distribution.)
+ fi
+
+ PHP_ADD_INCLUDE($EXPAT_DIR/include)
+ PHP_ADD_LIBRARY_WITH_PATH(expat, $EXPAT_DIR/lib, XML_SHARED_LIBADD)
+ PHP_SUBST(XML_SHARED_LIBADD)
fi

View file

@ -0,0 +1,13 @@
--- wddx.c.orig Mon Jul 26 08:56:21 2004
+++ wddx.c Mon Jul 26 08:56:40 2004
@@ -18,6 +18,10 @@
/* $Id: wddx.c,v 1.96.2.5.2.1 2004/07/13 13:15:30 iliaa Exp $ */
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
#include "php.h"
#include "php_wddx.h"