Keep packaging scripts in sync across all of the packages were maintaining here

Merge of master-melb:xfs-cmds:24301a by kenmcd.

diff --git a/m4/package_globals.m4 b/m4/package_globals.m4
index 25b387d32bde76c16d1cd2b00c47b28f2c954748..c28e1a175f09dbd764bff1bc6f46a2035429625b 100644 (file)
--- a/m4/package_globals.m4
+++ b/m4/package_globals.m4
@@ -27,12 +27,12 @@ AC_DEFUN([AC_PACKAGE_GLOBALS],
     malloc_lib="$MALLOCLIB"
     AC_SUBST(malloc_lib)
 
     malloc_lib="$MALLOCLIB"
     AC_SUBST(malloc_lib)
 

-    PKG_USER=${INSTALL_USER:-'root'}
-    pkg_user="$PKG_USER"
+    pkg_user=`id -u`
+    test -z "$INSTALL_USER" || pkg_user="$INSTALL_USER"

     AC_SUBST(pkg_user)
 
     AC_SUBST(pkg_user)
 

-    PKG_GROUP=${INSTALL_GROUP:-'root'}
-    pkg_group="$PKG_GROUP"
+    pkg_group=`id -g`
+    test -z "$INSTALL_GROUP" || pkg_group="$INSTALL_GROUP"

     AC_SUBST(pkg_group)
 
     pkg_distribution=`uname -s`
     AC_SUBST(pkg_group)
 
     pkg_distribution=`uname -s`

diff --git a/m4/package_libcdev.m4 b/m4/package_libcdev.m4
index a66ae4791b97cee9cfdb7b38028cc32b8b9cbbf7..5156ced652b9adaebb86cd3d10021d555ea31477 100644 (file)
--- a/m4/package_libcdev.m4
+++ b/m4/package_libcdev.m4
@@ -65,3 +65,36 @@ AC_DEFUN([AC_HAVE_SENDFILE],
        AC_MSG_RESULT(no))
     AC_SUBST(have_sendfile)
   ])
        AC_MSG_RESULT(no))
     AC_SUBST(have_sendfile)
   ])

+
+#
+# Check if we have a getmntent libc call (IRIX, Linux)
+#
+AC_DEFUN([AC_HAVE_GETMNTENT],
+  [ AC_MSG_CHECKING([for getmntent ])
+    AC_TRY_COMPILE([
+#include <stdio.h>
+#include <mntent.h>
+    ], [
+         getmntent(0);
+    ], have_getmntent=yes
+       AC_MSG_RESULT(yes),
+       AC_MSG_RESULT(no))
+    AC_SUBST(have_getmntent)
+  ])
+
+#
+# Check if we have a getmntinfo libc call (FreeBSD, Mac OS X)
+#
+AC_DEFUN([AC_HAVE_GETMNTINFO],
+  [ AC_MSG_CHECKING([for getmntinfo ])
+    AC_TRY_COMPILE([
+#include <sys/param.h>
+#include <sys/ucred.h>
+#include <sys/mount.h>
+    ], [
+         getmntinfo(0, 0);
+    ], have_getmntinfo=yes
+       AC_MSG_RESULT(yes),
+       AC_MSG_RESULT(no))
+    AC_SUBST(have_getmntinfo)
+  ])

diff --git a/m4/package_utilies.m4 b/m4/package_utilies.m4
index efcc0a104dacfbccb5774d19d3d61f746a6acd14..c034a7c6cee181794e71d977399bb48938df2b81 100644 (file)
--- a/m4/package_utilies.m4
+++ b/m4/package_utilies.m4
@@ -111,7 +111,7 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
 
     dnl .. and what version is rpm
     rpm_version=0
 
     dnl .. and what version is rpm
     rpm_version=0

-    test -x "$RPM" && rpm_version=`$RPM --version \
+    test -n "$RPM" && test -x "$RPM" && rpm_version=`$RPM --version \

                         | awk '{print $NF}' | awk -F. '{V=1; print $V}'`
     AC_SUBST(rpm_version)
     dnl At some point in rpm 4.0, rpm can no longer build rpms, and
                         | awk '{print $NF}' | awk -F. '{V=1; print $V}'`
     AC_SUBST(rpm_version)
     dnl At some point in rpm 4.0, rpm can no longer build rpms, and