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 49e2722465dba3672605fc66ff91ca92caca8886..c8f5c080760bc68ade9dc32bba10407b5c9b022e 100644 (file)
--- 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 72fbbb78ac9e998f959d9cd96b196cebf67a6c59..415564b9b1c6b603a009b7f94875c8a90b860d66 100644 (file)
--- 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 fa66f95140d98c65f7e9d379a56b80087435f356..6569e3b6ebfc84324389b01aac07a045c5951b6f 100644 (file)
--- 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)