Try to find glib-2.0, glib in that order - link with first found.

svn-id: @3137

diff --git a/configure.ac b/configure.ac
index 86bebbfe4ee861c6360f79c745f91861c2727e3c..e313067cb06043119187738baf03686cfa5a0845 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -67,8 +67,18 @@ fi
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 GLIBDIR=none
-AC_MSG_CHECKING([glib dir])
-GLIBDIR="`$PKG_CONFIG --variable=libdir glib`"
+AC_MSG_CHECKING([glib2 dir])
+GLIBDIR="`$PKG_CONFIG --variable=libdir glib-2.0`"
+GLIBNAME="libglib-2.0.a"
+if test "x$GLIBDIR" = "x"; then
+    AC_MSG_RESULT([none])
+    AC_MSG_CHECKING([glib dir])
+    GLIBDIR="`$PKG_CONFIG --variable=libdir glib`"
+    GLIBNAME="libglib.a"
+fi
+if test "x$GLIBDIR" = "x"; then
+    GLIBDIR=/usr/lib
+fi
 AC_MSG_RESULT([$GLIBDIR])
 
 dnl Output
@@ -87,6 +97,7 @@ AC_SUBST(downdir)
 AC_SUBST(rcdir)
 AC_SUBST(docdir)
 AC_SUBST(GLIBDIR)
+AC_SUBST(GLIBNAME)
 
 AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile \
        ppp/Makefile \

diff --git a/src/Makefile.am b/src/Makefile.am
index fafb76f4cab842954b7cfabc2da77f702da8be39..e213cfcc4a33cd8c7f4efe3e7ff683a5641c6816 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,6 +1,7 @@
 @SET_MAKE@
 
 GLIBDIR = @GLIBDIR@
+GLIBNAME = @GLIBNAME@
 
 DEFS = @DEFS@ -D_GNU_SOURCE=1
 
@@ -55,7 +56,7 @@ getkey_SOURCES = getkey.c
 getkey_LDADD = -lpopt
 
 ppp_watch_SOURCES = ppp-watch.c shvar.c shvar.h
-ppp_watch_LDADD = $(GLIBDIR)/libglib.a
+ppp_watch_LDADD = $(GLIBDIR)/$(GLIBNAME)
 INCLUDES = `glib-config --cflags`
 
 consoletype_SOURCES = consoletype.c