Author: shankar
Date: Tue Feb 23 12:45:26 2010
New Revision: 915311
URL: http://svn.apache.org/viewvc?rev=915311&view=rev
Log:
upgrade autotools. Check AXIS2C-1436 for more details
Modified:
axis/axis2/c/rampart/trunk/configure.ac
axis/axis2/c/rampart/trunk/samples/configure.ac
Modified: axis/axis2/c/rampart/trunk/configure.ac
URL:
http://svn.apache.org/viewvc/axis/axis2/c/rampart/trunk/configure.ac?rev=915311&r1=915310&r2=915311&view=diff
==============================================================================
--- axis/axis2/c/rampart/trunk/configure.ac (original)
+++ axis/axis2/c/rampart/trunk/configure.ac Tue Feb 23 12:45:26 2010
@@ -1,10 +1,10 @@
dnl run autogen.sh to generate the configure script.
-AC_PREREQ(2.59)
+AC_PREREQ(2.63)
-AC_INIT(rampartc-src, 1.3.0)
-AC_CANONICAL_SYSTEM
-AM_CONFIG_HEADER(config.h)
+AC_INIT([rampartc-src],[1.3.0])
+AC_CANONICAL_TARGET
+AC_CONFIG_HEADERS([config.h])
dnl AM_INIT_AUTOMAKE([tar-ustar])
AM_INIT_AUTOMAKE
m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
@@ -14,26 +14,26 @@
AC_PROG_CC
AC_PROG_CXX
AC_PROG_CPP
-AC_PROG_LIBTOOL
+LT_INIT
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_TRY_COMPILE([],[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
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_TRY_COMPILE([],[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
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/rampart/trunk/samples/configure.ac
URL:
http://svn.apache.org/viewvc/axis/axis2/c/rampart/trunk/samples/configure.ac?rev=915311&r1=915310&r2=915311&view=diff
==============================================================================
--- axis/axis2/c/rampart/trunk/samples/configure.ac (original)
+++ axis/axis2/c/rampart/trunk/samples/configure.ac Tue Feb 23 12:45:26 2010
@@ -1,10 +1,10 @@
dnl run autogen.sh to generate the configure script.
-AC_PREREQ(2.59)
+AC_PREREQ(2.63)
-AC_INIT(rampart-samples-src, 1.3.0)
-AC_CANONICAL_SYSTEM
-AM_CONFIG_HEADER(config.h)
+AC_INIT([rampart-samples-src],[1.3.0])
+AC_CANONICAL_TARGET
+AC_CONFIG_HEADERS([config.h])
dnl AM_INIT_AUTOMAKE([tar-ustar])
AM_INIT_AUTOMAKE
m4_ifdef([_A][M_PROG_TAR],[_A][M_SET_OPTION([tar-ustar])])
@@ -14,26 +14,26 @@
AC_PROG_CC
AC_PROG_CXX
AC_PROG_CPP
-AC_PROG_LIBTOOL
+LT_INIT
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_TRY_COMPILE([],[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
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_TRY_COMPILE([],[
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[]], [[
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
