From: Nathan Scott <nathans@sgi.com>
Date: Sat, 8 Oct 2005 03:48:41 +0000 (+0000)
Subject: Merge in minor build tweaks for the FreeBSD porters.
X-Git-Tag: v2.8.0~83
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a85e1c6b0ab7580ea631c3474eb7232268af5607;p=thirdparty%2Fxfsprogs-dev.git

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 27ea52a74..2d2568e7c 100644
--- 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 25b387d32..c28e1a175 100644
--- 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`