From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Wed, 20 Sep 2006 18:07:47 +0000 (+0000)
Subject: * lib/autoconf/c.m4 (_AC_ARG_VAR_LDFLAGS): Update comment.
X-Git-Tag: AUTOCONF-2.60b~37
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=56a5174b8a7006ce734fd61005eeb40f619f97bf;p=thirdparty%2Fautoconf.git

* lib/autoconf/c.m4 (_AC_ARG_VAR_LDFLAGS): Update comment.
(_AC_ARG_VAR_LIBS): New macro: let LIBS be precious.
(AC_PROG_CC, AC_PROG_CXX, AC_PROG_OBJC): Call _AC_ARG_VAR_LIBS.
* lib/autoconf/fortran.m4 (AC_PROG_F77, AC_PROG_FC): Likewise.
Report by Olly Betts.
---

diff --git a/ChangeLog b/ChangeLog
index b134bb902..b0dd781d4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2006-09-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	* lib/autoconf/c.m4 (_AC_ARG_VAR_LDFLAGS): Update comment.
+	(_AC_ARG_VAR_LIBS): New macro: let LIBS be precious.
+	(AC_PROG_CC, AC_PROG_CXX, AC_PROG_OBJC): Call _AC_ARG_VAR_LIBS.
+	* lib/autoconf/fortran.m4 (AC_PROG_F77, AC_PROG_FC): Likewise.
+	Report by Olly Betts.
+
 2006-09-19  Eric Blake  <ebb9@byu.net>
 
 	* m4/m4.m4: Change copyright.
diff --git a/lib/autoconf/c.m4 b/lib/autoconf/c.m4
index 9334f21c4..50e8d7bf6 100644
--- a/lib/autoconf/c.m4
+++ b/lib/autoconf/c.m4
@@ -389,13 +389,21 @@ AC_DEFUN([_AC_ARG_VAR_CPPFLAGS],
 # _AC_ARG_VAR_LDFLAGS
 # -------------------
 # Document and register LDFLAGS, which is used by
-# AC_PROG_{CC, CXX, F77}.
+# AC_PROG_{CC, CXX, F77, FC, OBJC}.
 AC_DEFUN([_AC_ARG_VAR_LDFLAGS],
 [AC_ARG_VAR([LDFLAGS],
 	    [linker flags, e.g. -L<lib dir> if you have libraries in a
 	     nonstandard directory <lib dir>])])
 
 
+# _AC_ARG_VAR_LIBS
+# ----------------
+# Document and register LIBS, which is used by
+# AC_PROG_{CC, CXX, F77, FC, OBJS}.
+AC_DEFUN([_AC_ARG_VAR_LIBS],
+[AC_ARG_VAR([LIBS],
+	    [libraries to pass to the linker, e.g. -l<library>])])
+
 
 # AC_LANG_PREPROC(C)
 # -------------------
@@ -517,6 +525,7 @@ AC_DEFUN([AC_PROG_CC],
 AC_ARG_VAR([CC],     [C compiler command])dnl
 AC_ARG_VAR([CFLAGS], [C compiler flags])dnl
 _AC_ARG_VAR_LDFLAGS()dnl
+_AC_ARG_VAR_LIBS()dnl
 _AC_ARG_VAR_CPPFLAGS()dnl
 m4_ifval([$1],
       [AC_CHECK_TOOLS(CC, [$1])],
@@ -756,6 +765,7 @@ AC_DEFUN([AC_PROG_CXX],
 AC_ARG_VAR([CXX],      [C++ compiler command])dnl
 AC_ARG_VAR([CXXFLAGS], [C++ compiler flags])dnl
 _AC_ARG_VAR_LDFLAGS()dnl
+_AC_ARG_VAR_LIBS()dnl
 _AC_ARG_VAR_CPPFLAGS()dnl
 _AC_ARG_VAR_PRECIOUS([CCC])dnl
 if test -z "$CXX"; then
@@ -926,6 +936,7 @@ AC_DEFUN([AC_PROG_OBJC],
 AC_ARG_VAR([OBJC],      [Objective C compiler command])dnl
 AC_ARG_VAR([OBJCFLAGS], [Objective C compiler flags])dnl
 _AC_ARG_VAR_LDFLAGS()dnl
+_AC_ARG_VAR_LIBS()dnl
 _AC_ARG_VAR_CPPFLAGS()dnl
 _AC_ARG_VAR_PRECIOUS([OBJC])dnl
 AC_CHECK_TOOLS(OBJC,
diff --git a/lib/autoconf/fortran.m4 b/lib/autoconf/fortran.m4
index 1ade02063..72e307a3d 100644
--- a/lib/autoconf/fortran.m4
+++ b/lib/autoconf/fortran.m4
@@ -392,6 +392,7 @@ AC_DEFUN([AC_PROG_F77],
 AC_ARG_VAR([F77],    [Fortran 77 compiler command])dnl
 AC_ARG_VAR([FFLAGS], [Fortran 77 compiler flags])dnl
 _AC_ARG_VAR_LDFLAGS()dnl
+_AC_ARG_VAR_LIBS()dnl
 _AC_PROG_FC([Fortran 77], [$1])
 G77=`test $ac_compiler_gnu = yes && echo yes`
 AC_LANG_POP(Fortran 77)dnl
@@ -407,6 +408,7 @@ AC_DEFUN([AC_PROG_FC],
 AC_ARG_VAR([FC],    [Fortran compiler command])dnl
 AC_ARG_VAR([FCFLAGS], [Fortran compiler flags])dnl
 _AC_ARG_VAR_LDFLAGS()dnl
+_AC_ARG_VAR_LIBS()dnl
 _AC_PROG_FC([$2], [$1])
 AC_LANG_POP(Fortran)dnl
 ])# AC_PROG_FC