fix various build errors. default to no xmlrpc

4 files changed, 46 insertions, 90 deletions

diff --git a/ext/xmlrpc/config.m4 b/ext/xmlrpc/config.m4
index 18809032db..0e6e2dc7d1 100644
--- a/ext/xmlrpc/config.m4
+++ b/ext/xmlrpc/config.m4
@@ -1,36 +1,31 @@
-
 dnl $Id$
+dnl config.m4 for extension Xmlrpc
+
 
-sinclude(ext/xmlrpc/libxmlrpc/acinclude.m4)
-sinclude(ext/xmlrpc/libxmlrpc/xmlrpc.m4)
-sinclude(libxmlrpc/acinclude.m4)
-sinclude(libxmlrpc/xmlrpc.m4)
-
-AC_DEFUN(XMLRPC_LIB_CHK,[
-  str="$XMLRPC_DIR/$1/libxmlrpc.*"
-  for j in `echo $str`; do
-    if test -r $j; then
-      XMLRPC_LIB_DIR=$XMLRPC_DIR/$1
-      break 2
-    fi
-  done
-])
-	
 PHP_ARG_WITH(xmlrpc, for XMLRPC-EPI support,
-[  --with-xmlrpc[=DIR]      Include XMLRPC-EPI support. DIR is the XMLRPC-EPI base
-                          directory. If unspecified, the bundled XMLRPC-EPI library
-                          will be used.], yes)
-                          
-PHP_ARG_WITH(expat-dir, libexpat dir for XMLRPC-EPI
-[  --with-expat-dir=DIR    XMLRPC-EPI: libexpat dir for XMLRPC-EPI])
+[  --with-xmlrpc[=DIR]     Include XMLRPC-EPI support])
 
+PHP_ARG_WITH(expat-dir, libexpat dir for XMLRPC-EPI,
+[  --with-expat-dir=DIR    XMLRPC-EPI: libexpat dir for XMLRPC-EPI])
 
 if test "$PHP_XMLRPC" != "no"; then
-  AC_DEFINE(HAVE_XMLRPC, 1, [Whether you have XMLRPC-EPI])
-  PHP_EXTENSION(xmlrpc,$ext_shared)
 
-dnl check for iconv
-  found_iconv=no
+  PHP_EXTENSION(xmlrpc, $ext_shared)
+  PHP_SUBST(XMLRPC_SHARED_LIBADD)
+  AC_DEFINE(HAVE_XMLRPC,1,[ ])
+
+  testval=no
+  for i in $PHP_EXPAT_DIR $XMLRPC_DIR; do
+    if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.s?; then
+      AC_DEFINE(HAVE_LIBEXPAT2,1,[ ])
+      PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XMLRPC_SHARED_LIBADD)
+      PHP_ADD_INCLUDE($i/include)
+      testval=yes
+    fi
+  done
+
+
+dnl  found_iconv=no
   AC_CHECK_LIB(c, iconv_open, found_iconv=yes)
   if test "$found_iconv" = "no"; then
       for i in /usr /usr/local $ICONV_DIR; do
@@ -42,27 +37,12 @@ dnl check for iconv
   fi
   
   if test "$found_iconv" = "no"; then
-    AC_MSG_ERROR(iconv not found, in order to build XMLRPC-EPI you need the iconv library)
+    AC_MSG_ERROR(iconv not found, in order to build xmlrpc you need the iconv library)
   fi
   
-dnl check for expat
-  testval=no
-  for i in $PHP_EXPAT_DIR; do
-    if test -f $i/lib/libexpat.a -o -f $i/lib/libexpat.s?; then
-      AC_DEFINE(HAVE_LIBEXPAT2,1,[ ])
-      PHP_ADD_LIBRARY_WITH_PATH(expat, $i/lib, XMLRPC_SHARED_LIBADD)
-      PHP_ADD_INCLUDE($i/include)
-      testval=yes
-    fi
-  done
-
-  if test "$testval" = "no"; then
-    PHP_ADD_LIBRARY(xmlparse)
-    PHP_ADD_LIBRARY(xmltok)
-  fi
-
 fi
 
+
 if test "$PHP_XMLRPC" = "yes"; then
   XMLRPC_CHECKS
   XMLRPC_LIBADD=libxmlrpc/libxmlrpc.la
@@ -73,50 +53,29 @@ if test "$PHP_XMLRPC" = "yes"; then
   LIB_BUILD($ext_builddir/libxmlrpc,$ext_shared,yes)
   PHP_ADD_INCLUDE($ext_srcdir/libxmlrpc)
   XMLRPC_MODULE_TYPE=builtin
-elif test "$PHP_XMLRPC" != "no"; then
-  for i in $PHP_XMLRPC; do
-    if test -r $i/include/xmlrpc/xmlrpc.h; then
-      XMLRPC_DIR=$i
-      XMLRPC_INC_DIR=$i/include/xmlrpc
-    elif test -r $i/include/xmlrpc.h; then
-      XMLRPC_DIR=$i
-      XMLRPC_INC_DIR=$i/include
-    fi
-  done
-
-  if test -z "$XMLRPC_DIR"; then
-    AC_MSG_ERROR(Cannot find header files under $PHP_XMLRPC)
-  fi
-
-  XMLRPC_MODULE_TYPE=external
 
-  for i in lib lib/xmlrpc; do
-    XMLRPC_LIB_CHK($i)
-  done
+elif test "$PHP_XMLRPC" != "no"; then
 
-  if test -z "$XMLRPC_LIB_DIR"; then
-    AC_MSG_ERROR(Cannot find xmlrpc library under $XMLRPC_DIR)
+  if test -r $PHP_XMLRPC/include/xmlrpc.h; then
+    XMLRPC_DIR=$PHP_XMLRPC
+  else
+    AC_MSG_CHECKING(for XMLRPC-EPI in default path)
+    for i in /usr/local /usr; do
+      if test -r $i/include/xmlrpc.h; then
+        XMLRPC_DIR=$i
+        AC_MSG_RESULT(found in $i)
+      fi
+    done
   fi
 
-  if test "$PHP_ZLIB_DIR" != "no"; then
-    PHP_ADD_LIBRARY(z,, XMLRPC_SHARED_LIBADD)
-    XMLRPC_LIBS="-L$PHP_ZLIB_DIR -z"
+  if test -z "$XMLRPC_DIR"; then
+    AC_MSG_RESULT(not found)
+    AC_MSG_ERROR(Please reinstall the XMLRPC-EPI distribution)
   fi
 
-  PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_LIB_DIR, XMLRPC_SHARED_LIBADD)
-  XMLRPC_LIBS="-L$XMLRPC_LIB_DIR -lxmlrpc $XMLRPC_LIBS"
-
-  PHP_ADD_INCLUDE($XMLRPC_INC_DIR)
-  XMLRPC_INCLUDE="-I$XMLRPC_INC_DIR"
-
-else
-  XMLRPC_MODULE_TYPE=none
+  PHP_ADD_INCLUDE($XMLRPC_DIR/include)
+  PHP_ADD_LIBRARY_WITH_PATH(xmlrpc, $XMLRPC_DIR/lib, XMLRPC_SHARED_LIBADD)
+  
 fi
 
 
-PHP_SUBST(XMLRPC_SHARED_LIBADD)
-PHP_SUBST_OLD(XMLRPC_MODULE_TYPE)
-PHP_SUBST_OLD(XMLRPC_LIBS)
-PHP_SUBST_OLD(XMLRPC_INCLUDE)
-
-
diff --git a/ext/xmlrpc/libxmlrpc/acinclude.m4 b/ext/xmlrpc/libxmlrpc/acinclude.m4
index 9535e45972..07bf4f0b07 100644
--- a/ext/xmlrpc/libxmlrpc/acinclude.m4
+++ b/ext/xmlrpc/libxmlrpc/acinclude.m4
@@ -28,11 +28,5 @@ AC_TYPE_SIZE_T
 AC_HEADER_TIME
 AC_TYPE_UID_T
 
-XMLRPC_CHECK_ULONG
-XMLRPC_CHECK_UCHAR
-XMLRPC_CHECK_UINT
-XMLRPC_CHECK_INT_8_16_32
-
-XMLRPC_TYPE_QSORT
 
 ])
diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc.h b/ext/xmlrpc/libxmlrpc/xmlrpc.h
index 2cfe7cb2d9..25ca90f3c5 100644
--- a/ext/xmlrpc/libxmlrpc/xmlrpc.h
+++ b/ext/xmlrpc/libxmlrpc/xmlrpc.h
@@ -41,11 +41,16 @@
 extern "C" {
 #endif
 
+/* allow version to be specified via compile line define */
+#ifndef XMLRPC_LIB_VERSION
+ #define XMLRPC_LIB_VERSION "0.41"
+#endif
+
 /* this number, representing the date, must be increased each time the API changes */
 #define XMLRPC_API_NO 20010721
 
 /* this string should be changed with each packaged release */
-#define XMLRPC_VERSION_STR "xmlrpc-epi v. " VERSION
+#define XMLRPC_VERSION_STR "xmlrpc-epi v. " XMLRPC_LIB_VERSION
 
 /* where to find more info. shouldn't need to change much */
 #define XMLRPC_HOME_PAGE_STR "http://xmlprc-epi.sourceforge.net/"
diff --git a/ext/xmlrpc/libxmlrpc/xmlrpc.m4 b/ext/xmlrpc/libxmlrpc/xmlrpc.m4
index 18d36067dc..7f797cb2a4 100644
--- a/ext/xmlrpc/libxmlrpc/xmlrpc.m4
+++ b/ext/xmlrpc/libxmlrpc/xmlrpc.m4
@@ -1,5 +1,3 @@
-CPPFLAGS="$CPPFLAGS -DVERSION=\\\"0.42\\\""
-
 AC_DEFUN(XMLRPC_CHECKS,[	
 
 AC_REQUIRE([AC_PROG_CC])