From de7b3f627488dd0baaf1c6cda9ab556dad94cfe8 Mon Sep 17 00:00:00 2001
From: Barry Naujok <bnaujok@sgi.com>
Date: Tue, 23 Jan 2007 14:51:14 +0000
Subject: Fix cross-compile issues with libtool and compiler. Merge of
 master-melb:xfs-cmds:27984a by kenmcd.

  Fix cross-compile issues with libtool and compiler.
---
 m4/package_globals.m4 |  2 ++
 m4/package_utilies.m4 | 10 +---------
 2 files changed, 3 insertions(+), 9 deletions(-)

(limited to 'm4')

diff --git a/m4/package_globals.m4 b/m4/package_globals.m4
index 72fbbb7..415564b 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 fa66f95..6569e3b 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)
-- 
cgit v1.2.3