reverting patch given in axis2c-1436

git-svn-id: http://svn.apache.org/repos/asf/axis/axis2/c/core/trunk@916256 13f79535-47bb-0310-9956-ffa450edef68

9 files changed, 80 insertions, 69 deletions

diff --git a/axiom/configure.ac b/axiom/configure.ac
index e043566..6802fb9 100644
--- a/axiom/configure.ac
+++ b/axiom/configure.ac
@@ -1,36 +1,37 @@
 dnl run autogen.sh to generate the configure script.
 
-AC_PREREQ(2.63)
+AC_PREREQ(2.59)
 
-AC_INIT([axis2_axiom-src],[1.6.0])
-AC_CANONICAL_TARGET
-AC_CONFIG_HEADERS([config.h])
+AC_INIT(axis2_axiom-src, 1.6.0)
+AC_CANONICAL_SYSTEM
+AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE
 AC_PREFIX_DEFAULT(/usr/local/axis2_axiom)
 
 dnl Checks for programs.
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_CPP
-LT_INIT
+AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
 dnl check for flavours of varargs macros (test from GLib)
 AC_MSG_CHECKING(for ISO C99 varargs macros in C)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
+AC_TRY_COMPILE([],[
 int a(int p1, int p2, int p3);
 #define call_a(...) a(1,__VA_ARGS__)
 call_a(2,3);
-]])],[axis2c_have_iso_c_varargs=yes],[axis2c_have_iso_c_varargs=no])
+],axis2c_have_iso_c_varargs=yes,axis2c_have_iso_c_varargs=no)
 AC_MSG_RESULT($axis2c_have_iso_c_varargs)
 
 AC_MSG_CHECKING(for GNUC varargs macros)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
+AC_TRY_COMPILE([],[
 int a(int p1, int p2, int p3);
 #define call_a(params...) a(1,params)
 call_a(2,3);
-]])],[axis2c_have_gnuc_varargs=yes],[axis2c_have_gnuc_varargs=no])
+],axis2c_have_gnuc_varargs=yes,axis2c_have_gnuc_varargs=no)
 AC_MSG_RESULT($axis2c_have_gnuc_varargs)
 
 dnl Output varargs tests
@@ -45,6 +46,7 @@ dnl Checks for libraries.
 AC_CHECK_LIB(dl, dlopen)
 AC_CHECK_LIB(z, inflate)
 
+#CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -Wno-implicit-function-declaration"
 CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
 if test "$GCC" = "yes"; then
     CFLAGS="$CFLAGS -ansi -Werror -Wall -Wno-implicit-function-declaration "
diff --git a/build.sh b/build.sh
index d88b220..317b1d4 100755
--- a/build.sh
+++ b/build.sh
@@ -7,7 +7,7 @@ export AXIS2C_HOME
 
 echo "AXIS2C_HOME = ${AXIS2C_HOME}"
 
-sh configure --prefix=${AXIS2C_HOME} --enable-tests=yes --with-apache2=/usr/include/httpd --with-apr=/usr/include/apr-1
+sh configure --prefix=${AXIS2C_HOME} --enable-tests=yes --with-apache2=/usr/local/apache2/include 
 make -j 10 
 make install
 
diff --git a/configure.ac b/configure.ac
index 80061b6..8393e3d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
 dnl run autogen.sh to generate the configure script.
-AC_PREREQ(2.63)
+AC_PREREQ(2.59)
 
-AC_INIT([axis2c-src],[1.6.0])
-AC_CANONICAL_TARGET
-AC_CONFIG_HEADERS([config.h])
+AC_INIT(axis2c-src, 1.6.0)
+AC_CANONICAL_SYSTEM
+AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE([tar-ustar])
 AC_PREFIX_DEFAULT(/usr/local/axis2c)
 
@@ -11,7 +11,7 @@ dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CXX
 AC_PROG_CPP
-LT_INIT
+AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
@@ -19,19 +19,19 @@ AC_PROG_MAKE_SET
 
 dnl check for flavours of varargs macros (test from GLib)
 AC_MSG_CHECKING(for ISO C99 varargs macros in C)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
+AC_TRY_COMPILE([],[
 int a(int p1, int p2, int p3);
 #define call_a(...) a(1,__VA_ARGS__)
 call_a(2,3);
-]])],[axis2c_have_iso_c_varargs=yes],[axis2c_have_iso_c_varargs=no])
+],axis2c_have_iso_c_varargs=yes,axis2c_have_iso_c_varargs=no)
 AC_MSG_RESULT($axis2c_have_iso_c_varargs)
 
 AC_MSG_CHECKING(for GNUC varargs macros)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
+AC_TRY_COMPILE([],[
 int a(int p1, int p2, int p3);
 #define call_a(params...) a(1,params)
 call_a(2,3);
-]])],[axis2c_have_gnuc_varargs=yes],[axis2c_have_gnuc_varargs=no])
+],axis2c_have_gnuc_varargs=yes,axis2c_have_gnuc_varargs=no)
 AC_MSG_RESULT($axis2c_have_gnuc_varargs)
 
 dnl Output varargs tests
@@ -59,10 +59,12 @@ if test -d $srcdir/neethi; then
     AC_CONFIG_SUBDIRS(neethi)
 fi
 
+#CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -Wno-implicit-function-declaration"
 CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
 CPPFLAGS="$CPPFLAGS -D_LARGEFILE64_SOURCE"
 if test "$GCC" = "yes"; then
     CFLAGS="$CFLAGS -ansi -Wall -Werror -Wno-implicit-function-declaration -g -D_GNU_SOURCE"
+#    CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration"
 fi
 
 dnl Checks for header files.
diff --git a/guththila/configure.ac b/guththila/configure.ac
index 84da99b..5a6951b 100644
--- a/guththila/configure.ac
+++ b/guththila/configure.ac
@@ -1,10 +1,10 @@
 dnl run autogen.sh to generate the configure script.
 
-AC_PREREQ(2.63)
+AC_PREREQ(2.59)
 
-AC_INIT([guththilac-src],[1.6.0])
-AC_CANONICAL_TARGET
-AC_CONFIG_HEADERS([config.h])
+AC_INIT(guththilac-src, 1.6.0)
+AC_CANONICAL_SYSTEM
+AM_CONFIG_HEADER(config.h)
 dnl AM_INIT_AUTOMAKE([tar-ustar])
 AM_INIT_AUTOMAKE
 AC_PREFIX_DEFAULT(/usr/local/guththila)
@@ -13,27 +13,28 @@ m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
 
 dnl Checks for programs.
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_CPP
-LT_INIT
+AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
 dnl check for flavours of varargs macros (test from GLib)
 AC_MSG_CHECKING(for ISO C99 varargs macros in C)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
+AC_TRY_COMPILE([],[
 int a(int p1, int p2, int p3);
 #define call_a(...) a(1,__VA_ARGS__)
 call_a(2,3);
-]])],[axis2c_have_iso_c_varargs=yes],[axis2c_have_iso_c_varargs=no])
+],axis2c_have_iso_c_varargs=yes,axis2c_have_iso_c_varargs=no)
 AC_MSG_RESULT($axis2c_have_iso_c_varargs)
 
 AC_MSG_CHECKING(for GNUC varargs macros)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
+AC_TRY_COMPILE([],[
 int a(int p1, int p2, int p3);
 #define call_a(params...) a(1,params)
 call_a(2,3);
-]])],[axis2c_have_gnuc_varargs=yes],[axis2c_have_gnuc_varargs=no])
+],axis2c_have_gnuc_varargs=yes,axis2c_have_gnuc_varargs=no)
 AC_MSG_RESULT($axis2c_have_gnuc_varargs)
 
 dnl Output varargs tests
diff --git a/neethi/configure.ac b/neethi/configure.ac
index 9f3418b..f3a317c 100644
--- a/neethi/configure.ac
+++ b/neethi/configure.ac
@@ -1,10 +1,10 @@
 dnl run autogen.sh to generate the configure script.
 
-AC_PREREQ(2.63)
+AC_PREREQ(2.59)
 
-AC_INIT([neethi-src],[1.6.0])
-AC_CANONICAL_TARGET
-AC_CONFIG_HEADERS([config.h])
+AC_INIT(neethi-src, 1.6.0)
+AC_CANONICAL_SYSTEM
+AM_CONFIG_HEADER(config.h)
 dnl AM_INIT_AUTOMAKE([tar-ustar])
 AM_INIT_AUTOMAKE
 m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
@@ -12,24 +12,26 @@ AC_PREFIX_DEFAULT(/usr/local/neethi)
 
 dnl Checks for programs.
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_CPP
-LT_INIT
+AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
 dnl check for flavours of varargs macros (test from GLib)
 AC_MSG_CHECKING(for ISO C99 varargs macros in C)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
+AC_TRY_COMPILE([],[
 int a(int p1, int p2, int p3);
 #define call_a(...) a(1,__VA_ARGS__)
 call_a(2,3);
-]])],[axis2c_have_iso_c_varargs=yes],[axis2c_have_iso_c_varargs=no])
+],axis2c_have_iso_c_varargs=yes,axis2c_have_iso_c_varargs=no)
 AC_MSG_RESULT($axis2c_have_iso_c_varargs)
 
 dnl Checks for libraries.
 AC_CHECK_LIB(dl, dlopen)
 
+#CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -Wno-implicit-function-declaration"
 CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
 if test "$GCC" = "yes"; then
     CFLAGS="$CFLAGS -ansi -Wall -Werror -Wno-implicit-function-declaration "
diff --git a/samples/configure.ac b/samples/configure.ac
index b708d54..734e88c 100644
--- a/samples/configure.ac
+++ b/samples/configure.ac
@@ -1,10 +1,10 @@
 dnl run autogen.sh to generate the configure script.
 
-AC_PREREQ(2.63)
+AC_PREREQ(2.59)
 
-AC_INIT([axis2c-sample-src],[1.6.0])
-AC_CANONICAL_TARGET
-AC_CONFIG_HEADERS([config.h])
+AC_INIT(axis2c-sample-src, 1.6.0)
+AC_CANONICAL_SYSTEM
+AM_CONFIG_HEADER(config.h)
 dnl AM_INIT_AUTOMAKE([tar-ustar])
 AM_INIT_AUTOMAKE
 m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
@@ -12,27 +12,28 @@ AC_PREFIX_DEFAULT(/usr/local/axis2c)
 
 dnl Checks for programs.
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_CPP
-LT_INIT
+AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
 dnl check for flavours of varargs macros (test from GLib)
 AC_MSG_CHECKING(for ISO C99 varargs macros in C)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
+AC_TRY_COMPILE([],[
 int a(int p1, int p2, int p3);
 #define call_a(...) a(1,__VA_ARGS__)
 call_a(2,3);
-]])],[axis2c_have_iso_c_varargs=yes],[axis2c_have_iso_c_varargs=no])
+],axis2c_have_iso_c_varargs=yes,axis2c_have_iso_c_varargs=no)
 AC_MSG_RESULT($axis2c_have_iso_c_varargs)
 
 AC_MSG_CHECKING(for GNUC varargs macros)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
+AC_TRY_COMPILE([],[
 int a(int p1, int p2, int p3);
 #define call_a(params...) a(1,params)
 call_a(2,3);
-]])],[axis2c_have_gnuc_varargs=yes],[axis2c_have_gnuc_varargs=no])
+],axis2c_have_gnuc_varargs=yes,axis2c_have_gnuc_varargs=no)
 AC_MSG_RESULT($axis2c_have_gnuc_varargs)
 
 dnl Output varargs tests
@@ -46,10 +47,7 @@ fi
 dnl Checks for libraries.
 AC_CHECK_LIB(dl, dlopen)
 
-CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE" 
-if test "$GCC" = "yes"; then
-	CFLAGS="$CFLAGS -ansi -Wall -Werror -Wno-implicit-function-declaration -g -D_GNU_SOURCE"
-fi
+CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -Wno-implicit-function-declaration"
 
 dnl Checks for header files.
 AC_HEADER_STDC
diff --git a/tools/md5/configure.ac b/tools/md5/configure.ac
index 5a6d7a4..213ab14 100644
--- a/tools/md5/configure.ac
+++ b/tools/md5/configure.ac
@@ -1,17 +1,18 @@
 dnl run autogen.sh to generate the configure script.
 
-AC_PREREQ(2.63)
+AC_PREREQ(2.59)
 
-AC_INIT([md5-src],[1.6.0])
-AC_CANONICAL_TARGET
-AC_CONFIG_HEADERS([config.h])
+AC_INIT(md5-src, 1.6.0)
+AC_CANONICAL_SYSTEM
+AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AC_PREFIX_DEFAULT(/usr/local/md5)
 
 dnl Checks for programs.
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_CPP
-LT_INIT
+AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
@@ -22,6 +23,7 @@ if test "$GCC" = "yes"; then
     CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration"
 fi
 
+LDFLAGS="$LDFLAGS -lpthread"
 
 dnl Checks for header files.
 AC_HEADER_STDC
diff --git a/tools/tcpmon/configure.ac b/tools/tcpmon/configure.ac
index 6b90909..5619c87 100644
--- a/tools/tcpmon/configure.ac
+++ b/tools/tcpmon/configure.ac
@@ -1,27 +1,30 @@
 dnl run autogen.sh to generate the configure script.
 
-AC_PREREQ(2.63)
+AC_PREREQ(2.59)
 
-AC_INIT([tcpmon-src],[1.6.0])
-AC_CANONICAL_TARGET
-AC_CONFIG_HEADERS([config.h])
+AC_INIT(tcpmon-src, 1.6.0)
+AC_CANONICAL_SYSTEM
+AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 AC_PREFIX_DEFAULT(/usr/local/tcpmon)
 
 dnl Checks for programs.
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_CPP
-LT_INIT
+AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
 
-CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
+CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE -g"
 if test "$GCC" = "yes"; then
-    CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration -g"
+    CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration"
 fi
 
+LDFLAGS="$LDFLAGS -lpthread"
+
 dnl Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([stdio.h stdlib.h string.h])
diff --git a/util/configure.ac b/util/configure.ac
index 1b78cd3..0e1ed19 100644
--- a/util/configure.ac
+++ b/util/configure.ac
@@ -1,36 +1,36 @@
 dnl run autogen.sh to generate the configure script.
 
-AC_PREREQ(2.63)
+AC_PREREQ(2.59)
 
-AC_INIT([axis2_util-src],[1.6.0])
-AC_CANONICAL_TARGET
-AC_CONFIG_HEADERS([config.h])
+AC_INIT(axis2_util-src, 1.6.0)
+AC_CANONICAL_SYSTEM
+AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE
 AC_PREFIX_DEFAULT(/usr/local/axis2_util)
 
 dnl Checks for programs.
 AC_PROG_CC
 AC_PROG_CPP
-LT_INIT
+AC_PROG_LIBTOOL
 AC_PROG_INSTALL
 AC_PROG_LN_S
 AC_PROG_MAKE_SET
 
 dnl check for flavours of varargs macros (test from GLib)
 AC_MSG_CHECKING(for ISO C99 varargs macros in C)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
+AC_TRY_COMPILE([],[
 int a(int p1, int p2, int p3);
 #define call_a(...) a(1,__VA_ARGS__)
 call_a(2,3);
-]])],[axis2c_have_iso_c_varargs=yes],[axis2c_have_iso_c_varargs=no])
+],axis2c_have_iso_c_varargs=yes,axis2c_have_iso_c_varargs=no)
 AC_MSG_RESULT($axis2c_have_iso_c_varargs)
 
 AC_MSG_CHECKING(for GNUC varargs macros)
-AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
+AC_TRY_COMPILE([],[
 int a(int p1, int p2, int p3);
 #define call_a(params...) a(1,params)
 call_a(2,3);
-]])],[axis2c_have_gnuc_varargs=yes],[axis2c_have_gnuc_varargs=no])
+],axis2c_have_gnuc_varargs=yes,axis2c_have_gnuc_varargs=no)
 AC_MSG_RESULT($axis2c_have_gnuc_varargs)
 
 dnl Output varargs tests
@@ -51,6 +51,7 @@ dnl ./util/src/platforms/unix/date_time_util_unix.c
 dnl is changed to call gettimeofday
 AC_CHECK_LIB(compat, ftime)
 
+#CFLAGS="$CFLAGS -ansi -Wall -D_LARGEFILE64_SOURCE -Wno-implicit-function-declaration"
 CFLAGS="$CFLAGS -D_LARGEFILE64_SOURCE"
 if test "$GCC" = "yes"; then
     CFLAGS="$CFLAGS -ansi -Wall -Werror -Wno-implicit-function-declaration -D_GNU_SOURCE"