Make AC_LIB_LINKFLAGS_BODY really work.

3 files changed, 50 insertions, 17 deletions

diff --git a/m4/ChangeLog b/m4/ChangeLog
index a3c654f..c746a88 100644
--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,5 +1,14 @@
 2002-01-12  Bruno Haible  <bruno@clisp.org>
 
+	* lib-prefix.m4 (AC_LIB_PREPARE_PREFIX): Fix shell programming mistake.
+	(AC_LIB_WITH_FINAL_PREFIX): New macro.
+	(AC_LIB_PREFIX): Use AC_LIB_WITH_FINAL_PREFIX. Remove
+	acl_final_exec_prefix assignment already done in AC_LIB_PREPARE_PREFIX.
+	* lib-link.m4 (AC_LIB_LINKFLAGS_BODY): Use AC_LIB_WITH_FINAL_PREFIX.
+	(AC_LIB_APPENDTOVAR): Likewise.
+
+2002-01-12  Bruno Haible  <bruno@clisp.org>
+
 	* gettext.m4 (AM_PO_SUBDIRS): Exclude FreeBSD's msgfmt and xgettext
 	programs. They give usage messages on stderr but then terminate with
 	exit code 0.
diff --git a/m4/lib-link.m4 b/m4/lib-link.m4
index 052e51a..3cee361 100644
--- a/m4/lib-link.m4
+++ b/m4/lib-link.m4
@@ -61,8 +61,10 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                                [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
   dnl By default, look in $includedir and $libdir.
   use_additional=yes
-  prefix="$acl_final_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\"
-  prefix="$acl_final_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_libdir=\"$libdir\"
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
   AC_ARG_WITH([lib$1-prefix],
 [  --with-lib$1-prefix[=DIR]  search for lib$1 in DIR/include and DIR/lib
   --without-lib$1-prefix     don't search for lib$1 in includedir and libdir],
@@ -71,8 +73,10 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
       use_additional=no
     else
       if test "X$withval" = "X"; then
-        prefix="$acl_final_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\"
-        prefix="$acl_final_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_libdir=\"$libdir\"
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
       else
         additional_includedir="$withval/include"
         additional_libdir="$withval/lib"
@@ -124,7 +128,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
         fi
         if test "X$found_dir" = "X"; then
           for x in $LDFLAGS $LIB[]NAME; do
-            prefix="$acl_final_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\"
+            AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
             case "$x" in
               -L*)
                 dir=`echo "X$x" | sed -e 's/^X-L//'`
@@ -190,7 +194,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                     dnl or the already constructed $LIBNAME
                     haveit=
                     for x in $LDFLAGS $LIB[]NAME; do
-                      prefix="$acl_final_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\"
+                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
                       if test "X$x" = "X-L$found_dir"; then
                         haveit=yes
                         break
@@ -249,7 +253,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
             if test "X$additional_includedir" != "X/usr/include"; then
               haveit=
               for x in $CPPFLAGS $INC[]NAME; do
-                prefix="$acl_final_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\"
+                AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
                 if test "X$x" = "X-I$additional_includedir"; then
                   haveit=yes
                   break
@@ -298,7 +302,7 @@ AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
                   if test "X$additional_libdir" != "X/usr/lib"; then
                     haveit=
                     for x in $LDFLAGS $LIB[]NAME; do
-                      prefix="$acl_final_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\"
+                      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
                       if test "X$x" = "X-L$additional_libdir"; then
                         haveit=yes
                         break
@@ -376,7 +380,7 @@ AC_DEFUN([AC_LIB_APPENDTOVAR],
   for element in [$2]; do
     haveit=
     for x in $[$1]; do
-      prefix="$acl_final_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\"
+      AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
       if test "X$x" = "X$element"; then
         haveit=yes
         break
diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index 9bfd04e..3c4a291 100644
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -12,11 +12,12 @@ AC_DEFUN([AC_LIB_PREFIX],
   AC_REQUIRE([AC_PROG_CC])
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
-  prefix="$acl_final_prefix" eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
   dnl By default, look in $includedir and $libdir.
   use_additional=yes
-  prefix="$acl_final_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\"
-  prefix="$acl_final_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_libdir=\"$libdir\"
+  AC_LIB_WITH_FINAL_PREFIX([
+    eval additional_includedir=\"$includedir\"
+    eval additional_libdir=\"$libdir\"
+  ])
   AC_ARG_WITH([lib-prefix],
 [  --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib
   --without-lib-prefix    don't search for libraries in includedir and libdir],
@@ -25,8 +26,10 @@ AC_DEFUN([AC_LIB_PREFIX],
       use_additional=no
     else
       if test "X$withval" = "X"; then
-        prefix="$acl_final_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_includedir=\"$includedir\"
-        prefix="$acl_final_prefix" exec_prefix="$acl_final_exec_prefix" eval additional_libdir=\"$libdir\"
+        AC_LIB_WITH_FINAL_PREFIX([
+          eval additional_includedir=\"$includedir\"
+          eval additional_libdir=\"$libdir\"
+        ])
       else
         additional_includedir="$withval/include"
         additional_libdir="$withval/lib"
@@ -43,7 +46,7 @@ AC_DEFUN([AC_LIB_PREFIX],
     if test "X$additional_includedir" != "X/usr/include"; then
       haveit=
       for x in $CPPFLAGS; do
-        prefix="$acl_final_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\"
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
         if test "X$x" = "X-I$additional_includedir"; then
           haveit=yes
           break
@@ -74,7 +77,7 @@ AC_DEFUN([AC_LIB_PREFIX],
     if test "X$additional_libdir" != "X/usr/lib"; then
       haveit=
       for x in $LDFLAGS; do
-        prefix="$acl_final_prefix" exec_prefix="$acl_final_exec_prefix" eval x=\"$x\"
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
         if test "X$x" = "X-L$additional_libdir"; then
           haveit=yes
           break
@@ -116,5 +119,22 @@ AC_DEFUN([AC_LIB_PREPARE_PREFIX],
   else
     acl_final_exec_prefix="$exec_prefix"
   fi
-  prefix="$acl_final_prefix" eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  eval acl_final_exec_prefix=\"$acl_final_exec_prefix\"
+  prefix="$acl_save_prefix"
+])
+
+dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the
+dnl variables prefix and exec_prefix bound to the values they will have
+dnl at the end of the configure script.
+AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX],
+[
+  acl_save_prefix="$prefix"
+  prefix="$acl_final_prefix"
+  acl_save_exec_prefix="$exec_prefix"
+  exec_prefix="$acl_final_exec_prefix"
+  $1
+  exec_prefix="$acl_save_exec_prefix"
+  prefix="$acl_save_prefix"
 ])