X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=configure.ac;h=46039dacb76809576fcc07fe246f16e716a0f847;hb=7189eb48dd8f46049d982f1d99e158609409019f;hp=ecd6b1e9976b657b694fa06dd7c1433cfa1742eb;hpb=ef6f7db3e1ed2e0d09e02ac77be70848c221f3df;p=febootstrap.git

diff --git a/configure.ac b/configure.ac
index ecd6b1e..46039da 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,7 @@ dnl Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 dnl
 dnl Written by Richard W.M. Jones <rjones@redhat.com>
 
-AC_INIT(febootstrap,3.5)
+AC_INIT(febootstrap,3.10)
 AM_INIT_AUTOMAKE
 
 dnl Check for basic C environment.
@@ -62,8 +62,24 @@ AC_CHECK_PROG(YUMDOWNLOADER,[yumdownloader],[yumdownloader],[no])
 
 dnl For Debian handler.
 AC_CHECK_PROG(APTITUDE,[aptitude],[aptitude],[no])
+AC_CHECK_PROG(APT_CACHE,[apt-cache],[apt-cache],[no])
 AC_CHECK_PROG(DPKG,[dpkg],[dpkg],[no])
 
+dnl Include workaround for broken apt-cache depends --recurse (Ubuntu 10.04)?
+if test "x$APT_CACHE" != "xno"; then
+    AC_MSG_CHECKING([if apt-cache depends --recurse is broken])
+    if ! $APT_CACHE depends --recurse -i bash | grep -q '^libc6$'; then
+        AC_MSG_RESULT([yes])
+        APT_CACHE_DEPENDS_RECURSE_BROKEN=true
+    else
+        AC_MSG_RESULT([no])
+        APT_CACHE_DEPENDS_RECURSE_BROKEN=false
+    fi
+else
+    APT_CACHE_DEPENDS_RECURSE_BROKEN=false
+fi
+AC_SUBST([APT_CACHE_DEPENDS_RECURSE_BROKEN])
+
 dnl For ArchLinux handler.
 AC_CHECK_PROG(PACMAN,[pacman],[pacman],[no])
 
@@ -92,10 +108,16 @@ AC_CHECK_HEADER([ext2fs/ext2fs.h],[],[
   AC_MSG_FAILURE([Header <ext2fs/ext2fs.h> not found (part of e2fsprogs)])
 ])
 
+AC_CHECK_PROG(GAWK,[gawk],[gawk],[no])
+if test "x$GAWK" = "xno" ; then
+  AC_MSG_FAILURE([gawk (GNU awk) not found])
+fi
+
 AC_CONFIG_HEADERS([config.h])
-AC_CONFIG_FILES([config.ml
+AC_CONFIG_FILES([Makefile
         debian/changelog
-        Makefile
+        helper/Makefile
         lib/Makefile
-        helper/Makefile])
+        src/config.ml
+        src/Makefile])
 AC_OUTPUT