summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMax Krasnyansky <maxk@qualcomm.com>2002-07-21 19:30:22 +0000
committerMax Krasnyansky <maxk@qualcomm.com>2002-07-21 19:30:22 +0000
commit6c76db6269147a21a0df57ba3a669e33614bf810 (patch)
tree37bd1dcced854befbf08dc8b93a006683cd83cc8
parent70516886fef2e6c208d3e48332cc2c6c4b4d964c (diff)
GLIB searching fixes.
-rw-r--r--configure.in26
1 files changed, 11 insertions, 15 deletions
diff --git a/configure.in b/configure.in
index 9aaad200..b1e3f3b9 100644
--- a/configure.in
+++ b/configure.in
@@ -54,22 +54,18 @@ AC_SEARCH_LIB(bluetooth, hci_open_dev, $BLUEZ_LIBDIR,,
Please compile and install bluez-libs package.)
)
-AC_ARG_WITH(glib,
- --with-glib=DIR GLib libraries and header files,
- [
- GLIB_CFLAGS="-I$withval"
- GLIB_LDFLAGS="-L$withval/.libs -lglib"
- ],[
- AC_MSG_RESULT("checking for GLib ...")
- AC_CHECK_PROG(GLIB, glib-config, yes, [not found])
- if test "$GLIB" = "yes"; then
- GLIB_CFLAGS="`glib-config --cflags`"
- GLIB_LDFLAGS="`glib-config --libs`"
- else
- AC_MSG_ERROR(GLib not found)
- fi
- ]
+AC_ARG_WITH(glib-config,
+ --with-glib-config=program glib-config location,
+ GLIB_CONFIG="$withval",
+ [
+ AC_PATH_PROGS(GLIB_CONFIG, glib-config, no)
+ if test "$GLIB_CONFIG" = "no"; then
+ AC_MSG_ERROR(GLib not found)
+ fi
+ ]
)
+GLIB_CFLAGS="`$GLIB_CONFIG --cflags`"
+GLIB_LDFLAGS="`$GLIB_CONFIG --libs`"
dnl Check for distro type.
DISTRO=unknown