fsf address update

[gnulib.git] / m4 / lib-prefix.m4

diff --git a/m4/lib-prefix.m4 b/m4/lib-prefix.m4
index 5f29702..0d895ca 100644 (file)
--- a/m4/lib-prefix.m4
+++ b/m4/lib-prefix.m4
@@ -1,10 +1,8 @@
-# lib-prefix.m4 serial 2 (gettext-0.12)
-dnl Copyright (C) 2001-2003 Free Software Foundation, Inc.
-dnl This file is free software, distributed under the terms of the GNU
-dnl General Public License.  As a special exception to the GNU General
-dnl Public License, this file may be distributed as part of a program
-dnl that contains a configuration script generated by Autoconf, under
-dnl the same distribution terms as the rest of that program.
+# lib-prefix.m4 serial 4 (gettext-0.14.2)
+dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
 
 dnl From Bruno Haible.
 
@@ -13,7 +11,7 @@ dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't
 dnl require excessive bracketing.
 ifdef([AC_HELP_STRING],
 [AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])],
-[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
+[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])])
 
 dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed
 dnl to access previously installed libraries. The basic assumption is that
@@ -41,13 +39,13 @@ AC_DEFUN([AC_LIB_PREFIX],
       use_additional=no
     else
       if test "X$withval" = "X"; then
-       AC_LIB_WITH_FINAL_PREFIX([
-         eval additional_includedir=\"$includedir\"
-         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"
+        additional_includedir="$withval/include"
+        additional_libdir="$withval/lib"
       fi
     fi
 ])
@@ -61,26 +59,26 @@ AC_DEFUN([AC_LIB_PREFIX],
     if test "X$additional_includedir" != "X/usr/include"; then
       haveit=
       for x in $CPPFLAGS; do
-       AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-       if test "X$x" = "X-I$additional_includedir"; then
-         haveit=yes
-         break
-       fi
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-I$additional_includedir"; then
+          haveit=yes
+          break
+        fi
       done
       if test -z "$haveit"; then
-       if test "X$additional_includedir" = "X/usr/local/include"; then
-         if test -n "$GCC"; then
-           case $host_os in
-             linux*) haveit=yes;;
-           esac
-         fi
-       fi
-       if test -z "$haveit"; then
-         if test -d "$additional_includedir"; then
-           dnl Really add $additional_includedir to $CPPFLAGS.
-           CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
-         fi
-       fi
+        if test "X$additional_includedir" = "X/usr/local/include"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux* | gnu* | k*bsd*-gnu) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_includedir"; then
+            dnl Really add $additional_includedir to $CPPFLAGS.
+            CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir"
+          fi
+        fi
       fi
     fi
     dnl Potentially add $additional_libdir to $LDFLAGS.
@@ -92,26 +90,26 @@ AC_DEFUN([AC_LIB_PREFIX],
     if test "X$additional_libdir" != "X/usr/lib"; then
       haveit=
       for x in $LDFLAGS; do
-       AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
-       if test "X$x" = "X-L$additional_libdir"; then
-         haveit=yes
-         break
-       fi
+        AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
+        if test "X$x" = "X-L$additional_libdir"; then
+          haveit=yes
+          break
+        fi
       done
       if test -z "$haveit"; then
-       if test "X$additional_libdir" = "X/usr/local/lib"; then
-         if test -n "$GCC"; then
-           case $host_os in
-             linux*) haveit=yes;;
-           esac
-         fi
-       fi
-       if test -z "$haveit"; then
-         if test -d "$additional_libdir"; then
-           dnl Really add $additional_libdir to $LDFLAGS.
-           LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
-         fi
-       fi
+        if test "X$additional_libdir" = "X/usr/local/lib"; then
+          if test -n "$GCC"; then
+            case $host_os in
+              linux*) haveit=yes;;
+            esac
+          fi
+        fi
+        if test -z "$haveit"; then
+          if test -d "$additional_libdir"; then
+            dnl Really add $additional_libdir to $LDFLAGS.
+            LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir"
+          fi
+        fi
       fi
     fi
   fi