From: Nathan Scott <nathans@sgi.com>
Date: Mon, 14 Apr 2003 01:39:21 +0000 (+0000)
Subject: Cosmetic configure tweaks to keep xfsprogs in sync with other packages.
X-Git-Tag: XFS-1_3_0pre1~20
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=dfc13ce170a0839253e31f4f97ed596c23869b31;p=thirdparty%2Fxfsprogs-dev.git

Cosmetic configure tweaks to keep xfsprogs in sync with other packages.
---

diff --git a/configure.in b/configure.in
index a414fdc25..43a4d02ac 100644
--- a/configure.in
+++ b/configure.in
@@ -56,7 +56,9 @@ test -z "$INSTALL_GROUP" || pkg_group="$INSTALL_GROUP"
 AC_SUBST(pkg_group)
 
 dnl check if user wants their own C compiler
-test -z "$CC" && AC_PROG_CC
+if test -z "$CC"; then
+	AC_PROG_CC
+fi
 cc=$CC
 AC_SUBST(cc)
 
@@ -144,7 +146,7 @@ dnl ensure libtool is installed
 if test -z "$LIBTOOL"; then
 	AC_PATH_PROG(LIBTOOL, libtool,,/usr/bin)
 fi
-if test "$LIBTOOL" = ""; then
+if test -z "$LIBTOOL"; then
 	echo
 	echo 'FATAL ERROR: libtool does not seem to be installed.'
 	echo $pkg_name cannot be built without a working libtool installation.
@@ -155,13 +157,13 @@ AC_SUBST(libtool)
 
 dnl libtool to build libraries static only?
 AC_ARG_ENABLE(shared,
-	[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],,
+[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],,
 	enable_shared=yes)
 AC_SUBST(enable_shared)
 
 dnl will we be making use of readline?
 AC_ARG_ENABLE(readline,
-	[ --enable-readline=[yes/no] Enable readline command editing [default=no]],,
+[ --enable-readline=[yes/no] Enable readline command editing [default=no]],,
 	enable_readline=no)
 if test $enable_readline = yes; then
 	libreadline="-lreadline -lncurses"
@@ -173,7 +175,7 @@ AC_SUBST(enable_readline)
 
 dnl will we be making use of gettext?
 AC_ARG_ENABLE(gettext,
-	[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],,
+[ --enable-gettext=[yes/no] Enable alternate language support [default=yes]],,
 	enable_gettext=yes)
 AC_SUBST(enable_gettext)
 
@@ -195,7 +197,7 @@ if test "$enable_gettext" = yes; then
 	xgettext=$XGETTEXT
 	AC_SUBST(xgettext)
 
-	if test "$XGETTEXT" = ""; then
+	if test -z "$XGETTEXT"; then
 		echo
 		echo 'FATAL ERROR: xgettext does not seem to be installed.'
 		echo $pkg_name cannot be built without a working gettext installation.
@@ -224,7 +226,7 @@ dnl We want to keep our runtime dependencies to an absolute minimum for
 dnl this particular package, but the option is there.
 dnl
 AC_ARG_ENABLE(shared-uuid,
-	[ --enable-shared-uuid=[yes/no]	Link shared libuuid [default=no].],
+[ --enable-shared-uuid=[yes/no]	Link shared libuuid [default=no].],
 	libuuid="/usr/lib/libuuid.a"
 	if test "$enable_shared_uuid" = yes; then
 		libuuid="-luuid"
@@ -257,15 +259,23 @@ AC_TRY_COMPILE(
 ], AC_DEFINE(HAVE___PSUNSIGNED_T) AC_MSG_RESULT(yes) , AC_MSG_RESULT(no))
 
 dnl Check type sizes
-if test "$cross_compiling" = yes -a "$ac_cv_sizeof_long" = ""; then
+if test "$cross_compiling" = yes -a -z "$ac_cv_sizeof_long"; then
 	AC_MSG_WARN([Cross compiling; assuming 32bit long and 32bit pointers])
 fi
 AC_CHECK_SIZEOF(long, 4)
 AC_CHECK_SIZEOF(char *, 4)
-test $ac_cv_sizeof_long -eq 4 && AC_DEFINE(HAVE_32BIT_LONG)
-test $ac_cv_sizeof_long -eq 8 && AC_DEFINE(HAVE_64BIT_LONG)
-test $ac_cv_sizeof_char_p -eq 4 && AC_DEFINE(HAVE_32BIT_PTR)
-test $ac_cv_sizeof_char_p -eq 8 && AC_DEFINE(HAVE_64BIT_PTR)
+if test $ac_cv_sizeof_long -eq 4; then
+	AC_DEFINE(HAVE_32BIT_LONG)
+fi
+if test $ac_cv_sizeof_long -eq 8; then
+	AC_DEFINE(HAVE_64BIT_LONG)
+fi
+if test $ac_cv_sizeof_char_p -eq 4; then
+	AC_DEFINE(HAVE_32BIT_PTR)
+fi
+if test $ac_cv_sizeof_char_p -eq 8; then
+	AC_DEFINE(HAVE_64BIT_PTR)
+fi
 
 dnl man pages (source)
 dnl also check if man page source is gzipped