axis-c-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nand...@apache.org
Subject svn commit: r916256 - in /axis/axis2/c/core/trunk: axiom/configure.ac build.sh configure.ac guththila/configure.ac neethi/configure.ac samples/configure.ac tools/md5/configure.ac tools/tcpmon/configure.ac util/configure.ac
Date Thu, 25 Feb 2010 11:46:48 GMT
Author: nandika
Date: Thu Feb 25 11:46:48 2010
New Revision: 916256

URL: http://svn.apache.org/viewvc?rev=916256&view=rev
Log:
reverting patch given in axis2c-1436

Modified:
    axis/axis2/c/core/trunk/axiom/configure.ac
    axis/axis2/c/core/trunk/build.sh
    axis/axis2/c/core/trunk/configure.ac
    axis/axis2/c/core/trunk/guththila/configure.ac
    axis/axis2/c/core/trunk/neethi/configure.ac
    axis/axis2/c/core/trunk/samples/configure.ac
    axis/axis2/c/core/trunk/tools/md5/configure.ac
    axis/axis2/c/core/trunk/tools/tcpmon/configure.ac
    axis/axis2/c/core/trunk/util/configure.ac

Modified: axis/axis2/c/core/trunk/axiom/configure.ac
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/axiom/configure.ac?rev=916256&r1=916255&r2=916256&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/axiom/configure.ac (original)
+++ axis/axis2/c/core/trunk/axiom/configure.ac Thu Feb 25 11:46:48 2010
@@ -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 @@
 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 "

Modified: axis/axis2/c/core/trunk/build.sh
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/build.sh?rev=916256&r1=916255&r2=916256&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/build.sh (original)
+++ axis/axis2/c/core/trunk/build.sh Thu Feb 25 11:46:48 2010
@@ -7,7 +7,7 @@
 
 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
 

Modified: axis/axis2/c/core/trunk/configure.ac
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/configure.ac?rev=916256&r1=916255&r2=916256&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/configure.ac (original)
+++ axis/axis2/c/core/trunk/configure.ac Thu Feb 25 11:46:48 2010
@@ -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 @@
 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 @@
 
 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 @@
     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.

Modified: axis/axis2/c/core/trunk/guththila/configure.ac
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/guththila/configure.ac?rev=916256&r1=916255&r2=916256&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/guththila/configure.ac (original)
+++ axis/axis2/c/core/trunk/guththila/configure.ac Thu Feb 25 11:46:48 2010
@@ -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 @@
 
 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

Modified: axis/axis2/c/core/trunk/neethi/configure.ac
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/neethi/configure.ac?rev=916256&r1=916255&r2=916256&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/neethi/configure.ac (original)
+++ axis/axis2/c/core/trunk/neethi/configure.ac Thu Feb 25 11:46:48 2010
@@ -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 @@
 
 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 "

Modified: axis/axis2/c/core/trunk/samples/configure.ac
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/samples/configure.ac?rev=916256&r1=916255&r2=916256&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/samples/configure.ac (original)
+++ axis/axis2/c/core/trunk/samples/configure.ac Thu Feb 25 11:46:48 2010
@@ -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 @@
 
 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 @@
 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

Modified: axis/axis2/c/core/trunk/tools/md5/configure.ac
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/tools/md5/configure.ac?rev=916256&r1=916255&r2=916256&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/tools/md5/configure.ac (original)
+++ axis/axis2/c/core/trunk/tools/md5/configure.ac Thu Feb 25 11:46:48 2010
@@ -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 @@
     CFLAGS="$CFLAGS -ansi -Wall -Wno-implicit-function-declaration"
 fi
 
+LDFLAGS="$LDFLAGS -lpthread"
 
 dnl Checks for header files.
 AC_HEADER_STDC

Modified: axis/axis2/c/core/trunk/tools/tcpmon/configure.ac
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/tools/tcpmon/configure.ac?rev=916256&r1=916255&r2=916256&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/tools/tcpmon/configure.ac (original)
+++ axis/axis2/c/core/trunk/tools/tcpmon/configure.ac Thu Feb 25 11:46:48 2010
@@ -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])

Modified: axis/axis2/c/core/trunk/util/configure.ac
URL: http://svn.apache.org/viewvc/axis/axis2/c/core/trunk/util/configure.ac?rev=916256&r1=916255&r2=916256&view=diff
==============================================================================
--- axis/axis2/c/core/trunk/util/configure.ac (original)
+++ axis/axis2/c/core/trunk/util/configure.ac Thu Feb 25 11:46:48 2010
@@ -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 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"



Mime
View raw message