From 1398c68c26ecf0add2d5378840f013a5213c6e0f Mon Sep 17 00:00:00 2001 From: Florian Forster Date: Tue, 4 Sep 2007 10:14:22 +0200 Subject: [PATCH] build system: Some cosmetic fixes for the libupsclient. --- configure.in | 34 +++++++++++++++++++--------------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/configure.in b/configure.in index d02c12f6..f291956f 100644 --- a/configure.in +++ b/configure.in @@ -1271,7 +1271,12 @@ AC_ARG_WITH(libupsclient, [AS_HELP_STRING([--with-libupsclient@<:@=PREFIX@:>@], with_libupsclient="yes" if "x$withval" != "xyes" then - with_upsclient_config="$withval/bin/libupsclient-config" + if test -x "$withval" + then + with_upsclient_config="$withval" + else + with_upsclient_config="$withval/bin/libupsclient-config" + fi fi fi ], @@ -1285,25 +1290,30 @@ then if test $upsclient_config_status -ne 0 then - with_libupsclient="no" + with_libupsclient="no ($with_upsclient_config failed)" fi fi if test "x$with_libupsclient" = "xyes" then + SAVE_CFLAGS="$CFLAGS" + CFLAGS="$CFLAGS $with_upsclient_cflags" + + AC_CHECK_HEADERS(upsclient.h, [], [with_libupsclient="no (upsclient.h not found)"]) + + CFLAGS="$SAVE_CFLAGS" +fi +if test "x$with_libupsclient" = "xyes" +then with_upsclient_libs=`$with_upsclient_config --libs 2>/dev/null` upsclient_config_status=$? if test $upsclient_config_status -ne 0 then - with_libupsclient="no" + with_libupsclient="no ($with_upsclient_config failed)" fi fi if test "x$with_libupsclient" = "xyes" then - CFLAGS_ORIG=$CFLAGS - CFLAGS="$CFLAGS $with_upsclient_cflags" - LDFLAGS_ORIG=$LDFLAGS - LDFLAGS="$LDFLAGS $with_upsclient_libs" AC_CHECK_LIB(upsclient, upscli_connect, [ BUILD_WITH_LIBUPSCLIENT_CFLAGS="$with_upsclient_cflags" @@ -1312,14 +1322,8 @@ then AC_SUBST(BUILD_WITH_LIBUPSCLIENT_LIBS) ], [ - with_libupsclient="no" - ]) - CFLAGS=$CFLAGS_ORIG - LDFLAGS=$LDFLAGS_ORIG -fi -if test "x$with_libupsclient" = "xyes" -then - AC_DEFINE(HAVE_LIBUPSCLIENT, 1, [Define to 1 if you have the upsclient library (-lupsclient).]) + with_libupsclient="no (symbol 'upscli_connect' not found)" + ], [$with_upsclient_libs]) fi if test "x$with_libupsclient" = "xyes" then -- 2.11.0