autoconf obsoletions, gitignore

This commit is contained in:
Florian Dold 2021-01-05 12:14:25 +01:00
parent 792d1f5f20
commit 8c55968452
No known key found for this signature in database
GPG Key ID: D2E4F00F29D02A4B
6 changed files with 14 additions and 12 deletions

1
.gitignore vendored
View File

@ -27,7 +27,6 @@ config.sub
libtool libtool
ltmain.sh ltmain.sh
test-driver test-driver
m4/
GPATH GPATH
GRTAGS GRTAGS
GTAGS GTAGS

View File

@ -21,10 +21,10 @@ AC_INIT([taler-exchange], [0.8.1], [taler-bug@gnunet.org])
AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_SRCDIR([src/util/util.c]) AC_CONFIG_SRCDIR([src/util/util.c])
AC_CONFIG_HEADERS([taler_config.h]) AC_CONFIG_HEADERS([taler_config.h])
# support for non-recursive builds
AC_CANONICAL_TARGET AC_CANONICAL_TARGET
AC_CANONICAL_HOST AC_CANONICAL_HOST
AC_CANONICAL_SYSTEM AC_CANONICAL_BUILD
# support for non-recursive builds
AM_INIT_AUTOMAKE([subdir-objects 1.9 tar-pax]) AM_INIT_AUTOMAKE([subdir-objects 1.9 tar-pax])
# pretty build rules # pretty build rules
@ -32,6 +32,8 @@ AM_SILENT_RULES([yes])
AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_MACRO_DIR([m4])
AC_PROG_AWK AC_PROG_AWK
AC_PROG_CC
# FIXME: AC_PROG_CC_C99 is obsolete, remove for autoconf 2.70
AC_PROG_CC_C99 AC_PROG_CC_C99
AC_PROG_OBJC AC_PROG_OBJC
AC_PROG_INSTALL 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... # Not indented, as most of the file falls under this one...
AS_IF([test "x$doc_only" != xyes],[ AS_IF([test "x$doc_only" != xyes],[
# Checks for programs. # Force some CFLAGS
AC_PROG_CC
AC_PROG_CC_C99
CFLAGS="-Wall -Wno-address-of-packed-member $CFLAGS" CFLAGS="-Wall -Wno-address-of-packed-member $CFLAGS"
# Checks for header files. # Checks for header files.

6
m4/.gitignore vendored Normal file
View File

@ -0,0 +1,6 @@
# These are added by "autoreconf -if"
libtool.m4
ltoptions.m4
ltsugar.m4
ltversion.m4
lt~obsolete.m4

View File

@ -61,7 +61,7 @@ AC_DEFUN([LIBCURL_CHECK_CONFIG],
AH_TEMPLATE([LIBCURL_PROTOCOL_SMTP],[Defined if libcurl supports SMTP]) AH_TEMPLATE([LIBCURL_PROTOCOL_SMTP],[Defined if libcurl supports SMTP])
AC_ARG_WITH(libcurl, 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])]) [_libcurl_with=$withval],[_libcurl_with=ifelse([$1],,[yes],[$1])])
if test "$_libcurl_with" != "no" ; then if test "$_libcurl_with" != "no" ; then

View File

@ -23,7 +23,7 @@ dnl
AC_DEFUN([AM_PATH_LIBGCRYPT], AC_DEFUN([AM_PATH_LIBGCRYPT],
[ AC_REQUIRE([AC_CANONICAL_HOST]) [ AC_REQUIRE([AC_CANONICAL_HOST])
AC_ARG_WITH(libgcrypt-prefix, 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)]), [prefix where LIBGCRYPT is installed (optional)]),
libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="") libgcrypt_config_prefix="$withval", libgcrypt_config_prefix="")
if test x$libgcrypt_config_prefix != x ; then if test x$libgcrypt_config_prefix != x ; then

View File

@ -61,7 +61,7 @@ AC_DEFUN([LIBGNURL_CHECK_CONFIG],
AH_TEMPLATE([LIBGNURL_PROTOCOL_SMTP],[Defined if libgnurl supports SMTP]) AH_TEMPLATE([LIBGNURL_PROTOCOL_SMTP],[Defined if libgnurl supports SMTP])
AC_ARG_WITH(libgnurl, 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])]) [_libgnurl_with=$withval],[_libgnurl_with=ifelse([$1],,[yes],[$1])])
if test "$_libgnurl_with" != "no" ; then if test "$_libgnurl_with" != "no" ; then