From 7fbc8e3c0cef0fe94f57e4ee868f7d6546e17021 Mon Sep 17 00:00:00 2001
From: Claus-Justus Heine <Claus-Justus.Heine@IANS.Uni-Stuttgart.DE>
Date: Wed, 18 Jun 2003 13:30:03 +0000
Subject: [PATCH] Convert - to _ in variable names.
---
m4/check-package.m4 | 44 ++++++++++++++++++++++----------------------
1 file changed, 22 insertions(+), 22 deletions(-)
diff --git a/m4/check-package.m4 b/m4/check-package.m4
index 079fbb0..f1d4a62 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_LIB_PATH=$withval
+ *) m4_bpatsubst([$1],-,_)_LIB_PATH=$withval
;;
esac],
-$1_LIB_PATH=$DEFAULT_LIBDIR)
+m4_bpatsubst([$1],-,_)_LIB_PATH=$DEFAULT_LIBDIR)
dnl
dnl now for the header file
dnl
@@ -47,53 +47,53 @@ AC_ARG_WITH($1-headers,
;;
no) AC_MSG_ERROR("option \"--with-$1-headers\" requires an argument")
;;
- *) $1_INCLUDE_PATH=$withval
+ *) m4_bpatsubst([$1],-,_)_INCLUDE_PATH=$withval
;;
esac],
-$1_INCLUDE_PATH=$DEFAULT_INCDIR)
+m4_bpatsubst([$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_LIB_PATH -l$2"],
- [$1_LIB=""
- $1_LIB_PATH=""
- $1_INCLUDE_PATH=""],
- -L$$1_LIB_PATH $4)
+ [m4_bpatsubst([$1],-,_)_LIB="-L${m4_bpatsubst([$1],-,_)_LIB_PATH} -l$2"],
+ [m4_bpatsubst([$1],-,_)_LIB=""
+ m4_bpatsubst([$1],-,_)_LIB_PATH=""
+ m4_bpatsubst([$1],-,_)_INCLUDE_PATH=""],
+ -L${m4_bpatsubst([$1],-,_)_LIB_PATH} $4)
else
AC_CHECK_LIB($2, main,
- [$1_LIB="-L$$1_LIB_PATH -l$2 $4"],
+ [m4_bpatsubst([$1],-,_)_LIB="-L${m4_bpatsubst([$1],-,_)_LIB_PATH} -l$2 $4"],
[AC_MSG_ERROR([Library "lib$2" was not found])],
- -L$$1_LIB_PATH $4)
+ -L$m4_bpatsubst([$1],-,_)_LIB_PATH $4)
fi
-if test "x$$1_LIB" = "x" ; then
+if test "x${m4_bpatsubst([$1],-,_)_LIB}" = "x" ; then
:
else
dnl
dnl check for the header file
dnl
- ac_$1_save_CPPFLAGS="$CPPFLAGS"
- CPPFLAGS="-I$$1_INCLUDE_PATH $CPPFLAGS"
+ [ac_]m4_bpatsubst([$1],-,_)_save_CPPFLAGS="$CPPFLAGS"
+ CPPFLAGS="-I${m4_bpatsubst([$1],-,_)_INCLUDE_PATH} $CPPFLAGS"
if test "$7" = "optional" ; then
- AC_CHECK_HEADERS($5,, [$1_LIB=""
- $1_LIB_PATH=""
- $1_INCLUDE_PATH=""])
+ AC_CHECK_HEADERS($5,, [m4_bpatsubst([$1],-,_)_LIB=""
+ m4_bpatsubst([$1],-,_)_LIB_PATH=""
+ m4_bpatsubst([$1],-,_)_INCLUDE_PATH=""])
else
AC_CHECK_HEADERS($5,, AC_MSG_ERROR([Header file "$5" was not found]))
fi
- CPPCLAGS="$ac_$1_save_CPPFLAGS"
+ CPPCLAGS="${[ac_]m4_bpatsubst([$1],-,_)_save_CPPFLAGS}"
dnl
dnl define makefile substitutions and config.h macros
dnl
- if test "x$$1_LIB" = "x" ; then
+ if test "x${m4_bpatsubst([$1],-,_)_LIB}" = "x" ; then
:
else
AC_DEFINE(m4_bpatsubst(m4_toupper([HAVE_LIB$2]),-,_),
1, Define to 1 if you have lib$2)
fi
fi
-AC_SUBST($1_INCLUDE_PATH)
-AC_SUBST($1_LIB_PATH)
-AC_SUBST($1_LIB)
+AC_SUBST(m4_bpatsubst([$1],-,_)_INCLUDE_PATH)
+AC_SUBST(m4_bpatsubst([$1],-,_)_LIB_PATH)
+AC_SUBST(m4_bpatsubst([$1],-,_)_LIB)
])
--
GitLab