From: Barry Naujok <bnaujok@sgi.com>
Date: Mon, 16 Mar 2009 06:47:00 +0000 (+0100)
Subject: Fix cross-compile issues with libtool and compiler.
X-Git-Tag: v3.0.1~10
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fe63d33b128021e8cf49e1135a66abea2212e6c8;p=thirdparty%2Fxfsprogs-dev.git

Fix cross-compile issues with libtool and compiler.

This is equivalent to commit de7b3f6 from Barry Naujok <bnaujok@sgi.com>
in the acl package/

Signed-off-by: Andreas Gruenbacher <agruen@suse.de>
Signed-off-by: Christoph Hellwig <hch@lst.de>
---

diff --git a/include/builddefs.in b/include/builddefs.in
index 49e272246..c8f5c0807 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -41,6 +41,7 @@ DK_INC_DIR = @includedir@/disk
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+top_builddir = @top_builddir@
 datarootdir = @datarootdir@
 
 PKG_NAME	= @pkg_name@
diff --git a/m4/package_globals.m4 b/m4/package_globals.m4
index 72fbbb78a..415564b9b 100644
--- a/m4/package_globals.m4
+++ b/m4/package_globals.m4
@@ -8,6 +8,8 @@ AC_DEFUN([AC_PACKAGE_GLOBALS],
   [ pkg_name="$1"
     AC_SUBST(pkg_name)
 
+    AC_PROG_CC
+
     . ./VERSION
     pkg_version=${PKG_MAJOR}.${PKG_MINOR}.${PKG_REVISION}
     AC_SUBST(pkg_version)
diff --git a/m4/package_utilies.m4 b/m4/package_utilies.m4
index fa66f9514..6569e3b6e 100644
--- a/m4/package_utilies.m4
+++ b/m4/package_utilies.m4
@@ -32,15 +32,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
     AC_SUBST(make)
     AC_PACKAGE_NEED_UTILITY($1, "$make", make, [GNU make])
 
-    if test -z "$LIBTOOL"; then
-	AC_PATH_PROG(LIBTOOL, glibtool,, /usr/bin)
-    fi
-    if test -z "$LIBTOOL"; then
-	AC_PATH_PROG(LIBTOOL, libtool,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
-    fi
-    libtool=$LIBTOOL
-    AC_SUBST(libtool)
-    AC_PACKAGE_NEED_UTILITY($1, "$libtool", libtool, [GNU libtool])
+    AC_PROG_LIBTOOL
 
     if test -z "$TAR"; then
         AC_PATH_PROG(TAR, tar,, /usr/freeware/bin:/bin:/usr/local/bin:/usr/bin)