Merge in minor build tweaks for the FreeBSD porters.

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

diff --git a/include/builddefs.in b/include/builddefs.in
index 27ea52a745bb2bce8edf20ee24eeb99e0b785413..2d2568e7c5549d299eb6ce742ffaeb6449cb3b95 100644 (file)
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -117,7 +117,7 @@ PLDLIBS = -L/usr/local/lib -lintl
 PCFLAGS = -I/usr/local/include
 endif
 
-GCFLAGS = -O1 $(OPTIMIZER) $(DEBUG) -funsigned-char -fno-strict-aliasing -Wall \
+GCFLAGS = $(OPTIMIZER) $(DEBUG) -funsigned-char -fno-strict-aliasing -Wall \
          -DVERSION=\"$(PKG_VERSION)\" -DLOCALEDIR=\"$(PKG_LOCALE_DIR)\"  \
          -DPACKAGE=\"$(PKG_NAME)\" -I$(TOPDIR)/include
 

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)
 
-    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)
 
-    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`