Commit d9f48142 authored by Daniel Elstner's avatar Daniel Elstner
Browse files

Replace AC_MSG_ERROR() by AC_MSG_FAILURE(), and add an autoconf-time check

* macros/misc.m4 (REGEXXER_PKG_PATH_PROG): Replace AC_MSG_ERROR()
by AC_MSG_FAILURE(), and add an autoconf-time check to make sure
all necessary arguments are specified.

* macros/pcre.m4: Replace AC_MSG_ERROR() by AC_MSG_FAILURE(), and
add a few redirections of stderr to the config.log file descriptor
where appropriate.
parent 7c02c534
2004-05-30 Daniel Elstner <daniel.elstner@gmx.net>
* macros/misc.m4 (REGEXXER_PKG_PATH_PROG): Replace AC_MSG_ERROR()
by AC_MSG_FAILURE(), and add an autoconf-time check to make sure
all necessary arguments are specified.
* macros/pcre.m4: Replace AC_MSG_ERROR() by AC_MSG_FAILURE(), and
add a few redirections of stderr to the config.log file descriptor
where appropriate.
2004-05-30 Daniel Elstner <daniel.elstner@gmx.net>
* src/filetreeprivate.h (FileTreePrivate::filetree_columns):
......
......@@ -20,14 +20,14 @@
## REGEXXER_PKG_PATH_PROG(variable, package, executable)
##
## Like AC_PATH_PROG(variable, executable, [not found], <extra_path>), where
## <extra_path> is set to the contents of $PATH prepended by the package's
## binary executable directory. This should catch even the weirdest setups.
## An error message is generated if the executable cannot be found anywhere
## in the resulting path.
## Like AC_PATH_PROG(variable, executable,, <extra_path>), where <extra_path>
## is set to the contents of $PATH prepended by the package's binary executable
## directory. This should catch even the weirdest setups. An error message is
## generated if the executable cannot be found anywhere in the resulting path.
##
AC_DEFUN([REGEXXER_PKG_PATH_PROG],
[
m4_if([$3],, [AC_FATAL([3 arguments required])])
AC_REQUIRE([PKG_CHECK_MODULES])
pkg_search_path=$PATH
......@@ -38,7 +38,7 @@ AC_PATH_PROG([$1], [$3],, [$pkg_search_path])
AS_IF([test "x$$1" = x],
[
AC_MSG_ERROR([[
AC_MSG_FAILURE([[
*** Ooops, couldn't find ]$3[. Actually this should
*** never happen at this point, which means your system is really broken.
]])
......
......@@ -33,7 +33,7 @@ AC_PATH_PROG([PCRE_CONFIG], [pcre-config])
AS_IF([test "x$PCRE_CONFIG" = x],
[
AC_MSG_ERROR([[
AC_MSG_FAILURE([[
*** pcre-config is missing. Please install your distribution's
*** libpcre development package and then try again.
]])
......@@ -41,12 +41,12 @@ AC_MSG_ERROR([[
AC_MSG_CHECKING([[for libpcre >= ]$1])
pcre_version_string=`$PCRE_CONFIG --version`
pcre_version_string=`$PCRE_CONFIG --version 2>&5`
d='@<:@0123456789@:>@'
pcre_transform='s/^\('$d'\{1,\}\)\.\('$d'\{1,\}\)\.\{0,1\}\('$d'*\)$/\1 \\* 1000000 + \2 \\* 1000 + 0\3/p'
pcre_required=`echo "$1" | sed -n "$pcre_transform"`
pcre_version=`echo "$pcre_version_string" | sed -n "$pcre_transform"`
pcre_required=`echo "$1" | sed -n "$pcre_transform" 2>&5`
pcre_version=`echo "$pcre_version_string" | sed -n "$pcre_transform" 2>&5`
AS_IF([eval "expr $pcre_version \\>= $pcre_required" >/dev/null 2>&5],
[pcre_version_ok=yes],
......@@ -56,19 +56,19 @@ AC_MSG_RESULT([${pcre_version_ok}])
AS_IF([test "x$pcre_version_ok" = xno],
[
AC_MSG_ERROR([[
AC_MSG_FAILURE([[
*** libpcre ]$1[ or higher is required, but you only have
*** version $pcre_version_string installed. Please upgrade and try again.
]])
])
AC_MSG_CHECKING([[PCRE_CFLAGS]])
PCRE_CFLAGS=`$PCRE_CONFIG --cflags | sed 's,-I/usr/include$,,;s,-I/usr/include ,,g'`
PCRE_CFLAGS=`$PCRE_CONFIG --cflags | sed 's,-I/usr/include$,,;s,-I/usr/include ,,g' 2>&5`
AC_MSG_RESULT([${PCRE_CFLAGS}])
AC_SUBST([PCRE_CFLAGS])
AC_MSG_CHECKING([[PCRE_LIBS]])
PCRE_LIBS=`$PCRE_CONFIG --libs | sed 's,-L/usr/lib$,,;s,-L/usr/lib ,,g'`
PCRE_LIBS=`$PCRE_CONFIG --libs | sed 's,-L/usr/lib$,,;s,-L/usr/lib ,,g' 2>&5`
AC_MSG_RESULT([${PCRE_LIBS}])
AC_SUBST([PCRE_LIBS])
])
......@@ -122,7 +122,7 @@ AC_CACHE_CHECK(
AS_IF([test "x$pcre_cv_has_utf8_support" = xno],
[
AC_MSG_ERROR([[
AC_MSG_FAILURE([[
*** Sorry, the PCRE library installed on your system doesn't support
*** UTF-8 encoding. Please install a libpcre package which includes
*** support for UTF-8. Note that if you compile libpcre from source
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment