diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | configure.ac | 13 | ||||
| -rw-r--r-- | m4/.gitignore | 6 | ||||
| -rw-r--r-- | m4/libcurl.m4 | 2 | ||||
| -rw-r--r-- | m4/libgcrypt.m4 | 2 | ||||
| -rw-r--r-- | m4/libgnurl.m4 | 2 |
6 files changed, 14 insertions, 12 deletions
diff --git a/.gitignore b/.gitignore index ac5ad8f44..fd235d95c 100644 --- a/.gitignore +++ b/.gitignore @@ -27,7 +27,6 @@ config.sub libtool ltmain.sh test-driver -m4/ GPATH GRTAGS GTAGS diff --git a/configure.ac b/configure.ac index cc8accf4c..edd8a83ed 100644 --- a/configure.ac +++ b/configure.ac @@ -21,10 +21,10 @@ AC_INIT([taler-exchange], [0.8.1], [taler-bug@gnunet.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_SRCDIR([src/util/util.c]) AC_CONFIG_HEADERS([taler_config.h]) -# support for non-recursive builds AC_CANONICAL_TARGET AC_CANONICAL_HOST -AC_CANONICAL_SYSTEM +AC_CANONICAL_BUILD +# support for non-recursive builds AM_INIT_AUTOMAKE([subdir-objects 1.9 tar-pax]) # pretty build rules @@ -32,6 +32,8 @@ AM_SILENT_RULES([yes]) AC_CONFIG_MACRO_DIR([m4]) AC_PROG_AWK +AC_PROG_CC +# FIXME: AC_PROG_CC_C99 is obsolete, remove for autoconf 2.70 AC_PROG_CC_C99 AC_PROG_OBJC AC_PROG_INSTALL @@ -60,12 +62,7 @@ AM_CONDITIONAL([DOC_ONLY], [test "x$doc_only" = "xyes"]) # Not indented, as most of the file falls under this one... AS_IF([test "x$doc_only" != xyes],[ -# Checks for programs. - -AC_PROG_CC -AC_PROG_CC_C99 - - +# Force some CFLAGS CFLAGS="-Wall -Wno-address-of-packed-member $CFLAGS" # Checks for header files. diff --git a/m4/.gitignore b/m4/.gitignore new file mode 100644 index 000000000..1f12f43df --- /dev/null +++ b/m4/.gitignore @@ -0,0 +1,6 @@ +# These are added by "autoreconf -if" +libtool.m4 +ltoptions.m4 +ltsugar.m4 +ltversion.m4 +lt~obsolete.m4 diff --git a/m4/libcurl.m4 b/m4/libcurl.m4 index a84077a5e..047260bae 100644 --- a/m4/libcurl.m4 +++ b/m4/libcurl.m4 @@ -61,7 +61,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG], AH_TEMPLATE([LIBCURL_PROTOCOL_SMTP],[Defined if libcurl supports SMTP]) AC_ARG_WITH(libcurl, - AC_HELP_STRING([--with-libcurl=PREFIX],[look for the curl library in PREFIX/lib and headers in PREFIX/include]), + AS_HELP_STRING([--with-libcurl=PREFIX],[look for the curl library in PREFIX/lib and headers in PREFIX/include]), [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])]) if test "$_libcurl_with" != "no" ; then diff --git a/m4/libgcrypt.m4 b/m4/libgcrypt.m4 index 6cf482fcb..9a29eb5ba 100644 --- a/m4/libgcrypt.m4 +++ b/m4/libgcrypt.m4 @@ -23,7 +23,7 @@ dnl AC_DEFUN([AM_PATH_LIBGCRYPT], [ AC_REQUIRE([AC_CANONICAL_HOST]) AC_ARG_WITH(libgcrypt-prefix, - AC_HELP_STRING([--with-libgcrypt-prefix=PFX], + AS_HELP_STRING([--with-libgcrypt-prefix=PFX], [prefix where LIBGCRYPT is installed (optional)]), libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") if test x$libgcrypt_config_prefix != x ; then diff --git a/m4/libgnurl.m4 b/m4/libgnurl.m4 index da72e5e87..412709373 100644 --- a/m4/libgnurl.m4 +++ b/m4/libgnurl.m4 @@ -61,7 +61,7 @@ AC_DEFUN([LIBGNURL_CHECK_CONFIG], AH_TEMPLATE([LIBGNURL_PROTOCOL_SMTP],[Defined if libgnurl supports SMTP]) AC_ARG_WITH(libgnurl, - AC_HELP_STRING([--with-libgnurl=PREFIX],[look for the gnurl library in PREFIX/lib and headers in PREFIX/include]), + AS_HELP_STRING([--with-libgnurl=PREFIX],[look for the gnurl library in PREFIX/lib and headers in PREFIX/include]), [_libgnurl_with=$withval],[_libgnurl_with=ifelse([$1],,[yes],[$1])]) if test "$_libgnurl_with" != "no" ; then |