* [PATCH] Consistent use of AC_LANG_PROGRAM in configure.ac and aclocal.m4. @ 2011-01-02 6:00 Ralf Wildenhues 2011-01-02 7:59 ` Jonathan Nieder 0 siblings, 1 reply; 7+ messages in thread From: Ralf Wildenhues @ 2011-01-02 6:00 UTC (permalink / raw) To: git This avoids warnings from Autoconf 2.68 about missing use of AC_LANG_PROGRAM and friends. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> --- The patch should not cause any semantic changes in the generated configure script. Thanks, Ralf aclocal.m4 | 4 ++-- configure.ac | 56 +++++++++++++++++++------------------------------------- 2 files changed, 21 insertions(+), 39 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index d399de2..f11bc7e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -13,7 +13,7 @@ AC_DEFUN([TYPE_SOCKLEN_T], git_cv_socklen_t_equiv= for arg2 in "struct sockaddr" void; do for t in int size_t unsigned long "unsigned long"; do - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <sys/types.h> #include <sys/socket.h> @@ -21,7 +21,7 @@ AC_DEFUN([TYPE_SOCKLEN_T], ],[ $t len; getpeername(0,0,&len); - ],[ + ])],[ git_cv_socklen_t_equiv="$t" break 2 ]) diff --git a/configure.ac b/configure.ac index 5792425..20039c5 100644 --- a/configure.ac +++ b/configure.ac @@ -345,7 +345,7 @@ esac AC_CACHE_CHECK([if linker supports -R], git_cv_ld_dashr, [ SAVE_LDFLAGS="${LDFLAGS}" LDFLAGS="${SAVE_LDFLAGS} -R /" - AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [git_cv_ld_dashr=yes], [git_cv_ld_dashr=no]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [git_cv_ld_dashr=yes], [git_cv_ld_dashr=no]) LDFLAGS="${SAVE_LDFLAGS}" ]) if test "$git_cv_ld_dashr" = "yes"; then @@ -354,7 +354,7 @@ else AC_CACHE_CHECK([if linker supports -Wl,-rpath,], git_cv_ld_wl_rpath, [ SAVE_LDFLAGS="${LDFLAGS}" LDFLAGS="${SAVE_LDFLAGS} -Wl,-rpath,/" - AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [git_cv_ld_wl_rpath=yes], [git_cv_ld_wl_rpath=no]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [git_cv_ld_wl_rpath=yes], [git_cv_ld_wl_rpath=no]) LDFLAGS="${SAVE_LDFLAGS}" ]) if test "$git_cv_ld_wl_rpath" = "yes"; then @@ -363,7 +363,7 @@ else AC_CACHE_CHECK([if linker supports -rpath], git_cv_ld_rpath, [ SAVE_LDFLAGS="${LDFLAGS}" LDFLAGS="${SAVE_LDFLAGS} -rpath /" - AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [git_cv_ld_rpath=yes], [git_cv_ld_rpath=no]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [git_cv_ld_rpath=yes], [git_cv_ld_rpath=no]) LDFLAGS="${SAVE_LDFLAGS}" ]) if test "$git_cv_ld_rpath" = "yes"; then @@ -472,15 +472,9 @@ if test -z "$NO_ICONV"; then GIT_STASH_FLAGS($ICONVDIR) -AC_DEFUN([ICONVTEST_SRC], [ -#include <iconv.h> - -int main(void) -{ - iconv_open("", ""); - return 0; -} -]) +AC_DEFUN([ICONVTEST_SRC], +[AC_LANG_PROGRAM([#include <iconv.h>], + [iconv_open("", "");])]) if test -n "$ICONVDIR"; then lib_order="-liconv -lc" @@ -500,7 +494,7 @@ for l in $lib_order; do old_LIBS="$LIBS" LIBS="$LIBS $l" AC_MSG_CHECKING([for iconv in $l]) - AC_LINK_IFELSE(ICONVTEST_SRC, + AC_LINK_IFELSE([ICONVTEST_SRC], [AC_MSG_RESULT([yes]) NO_ICONV= break], @@ -528,18 +522,12 @@ fi GIT_STASH_FLAGS($ZLIB_PATH) AC_DEFUN([ZLIBTEST_SRC], [ -#include <zlib.h> - -int main(void) -{ - deflateBound(0, 0); - return 0; -} -]) +AC_LANG_PROGRAM([#include <zlib.h>], + [deflateBound(0, 0);])]) AC_MSG_CHECKING([for deflateBound in -lz]) old_LIBS="$LIBS" LIBS="$LIBS -lz" -AC_LINK_IFELSE(ZLIBTEST_SRC, +AC_LINK_IFELSE([ZLIBTEST_SRC], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) NO_DEFLATE_BOUND=yes]) @@ -631,23 +619,19 @@ AC_SUBST(NO_INTTYPES_H) # # Define OLD_ICONV if your library has an old iconv(), where the second # (input buffer pointer) parameter is declared with type (const char **). -AC_DEFUN([OLDICONVTEST_SRC], [[ +AC_DEFUN([OLDICONVTEST_SRC], [ +AC_LANG_PROGRAM([[ #include <iconv.h> extern size_t iconv(iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); - -int main(void) -{ - return 0; -} -]]) +]], [])]) GIT_STASH_FLAGS($ICONVDIR) AC_MSG_CHECKING([for old iconv()]) -AC_COMPILE_IFELSE(OLDICONVTEST_SRC, +AC_COMPILE_IFELSE([OLDICONVTEST_SRC], [AC_MSG_RESULT([no])], [AC_MSG_RESULT([yes]) OLD_ICONV=UnfortunatelyYes]) @@ -931,18 +915,16 @@ AC_SUBST(NO_INITGROUPS) # # Define PTHREAD_LIBS to the linker flag used for Pthread support. AC_DEFUN([PTHREADTEST_SRC], [ +AC_LANG_PROGRAM([[ #include <pthread.h> - -int main(void) -{ +]], [[ pthread_mutex_t test_mutex; int retcode = 0; retcode |= pthread_mutex_init(&test_mutex,(void *)0); retcode |= pthread_mutex_lock(&test_mutex); retcode |= pthread_mutex_unlock(&test_mutex); return retcode; -} -]) +]])]) dnl AC_LANG_CONFTEST([AC_LANG_PROGRAM( dnl [[#include <pthread.h>]], @@ -962,7 +944,7 @@ elif test -z "$PTHREAD_CFLAGS"; then old_CFLAGS="$CFLAGS" CFLAGS="$opt $CFLAGS" AC_MSG_CHECKING([Checking for POSIX Threads with '$opt']) - AC_LINK_IFELSE(PTHREADTEST_SRC, + AC_LINK_IFELSE([PTHREADTEST_SRC], [AC_MSG_RESULT([yes]) NO_PTHREADS= PTHREAD_LIBS="$opt" @@ -982,7 +964,7 @@ else old_CFLAGS="$CFLAGS" CFLAGS="$PTHREAD_CFLAGS $CFLAGS" AC_MSG_CHECKING([Checking for POSIX Threads with '$PTHREAD_CFLAGS']) - AC_LINK_IFELSE(PTHREADTEST_SRC, + AC_LINK_IFELSE([PTHREADTEST_SRC], [AC_MSG_RESULT([yes]) NO_PTHREADS= PTHREAD_LIBS="$PTHREAD_CFLAGS" -- 1.7.4.rc0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] Consistent use of AC_LANG_PROGRAM in configure.ac and aclocal.m4. 2011-01-02 6:00 [PATCH] Consistent use of AC_LANG_PROGRAM in configure.ac and aclocal.m4 Ralf Wildenhues @ 2011-01-02 7:59 ` Jonathan Nieder 2011-01-02 9:47 ` Ralf Wildenhues 0 siblings, 1 reply; 7+ messages in thread From: Jonathan Nieder @ 2011-01-02 7:59 UTC (permalink / raw) To: Ralf Wildenhues; +Cc: git Ralf Wildenhues wrote: > This avoids warnings from Autoconf 2.68 about missing use of > AC_LANG_PROGRAM and friends. > > Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> > --- > > The patch should not cause any semantic changes in the generated > configure script. This part belongs in the commit message too, imho (though no need to resend just for that, of course). > --- a/configure.ac > +++ b/configure.ac > @@ -345,7 +345,7 @@ esac > AC_CACHE_CHECK([if linker supports -R], git_cv_ld_dashr, [ > SAVE_LDFLAGS="${LDFLAGS}" > LDFLAGS="${SAVE_LDFLAGS} -R /" > - AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [git_cv_ld_dashr=yes], [git_cv_ld_dashr=no]) > + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [git_cv_ld_dashr=yes], [git_cv_ld_dashr=no]) Could you say a few words about the effect of this? Mostly because it would be useful to people down the line tempted to make the same mistake again. > @@ -500,7 +494,7 @@ for l in $lib_order; do > old_LIBS="$LIBS" > LIBS="$LIBS $l" > AC_MSG_CHECKING([for iconv in $l]) > - AC_LINK_IFELSE(ICONVTEST_SRC, > + AC_LINK_IFELSE([ICONVTEST_SRC], I'm curious about this one, too. > @@ -931,18 +915,16 @@ AC_SUBST(NO_INITGROUPS) > # > # Define PTHREAD_LIBS to the linker flag used for Pthread support. > AC_DEFUN([PTHREADTEST_SRC], [ > +AC_LANG_PROGRAM([[ > #include <pthread.h> > - > -int main(void) > -{ > +]], [[ > pthread_mutex_t test_mutex; By the way, what problem is the warning about AC_LANG_PROGRAM meant to prevent? (Just curious. A five-minute google search didn't reveal anything obvious.) Thanks, Jonathan ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Consistent use of AC_LANG_PROGRAM in configure.ac and aclocal.m4. 2011-01-02 7:59 ` Jonathan Nieder @ 2011-01-02 9:47 ` Ralf Wildenhues 2011-01-02 10:00 ` Jonathan Nieder 0 siblings, 1 reply; 7+ messages in thread From: Ralf Wildenhues @ 2011-01-02 9:47 UTC (permalink / raw) To: Jonathan Nieder; +Cc: git * Jonathan Nieder wrote on Sun, Jan 02, 2011 at 08:59:53AM CET: > Ralf Wildenhues wrote: > > > The patch should not cause any semantic changes in the generated > > configure script. > > This part belongs in the commit message too, imho (though no need to > resend just for that, of course). Yeah, you're right. > > - AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [git_cv_ld_dashr=yes], [git_cv_ld_dashr=no]) > > + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [git_cv_ld_dashr=yes], [git_cv_ld_dashr=no]) > > Could you say a few words about the effect of this? Mostly because > it would be useful to people down the line tempted to make the same > mistake again. Allow me to quote autoconf-2.68/NEWS: ** The macros AC_PREPROC_IFELSE, AC_COMPILE_IFELSE, AC_LINK_IFELSE, and AC_RUN_IFELSE now warn if the first argument failed to use AC_LANG_SOURCE or AC_LANG_PROGRAM to generate the conftest file contents. A new macro AC_LANG_DEFINES_PROVIDED exists if you have a compelling reason why you cannot use AC_LANG_SOURCE but must avoid the warning. The underlying reason for this change is that AC_LANG_{SOURCE,PROGRAM} take care to actually supply the previously computed set of #defines (and include the standard headers if so desired), for preprocessed languages like C and C++. In the above case, AC_LANG_PROGRAM is already used, but not sufficiently m4-quoted, so that the autoconf warning will be triggered bogusly. The general rule for m4 quotation is: one set of quotes for each macro argument, e.g.: MACRO1([arg with MACRO2([arg], [arg])], [arg], ...) and for innermost arguments which need to undergo no m4 expansion at all a double set of quotes should be used, e.g.: AC_LANG_SOURCE([[int s[42]; /* Program sources containing brackets. */]]) Only for some special macros that need to be expanded before recursion no quoting should be used. These and more rules are described in detail in 'info Autoconf "Programming in M4"'. The rules can often be relaxed when the macro arguments contain no active characters like comma, brackets or other macro invocations themselves, but IMVHO it is easier getting used to just quote things normally. > > @@ -500,7 +494,7 @@ for l in $lib_order; do > > old_LIBS="$LIBS" > > LIBS="$LIBS $l" > > AC_MSG_CHECKING([for iconv in $l]) > > - AC_LINK_IFELSE(ICONVTEST_SRC, > > + AC_LINK_IFELSE([ICONVTEST_SRC], > > I'm curious about this one, too. Likewise this is just underquotation leading to false positive. > > @@ -931,18 +915,16 @@ AC_SUBST(NO_INITGROUPS) > > # > > # Define PTHREAD_LIBS to the linker flag used for Pthread support. > > AC_DEFUN([PTHREADTEST_SRC], [ > > +AC_LANG_PROGRAM([[ > > #include <pthread.h> > > - > > -int main(void) > > -{ > > +]], [[ > > pthread_mutex_t test_mutex; > > By the way, what problem is the warning about AC_LANG_PROGRAM meant to > prevent? (Just curious. A five-minute google search didn't reveal > anything obvious.) See above. I would be happy to update the patch in a way that makes it more helpful, but most of the above is fairly general Autoconf rules, so I'm not sure what you need (being blinded by looking at this stuff too often). Cheers, Ralf ^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH] Consistent use of AC_LANG_PROGRAM in configure.ac and aclocal.m4. 2011-01-02 9:47 ` Ralf Wildenhues @ 2011-01-02 10:00 ` Jonathan Nieder 2011-01-02 10:24 ` Ralf Wildenhues 0 siblings, 1 reply; 7+ messages in thread From: Jonathan Nieder @ 2011-01-02 10:00 UTC (permalink / raw) To: Ralf Wildenhues; +Cc: git Ralf Wildenhues wrote: > See above. > > I would be happy to update the patch in a way that makes it more > helpful, but most of the above is fairly general Autoconf rules, > so I'm not sure what you need (being blinded by looking at this > stuff too often). A little essay in the commit message should be sufficient. Something vaguely like this, maybe. (cut and pasted from the above) This avoids warnings from Autoconf 2.68 about missing use of AC_LANG_PROGRAM and friends. Allow me to quote autoconf-2.68/NEWS: ** The macros AC_PREPROC_IFELSE, AC_COMPILE_IFELSE, AC_LINK_IFELSE, and AC_RUN_IFELSE now warn if the first argument failed to use AC_LANG_SOURCE or AC_LANG_PROGRAM to generate the conftest file contents. A new macro AC_LANG_DEFINES_PROVIDED exists if you have a compelling reason why you cannot use AC_LANG_SOURCE but must avoid the warning. The underlying reason for this change is that AC_LANG_{SOURCE,PROGRAM} take care to actually supply the previously computed set of #defines (and include the standard headers if so desired), for preprocessed languages like C and C++. In some cases, AC_LANG_PROGRAM is already used but not sufficiently m4-quoted, so we just need to add another set of [quotes] to prevent the autoconf warning from being triggered bogusly. Quoting all arguments (except when calling special macros that _need_ to be expanded before recursion) is better style, anyway. These and more rules are described in detail in 'info Autoconf "Programming in M4"'. The patch should not cause any semantic changes in the generated configure script. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH] Consistent use of AC_LANG_PROGRAM in configure.ac and aclocal.m4. 2011-01-02 10:00 ` Jonathan Nieder @ 2011-01-02 10:24 ` Ralf Wildenhues 2011-02-01 19:39 ` Ralf Wildenhues 0 siblings, 1 reply; 7+ messages in thread From: Ralf Wildenhues @ 2011-01-02 10:24 UTC (permalink / raw) To: Jonathan Nieder; +Cc: git This avoids warnings from Autoconf 2.68 about missing use of AC_LANG_PROGRAM and friends. Quoting autoconf-2.68/NEWS: ** The macros AC_PREPROC_IFELSE, AC_COMPILE_IFELSE, AC_LINK_IFELSE, and AC_RUN_IFELSE now warn if the first argument failed to use AC_LANG_SOURCE or AC_LANG_PROGRAM to generate the conftest file contents. A new macro AC_LANG_DEFINES_PROVIDED exists if you have a compelling reason why you cannot use AC_LANG_SOURCE but must avoid the warning. The underlying reason for this change is that AC_LANG_{SOURCE,PROGRAM} take care to actually supply the previously computed set of #defines (and include the standard headers if so desired), for preprocessed languages like C and C++. In some cases, AC_LANG_PROGRAM is already used but not sufficiently m4-quoted, so we just need to add another set of [quotes] to prevent the autoconf warning from being triggered bogusly. Quoting all arguments (except when calling special macros that _need_ to be expanded before recursion) is better style, anyway. These and more rules are described in detail in 'info Autoconf "Programming in M4"'. The patch should not cause any semantic changes in the generated configure script. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> --- * Jonathan Nieder wrote on Sun, Jan 02, 2011 at 11:00:12AM CET: > Ralf Wildenhues wrote: > > > I would be happy to update the patch in a way that makes it more > > helpful, but most of the above is fairly general Autoconf rules, > > so I'm not sure what you need (being blinded by looking at this > > stuff too often). > > A little essay in the commit message should be sufficient. Something > vaguely like this, maybe. (cut and pasted from the above) Thank you for your help! Resending like this. Cheers, Ralf aclocal.m4 | 4 ++-- configure.ac | 56 +++++++++++++++++++------------------------------------- 2 files changed, 21 insertions(+), 39 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index d399de2..f11bc7e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -13,7 +13,7 @@ AC_DEFUN([TYPE_SOCKLEN_T], git_cv_socklen_t_equiv= for arg2 in "struct sockaddr" void; do for t in int size_t unsigned long "unsigned long"; do - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <sys/types.h> #include <sys/socket.h> @@ -21,7 +21,7 @@ AC_DEFUN([TYPE_SOCKLEN_T], ],[ $t len; getpeername(0,0,&len); - ],[ + ])],[ git_cv_socklen_t_equiv="$t" break 2 ]) diff --git a/configure.ac b/configure.ac index 5792425..20039c5 100644 --- a/configure.ac +++ b/configure.ac @@ -345,7 +345,7 @@ esac AC_CACHE_CHECK([if linker supports -R], git_cv_ld_dashr, [ SAVE_LDFLAGS="${LDFLAGS}" LDFLAGS="${SAVE_LDFLAGS} -R /" - AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [git_cv_ld_dashr=yes], [git_cv_ld_dashr=no]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [git_cv_ld_dashr=yes], [git_cv_ld_dashr=no]) LDFLAGS="${SAVE_LDFLAGS}" ]) if test "$git_cv_ld_dashr" = "yes"; then @@ -354,7 +354,7 @@ else AC_CACHE_CHECK([if linker supports -Wl,-rpath,], git_cv_ld_wl_rpath, [ SAVE_LDFLAGS="${LDFLAGS}" LDFLAGS="${SAVE_LDFLAGS} -Wl,-rpath,/" - AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [git_cv_ld_wl_rpath=yes], [git_cv_ld_wl_rpath=no]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [git_cv_ld_wl_rpath=yes], [git_cv_ld_wl_rpath=no]) LDFLAGS="${SAVE_LDFLAGS}" ]) if test "$git_cv_ld_wl_rpath" = "yes"; then @@ -363,7 +363,7 @@ else AC_CACHE_CHECK([if linker supports -rpath], git_cv_ld_rpath, [ SAVE_LDFLAGS="${LDFLAGS}" LDFLAGS="${SAVE_LDFLAGS} -rpath /" - AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [git_cv_ld_rpath=yes], [git_cv_ld_rpath=no]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [git_cv_ld_rpath=yes], [git_cv_ld_rpath=no]) LDFLAGS="${SAVE_LDFLAGS}" ]) if test "$git_cv_ld_rpath" = "yes"; then @@ -472,15 +472,9 @@ if test -z "$NO_ICONV"; then GIT_STASH_FLAGS($ICONVDIR) -AC_DEFUN([ICONVTEST_SRC], [ -#include <iconv.h> - -int main(void) -{ - iconv_open("", ""); - return 0; -} -]) +AC_DEFUN([ICONVTEST_SRC], +[AC_LANG_PROGRAM([#include <iconv.h>], + [iconv_open("", "");])]) if test -n "$ICONVDIR"; then lib_order="-liconv -lc" @@ -500,7 +494,7 @@ for l in $lib_order; do old_LIBS="$LIBS" LIBS="$LIBS $l" AC_MSG_CHECKING([for iconv in $l]) - AC_LINK_IFELSE(ICONVTEST_SRC, + AC_LINK_IFELSE([ICONVTEST_SRC], [AC_MSG_RESULT([yes]) NO_ICONV= break], @@ -528,18 +522,12 @@ fi GIT_STASH_FLAGS($ZLIB_PATH) AC_DEFUN([ZLIBTEST_SRC], [ -#include <zlib.h> - -int main(void) -{ - deflateBound(0, 0); - return 0; -} -]) +AC_LANG_PROGRAM([#include <zlib.h>], + [deflateBound(0, 0);])]) AC_MSG_CHECKING([for deflateBound in -lz]) old_LIBS="$LIBS" LIBS="$LIBS -lz" -AC_LINK_IFELSE(ZLIBTEST_SRC, +AC_LINK_IFELSE([ZLIBTEST_SRC], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) NO_DEFLATE_BOUND=yes]) @@ -631,23 +619,19 @@ AC_SUBST(NO_INTTYPES_H) # # Define OLD_ICONV if your library has an old iconv(), where the second # (input buffer pointer) parameter is declared with type (const char **). -AC_DEFUN([OLDICONVTEST_SRC], [[ +AC_DEFUN([OLDICONVTEST_SRC], [ +AC_LANG_PROGRAM([[ #include <iconv.h> extern size_t iconv(iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); - -int main(void) -{ - return 0; -} -]]) +]], [])]) GIT_STASH_FLAGS($ICONVDIR) AC_MSG_CHECKING([for old iconv()]) -AC_COMPILE_IFELSE(OLDICONVTEST_SRC, +AC_COMPILE_IFELSE([OLDICONVTEST_SRC], [AC_MSG_RESULT([no])], [AC_MSG_RESULT([yes]) OLD_ICONV=UnfortunatelyYes]) @@ -931,18 +915,16 @@ AC_SUBST(NO_INITGROUPS) # # Define PTHREAD_LIBS to the linker flag used for Pthread support. AC_DEFUN([PTHREADTEST_SRC], [ +AC_LANG_PROGRAM([[ #include <pthread.h> - -int main(void) -{ +]], [[ pthread_mutex_t test_mutex; int retcode = 0; retcode |= pthread_mutex_init(&test_mutex,(void *)0); retcode |= pthread_mutex_lock(&test_mutex); retcode |= pthread_mutex_unlock(&test_mutex); return retcode; -} -]) +]])]) dnl AC_LANG_CONFTEST([AC_LANG_PROGRAM( dnl [[#include <pthread.h>]], @@ -962,7 +944,7 @@ elif test -z "$PTHREAD_CFLAGS"; then old_CFLAGS="$CFLAGS" CFLAGS="$opt $CFLAGS" AC_MSG_CHECKING([Checking for POSIX Threads with '$opt']) - AC_LINK_IFELSE(PTHREADTEST_SRC, + AC_LINK_IFELSE([PTHREADTEST_SRC], [AC_MSG_RESULT([yes]) NO_PTHREADS= PTHREAD_LIBS="$opt" @@ -982,7 +964,7 @@ else old_CFLAGS="$CFLAGS" CFLAGS="$PTHREAD_CFLAGS $CFLAGS" AC_MSG_CHECKING([Checking for POSIX Threads with '$PTHREAD_CFLAGS']) - AC_LINK_IFELSE(PTHREADTEST_SRC, + AC_LINK_IFELSE([PTHREADTEST_SRC], [AC_MSG_RESULT([yes]) NO_PTHREADS= PTHREAD_LIBS="$PTHREAD_CFLAGS" -- 1.7.4.rc0 ^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH] Consistent use of AC_LANG_PROGRAM in configure.ac and aclocal.m4. 2011-01-02 10:24 ` Ralf Wildenhues @ 2011-02-01 19:39 ` Ralf Wildenhues 2011-02-12 23:35 ` [PATCH resend] configure: use AC_LANG_PROGRAM consistently Jonathan Nieder 0 siblings, 1 reply; 7+ messages in thread From: Ralf Wildenhues @ 2011-02-01 19:39 UTC (permalink / raw) To: Jonathan Nieder, git * Ralf Wildenhues wrote on Sun, Jan 02, 2011 at 11:24:55AM CET: > This avoids warnings from Autoconf 2.68 about missing use of > AC_LANG_PROGRAM and friends. I'd like to ping this patch: http://thread.gmane.org/gmane.comp.version-control.git/164409/focus=164416 which IIUC addresses all previous comments in the thread and was otherwise noncontroversial. If there is anything else left to do, I'd be happy to hear about it. Thanks, Ralf ^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH resend] configure: use AC_LANG_PROGRAM consistently 2011-02-01 19:39 ` Ralf Wildenhues @ 2011-02-12 23:35 ` Jonathan Nieder 0 siblings, 0 replies; 7+ messages in thread From: Jonathan Nieder @ 2011-02-12 23:35 UTC (permalink / raw) To: git; +Cc: Ralf Wildenhues From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Date: Sun, 2 Jan 2011 11:24:55 +0100 Avoid warnings from Autoconf 2.68 about missing use of AC_LANG_PROGRAM and friends. Quoting autoconf-2.68/NEWS: ** The macros AC_PREPROC_IFELSE, AC_COMPILE_IFELSE, AC_LINK_IFELSE, and AC_RUN_IFELSE now warn if the first argument failed to use AC_LANG_SOURCE or AC_LANG_PROGRAM to generate the conftest file contents. A new macro AC_LANG_DEFINES_PROVIDED exists if you have a compelling reason why you cannot use AC_LANG_SOURCE but must avoid the warning. The underlying reason for that change is that AC_LANG_{SOURCE,PROGRAM} take care to supply the previously computed set of #defines (and include standard headers if so desired) for preprocessed languages like C and C++. In some cases, AC_LANG_PROGRAM is already used but not sufficiently m4-quoted, so we just need to add another set of [quotes] to prevent the autoconf warning from being triggered bogusly. Quoting all arguments (except when calling special macros that need to be expanded before recursion) is better style, anyway. These and more rules are described in detail in 'info Autoconf "Programming in M4"'. No change in the resulting config.mak.autogen after running ./configure intended. Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de> Signed-off-by: Jonathan Nieder <jrnieder@gmail.com> --- Hi, Ralf Wildenhues wrote: > * Ralf Wildenhues wrote on Sun, Jan 02, 2011 at 11:24:55AM CET: >> This avoids warnings from Autoconf 2.68 about missing use of >> AC_LANG_PROGRAM and friends. > > I'd like to ping this patch: > http://thread.gmane.org/gmane.comp.version-control.git/164409/focus=164416 > > which IIUC addresses all previous comments in the thread and was > otherwise noncontroversial. If there is anything else left to do, > I'd be happy to hear about it. The point of using AC_LANG_PROGRAM is that some magic (like #define _GNU_SOURCE) could be added before the code used to perform a feature test. And that is good --- we have similar magic in git-compat-util.h, for similar reasons. The worrisome aspect is that autoconf's magic and git's magic are unlikely to work the same way, making the detection inaccurate. That said, at least this patch doesn't make it worse. Consistency is nice. And sometimes squashing a warning is worthwhile just for the sake of squashing a warning, so other warnings don't get lost in the noise. aclocal.m4 | 4 ++-- configure.ac | 56 +++++++++++++++++++------------------------------------- 2 files changed, 21 insertions(+), 39 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index d399de2..f11bc7e 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -13,7 +13,7 @@ AC_DEFUN([TYPE_SOCKLEN_T], git_cv_socklen_t_equiv= for arg2 in "struct sockaddr" void; do for t in int size_t unsigned long "unsigned long"; do - AC_TRY_COMPILE([ + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([ #include <sys/types.h> #include <sys/socket.h> @@ -21,7 +21,7 @@ AC_DEFUN([TYPE_SOCKLEN_T], ],[ $t len; getpeername(0,0,&len); - ],[ + ])],[ git_cv_socklen_t_equiv="$t" break 2 ]) diff --git a/configure.ac b/configure.ac index 5792425..20039c5 100644 --- a/configure.ac +++ b/configure.ac @@ -345,7 +345,7 @@ esac AC_CACHE_CHECK([if linker supports -R], git_cv_ld_dashr, [ SAVE_LDFLAGS="${LDFLAGS}" LDFLAGS="${SAVE_LDFLAGS} -R /" - AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [git_cv_ld_dashr=yes], [git_cv_ld_dashr=no]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [git_cv_ld_dashr=yes], [git_cv_ld_dashr=no]) LDFLAGS="${SAVE_LDFLAGS}" ]) if test "$git_cv_ld_dashr" = "yes"; then @@ -354,7 +354,7 @@ else AC_CACHE_CHECK([if linker supports -Wl,-rpath,], git_cv_ld_wl_rpath, [ SAVE_LDFLAGS="${LDFLAGS}" LDFLAGS="${SAVE_LDFLAGS} -Wl,-rpath,/" - AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [git_cv_ld_wl_rpath=yes], [git_cv_ld_wl_rpath=no]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [git_cv_ld_wl_rpath=yes], [git_cv_ld_wl_rpath=no]) LDFLAGS="${SAVE_LDFLAGS}" ]) if test "$git_cv_ld_wl_rpath" = "yes"; then @@ -363,7 +363,7 @@ else AC_CACHE_CHECK([if linker supports -rpath], git_cv_ld_rpath, [ SAVE_LDFLAGS="${LDFLAGS}" LDFLAGS="${SAVE_LDFLAGS} -rpath /" - AC_LINK_IFELSE(AC_LANG_PROGRAM([], []), [git_cv_ld_rpath=yes], [git_cv_ld_rpath=no]) + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [git_cv_ld_rpath=yes], [git_cv_ld_rpath=no]) LDFLAGS="${SAVE_LDFLAGS}" ]) if test "$git_cv_ld_rpath" = "yes"; then @@ -472,15 +472,9 @@ if test -z "$NO_ICONV"; then GIT_STASH_FLAGS($ICONVDIR) -AC_DEFUN([ICONVTEST_SRC], [ -#include <iconv.h> - -int main(void) -{ - iconv_open("", ""); - return 0; -} -]) +AC_DEFUN([ICONVTEST_SRC], +[AC_LANG_PROGRAM([#include <iconv.h>], + [iconv_open("", "");])]) if test -n "$ICONVDIR"; then lib_order="-liconv -lc" @@ -500,7 +494,7 @@ for l in $lib_order; do old_LIBS="$LIBS" LIBS="$LIBS $l" AC_MSG_CHECKING([for iconv in $l]) - AC_LINK_IFELSE(ICONVTEST_SRC, + AC_LINK_IFELSE([ICONVTEST_SRC], [AC_MSG_RESULT([yes]) NO_ICONV= break], @@ -528,18 +522,12 @@ fi GIT_STASH_FLAGS($ZLIB_PATH) AC_DEFUN([ZLIBTEST_SRC], [ -#include <zlib.h> - -int main(void) -{ - deflateBound(0, 0); - return 0; -} -]) +AC_LANG_PROGRAM([#include <zlib.h>], + [deflateBound(0, 0);])]) AC_MSG_CHECKING([for deflateBound in -lz]) old_LIBS="$LIBS" LIBS="$LIBS -lz" -AC_LINK_IFELSE(ZLIBTEST_SRC, +AC_LINK_IFELSE([ZLIBTEST_SRC], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]) NO_DEFLATE_BOUND=yes]) @@ -631,23 +619,19 @@ AC_SUBST(NO_INTTYPES_H) # # Define OLD_ICONV if your library has an old iconv(), where the second # (input buffer pointer) parameter is declared with type (const char **). -AC_DEFUN([OLDICONVTEST_SRC], [[ +AC_DEFUN([OLDICONVTEST_SRC], [ +AC_LANG_PROGRAM([[ #include <iconv.h> extern size_t iconv(iconv_t cd, char **inbuf, size_t *inbytesleft, char **outbuf, size_t *outbytesleft); - -int main(void) -{ - return 0; -} -]]) +]], [])]) GIT_STASH_FLAGS($ICONVDIR) AC_MSG_CHECKING([for old iconv()]) -AC_COMPILE_IFELSE(OLDICONVTEST_SRC, +AC_COMPILE_IFELSE([OLDICONVTEST_SRC], [AC_MSG_RESULT([no])], [AC_MSG_RESULT([yes]) OLD_ICONV=UnfortunatelyYes]) @@ -931,18 +915,16 @@ AC_SUBST(NO_INITGROUPS) # # Define PTHREAD_LIBS to the linker flag used for Pthread support. AC_DEFUN([PTHREADTEST_SRC], [ +AC_LANG_PROGRAM([[ #include <pthread.h> - -int main(void) -{ +]], [[ pthread_mutex_t test_mutex; int retcode = 0; retcode |= pthread_mutex_init(&test_mutex,(void *)0); retcode |= pthread_mutex_lock(&test_mutex); retcode |= pthread_mutex_unlock(&test_mutex); return retcode; -} -]) +]])]) dnl AC_LANG_CONFTEST([AC_LANG_PROGRAM( dnl [[#include <pthread.h>]], @@ -962,7 +944,7 @@ elif test -z "$PTHREAD_CFLAGS"; then old_CFLAGS="$CFLAGS" CFLAGS="$opt $CFLAGS" AC_MSG_CHECKING([Checking for POSIX Threads with '$opt']) - AC_LINK_IFELSE(PTHREADTEST_SRC, + AC_LINK_IFELSE([PTHREADTEST_SRC], [AC_MSG_RESULT([yes]) NO_PTHREADS= PTHREAD_LIBS="$opt" @@ -982,7 +964,7 @@ else old_CFLAGS="$CFLAGS" CFLAGS="$PTHREAD_CFLAGS $CFLAGS" AC_MSG_CHECKING([Checking for POSIX Threads with '$PTHREAD_CFLAGS']) - AC_LINK_IFELSE(PTHREADTEST_SRC, + AC_LINK_IFELSE([PTHREADTEST_SRC], [AC_MSG_RESULT([yes]) NO_PTHREADS= PTHREAD_LIBS="$PTHREAD_CFLAGS" -- 1.7.4.1 ^ permalink raw reply related [flat|nested] 7+ messages in thread
end of thread, other threads:[~2011-02-12 23:36 UTC | newest] Thread overview: 7+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2011-01-02 6:00 [PATCH] Consistent use of AC_LANG_PROGRAM in configure.ac and aclocal.m4 Ralf Wildenhues 2011-01-02 7:59 ` Jonathan Nieder 2011-01-02 9:47 ` Ralf Wildenhues 2011-01-02 10:00 ` Jonathan Nieder 2011-01-02 10:24 ` Ralf Wildenhues 2011-02-01 19:39 ` Ralf Wildenhues 2011-02-12 23:35 ` [PATCH resend] configure: use AC_LANG_PROGRAM consistently Jonathan Nieder
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.