From 45691f58c8bd558e2ac59b38add2264a6d21d231 Mon Sep 17 00:00:00 2001 From: nandika Date: Thu, 25 Feb 2010 11:46:48 +0000 Subject: 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 --- samples/configure.ac | 24 +++++++++++------------- 1 file changed, 11 insertions(+), 13 deletions(-) (limited to 'samples') 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 -- cgit v1.1-32-gdbae