From 8fbf2a34682ad41108d71ae1b73187a635a54c20 Mon Sep 17 00:00:00 2001
From: Claus-Justus Heine <Claus-Justus.Heine@IANS.Uni-Stuttgart.DE>
Date: Sat, 14 Jun 2003 19:14:21 +0000
Subject: [PATCH] Use $1_LIB_PATH and $1_INCLUDE_PATH to be a little bit more
consistent with stock ALBERT.
---
m4/check-package.m4 | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/m4/check-package.m4 b/m4/check-package.m4
index 3330f3d..241d3d2 100644
--- a/m4/check-package.m4
+++ b/m4/check-package.m4
@@ -27,10 +27,10 @@ AC_ARG_WITH($1-lib,
;;
no) AC_MSG_ERROR("option \"--with-$1-lib\" requires an argument")
;;
- *) $1_DIR=$withval
+ *) $1_LIB_PATH=$withval
;;
esac],
-$1_DIR=$DEFAULT_LIBDIR)
+$1_LIB_PATH=$DEFAULT_LIBDIR)
dnl
dnl now for the header file
dnl
@@ -50,22 +50,22 @@ AC_ARG_WITH($1-headers,
*) $1_INCS=$withval
;;
esac],
-$1_INCLUDES=$DEFAULT_INCDIR)
+$1_INCLUDE_PATH=$DEFAULT_INCDIR)
dnl
dnl now check if the library and header files exist
dnl
if test "$7" = "optional" ; then
AC_CHECK_LIB($2, main,
- [$1_LIB="-L$$1_DIR -l$2"],
+ [$1_LIB="-L$$1_LIB_PATH -l$2"],
[$1_LIB=""
- $1_DIR=""
- $1_INCLUDES=""],
- -L$$1_DIR $4)
+ $1_LIB_PATH=""
+ $1_INCLUDE_PATH=""],
+ -L$$1_LIB_PATH $4)
else
AC_CHECK_LIB($2, main,
- [$1_LIB="-L$$1_DIR -l$2 $4"],
+ [$1_LIB="-L$$1_LIB_PATH -l$2 $4"],
[AC_MSG_ERROR([Library "lib$2" was not found])],
- -L$$1_DIR $4)
+ -L$$1_LIB_PATH $4)
fi
if test "x$$1_LIB" = "x" ; then
:
@@ -74,11 +74,11 @@ else
dnl check for the header file
dnl
ac_$1_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="-I$$1_INCLUDES $CPPFLAGS"
+ CPPFLAGS="-I$$1_INCLUDE_PATH $CPPFLAGS"
if test "$7" = "optional" ; then
AC_CHECK_HEADERS($5,, [$1_LIB=""
- $1_DIR=""
- $1_INCLUDES=""])
+ $1_LIB_PATH=""
+ $1_INCLUDE_PATH=""])
else
AC_CHECK_HEADERS($5,, AC_MSG_ERROR([Header file "$5" was not found]))
fi
@@ -92,7 +92,7 @@ else
AC_DEFINE(m4_toupper([HAVE_LIB$2]), 1, Define to 1 if you have lib$2)
fi
fi
-AC_SUBST($1_INCLUDES)
-AC_SUBST($1_DIR)
+AC_SUBST($1_INCLUDE_PATH)
+AC_SUBST($1_LIB_PATH)
AC_SUBST($1_LIB)
])
--
GitLab