Drop obsolete msg_() functions.

[projects/rc-scripts.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index ae69af1cb9c9409f8c69666454a59691df3ff1bb..70fbb390c7a482a49e45ced1e0a548b7913aa734 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,13 +1,13 @@
 dnl $Id$
 
-AC_INIT(["rc-scripts"], [0.4.0.6], [pld-rc-scripts@pld-linux.org], [rc-scripts])
+AC_INIT(["rc-scripts"], [0.4.0.16], [pld-rc-scripts@pld-linux.org], [rc-scripts])
 AM_INIT_AUTOMAKE
 
 ALL_LINGUAS="pl de"
 
 echo -n "Finding shell scripts"
 SHSCRIPTS=""
-for shfile in $(find ${srcdir}/rc.d ${srcdir}/sysconfig -type f); do
+for shfile in $(find ${srcdir}/rc.d ${srcdir}/sysconfig ! -path "*/\.*/*" ! -name "*~" -type f); do
     echo -n "."
     if (LANG=C file ${shfile} | grep -q 'shell script'); then
        SHSCRIPTS="${SHSCRIPTS} ${shfile}"
@@ -67,8 +67,20 @@ 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"
+GCFLAGS="`$PKG_CONFIG --cflags-only-I glib-2.0`"
+if test "x$GLIBDIR" = "x"; then
+    AC_MSG_RESULT([none])
+    AC_MSG_CHECKING([glib dir])
+    GLIBDIR="`$PKG_CONFIG --variable=libdir glib`"
+    GLIBNAME="libglib.a"
+    GCFLAGS="`$PKG_CONFIG --cflags-only-I glib`"
+fi
+if test "x$GLIBDIR" = "x"; then
+    GLIBDIR=/usr/lib
+fi
 AC_MSG_RESULT([$GLIBDIR])
 
 dnl Output
@@ -87,6 +99,8 @@ AC_SUBST(downdir)
 AC_SUBST(rcdir)
 AC_SUBST(docdir)
 AC_SUBST(GLIBDIR)
+AC_SUBST(GLIBNAME)
+AC_SUBST(GCFLAGS)
 
 AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile \
        ppp/Makefile \