diff options
author | nandika | 2010-02-25 11:46:48 +0000 |
---|---|---|
committer | nandika | 2010-02-25 11:46:48 +0000 |
commit | 45691f58c8bd558e2ac59b38add2264a6d21d231 (patch) | |
tree | 778b48e160423634e0e34739dfd0fdf7e826dae5 /axiom | |
parent | 7014dc0572bd0e160c4ffb34a36abec23cd7c16b (diff) | |
download | axis2c-45691f58c8bd558e2ac59b38add2264a6d21d231.tar.gz axis2c-45691f58c8bd558e2ac59b38add2264a6d21d231.tar.bz2 |
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
Diffstat (limited to 'axiom')
-rw-r--r-- | axiom/configure.ac | 20 |
1 files changed, 11 insertions, 9 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 " |