- upstart usage docs updates

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

diff --git a/configure.ac b/configure.ac
index cbe8024f254b29660a8355e811eabb41634ee9bd..9eca2c82ce85625f936da22a64ca8f42e3fff8a3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,6 +1,6 @@
 dnl $Id$
 
-AC_INIT(["rc-scripts"], [0.4.0.25], [pld-rc-scripts@pld-linux.org], [rc-scripts])
+AC_INIT(["rc-scripts"], [0.4.4.1], [pld-rc-scripts@lists.pld-linux.org], [rc-scripts])
 AM_INIT_AUTOMAKE
 
 ALL_LINGUAS="pl de"
@@ -9,7 +9,7 @@ echo -n "Finding shell scripts"
 SHSCRIPTS=""
 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
+    if (LC_ALL=C file ${shfile} | grep -q 'shell script'); then
        SHSCRIPTS="${SHSCRIPTS} ${shfile}"
     fi
 done
@@ -28,6 +28,8 @@ updir='${sysconfigdir}/interfaces/up.d'
 downdir='${sysconfigdir}/interfaces/down.d'
 networkscriptsdir='${sysconfigdir}/network-scripts'
 rcdir='${sysconfdir}/rc.d'
+initdir='${sysconfdir}/init'
+firmwaredir='${exec_prefix}/lib/firmware'
 docdir="${prefix}/doc/$PACKAGE-$VERSION"
 
 dnl i18n support
@@ -67,21 +69,13 @@ fi
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 GLIBDIR=none
-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`"
+AC_MSG_CHECKING([glib2])
+GLIB_LIBS="-Wl,-static `$PKG_CONFIG --libs --static glib-2.0` -Wl,-Bdynamic"
+GLIB_CFLAGS="`$PKG_CONFIG --cflags-only-I glib-2.0`"
+if test "x$GLIB_LIBS" = "x"; then
+       AC_MSG_ERROR(no)
 fi
-if test "x$GLIBDIR" = "x"; then
-    GLIBDIR=/usr/lib
-fi
-AC_MSG_RESULT([$GLIBDIR])
+AC_MSG_RESULT(yes)
 
 DPKG_C_GCC_ATTRIBUTE([,,],supported,[int x],[,,],ATTRIB,[Define if function attributes a la GCC 2.5 and higher are available.],
   DPKG_C_GCC_ATTRIBUTE(noreturn,noreturn,[int x],noreturn,NORETURN,[Define if nonreturning functions a la GCC 2.5 and higher are available.])
@@ -90,7 +84,7 @@ DPKG_C_GCC_ATTRIBUTE([,,],supported,[int x],[,,],ATTRIB,[Define if function attr
   DPKG_C_GCC_ATTRIBUTE(format...,format,[char *y, ...],[format(printf,1,2)],PRINTFFORMAT,[Define if printf-format argument lists a la GCC are available.]))
 
 AC_CHECK_TYPE(ptrdiff_t,int)
-AC_CHECK_HEADERS([stddef.h])
+AC_CHECK_HEADERS([stddef.h sys/capability.h])
 
 dnl Output
 AC_SUBST(BASHSCRIPTS)
@@ -106,10 +100,11 @@ AC_SUBST(sysconfigdir)
 AC_SUBST(updir)
 AC_SUBST(downdir)
 AC_SUBST(rcdir)
+AC_SUBST(initdir)
 AC_SUBST(docdir)
-AC_SUBST(GLIBDIR)
-AC_SUBST(GLIBNAME)
-AC_SUBST(GCFLAGS)
+AC_SUBST(firmwaredir)
+AC_SUBST(GLIB_LIBS)
+AC_SUBST(GLIB_CFLAGS)
 
 AH_BOTTOM([
 #ifdef HAVE_STDDEF_H
@@ -222,5 +217,6 @@ AC_CONFIG_FILES([Makefile \
        sysconfig/interfaces/down.d/tnl/Makefile \
        rc.d/Makefile rc.d/init.d/Makefile \
        po/Makefile \
-       rc-scripts.spec])
+       init/Makefile \
+       ])
 AC_OUTPUT