# --- ROCK-COPYRIGHT-NOTE-BEGIN ---
# 
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
# Please add additional copyright information _after_ the line containing
# the ROCK-COPYRIGHT-NOTE-END tag. Otherwise it might get removed by
# the ./scripts/Create-CopyPatch script. Do not edit this copyright text!
# 
# ROCK Linux: rock-src/package/base/xfsprogs/autoconf.patch
# ROCK Linux is Copyright (C) 1998 - 2003 Clifford Wolf
# 
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version. A copy of the GNU General Public
# License can be found at Documentation/COPYING.
# 
# Many people helped and are helping developing ROCK Linux. Please
# have a look at http://www.rocklinux.org/ and the Documentation/TEAM
# file for details.
# 
# --- ROCK-COPYRIGHT-NOTE-END ---

--- ./configure.in.orig	2003-03-12 18:15:20.000000000 +0100
+++ ./configure.in	2003-03-12 18:15:47.000000000 +0100
@@ -52,37 +52,37 @@
 AC_SUBST(pkg_builder)
 
 dnl check if user wants their own C compiler
-test -z "$CC" && AC_PROG_CC
+AC_PROG_CC
 cc=$CC
 AC_SUBST(cc)
 
 dnl check if users wants their own make
-test -z "$MAKE" && AC_PATH_PROG(MAKE, make, /usr/bin/make)
+AC_PATH_PROG(MAKE, make, /usr/bin/make)
 make=$MAKE
 AC_SUBST(make)
 
 dnl check if users wants their own linker
-test -z "$LD" && AC_PATH_PROG(LD, ld, /usr/bin/ld)
+AC_PATH_PROG(LD, ld, /usr/bin/ld)
 ld=$LD
 AC_SUBST(ld)
 
 dnl check if the tar program is available
-test -z "$TAR" && AC_PATH_PROG(TAR, tar)
+AC_PATH_PROG(TAR, tar)
 tar=$TAR
 AC_SUBST(tar)
 
 dnl check if the gzip program is available
-test -z "$ZIP" && AC_PATH_PROG(ZIP, gzip, /bin/gzip)
+AC_PATH_PROG(ZIP, gzip, /bin/gzip)
 zip=$ZIP
 AC_SUBST(zip)
 
 dnl check if the makedepend program is available
-test -z "$MAKEDEPEND" && AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true)
+AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true)
 makedepend=$MAKEDEPEND
 AC_SUBST(makedepend)
 
 dnl check if the rpm program is available
-test -z "$RPM" && AC_PATH_PROG(RPM, rpm, /bin/rpm)
+AC_PATH_PROG(RPM, rpm, /bin/rpm)
 rpm=$RPM
 AC_SUBST(rpm)
 
@@ -108,28 +108,28 @@
 AC_PROG_LN_S
 
 dnl check if user wants their own awk, sed and echo
-test -z "$AWK" && AC_PATH_PROG(AWK, awk, /bin/awk)
+AC_PATH_PROG(AWK, awk, /bin/awk)
 awk=$AWK
 AC_SUBST(awk)
-test -z "$SED" && AC_PATH_PROG(SED, sed, /bin/sed)
+AC_PATH_PROG(SED, sed, /bin/sed)
 sed=$SED
 AC_SUBST(sed)
-test -z "$ECHO" && AC_PATH_PROG(ECHO, echo, /bin/echo)
+AC_PATH_PROG(ECHO, echo, /bin/echo)
 echo=$ECHO
 AC_SUBST(echo)
 
 dnl check if the msgfmt program is available
-test -z "$MSGFMT" && AC_CHECK_PROG(MSGFMT, msgfmt, /usr/bin/msgfmt)
+AC_CHECK_PROG(MSGFMT, msgfmt, /usr/bin/msgfmt)
 msgfmt=$MSGFMT
 AC_SUBST(msgfmt)
 
 dnl check if the msgmerge program is available
-test -z "$MSGMERGE" && AC_CHECK_PROG(MSGMERGE, msgmerge, /usr/bin/msgmerge)
+AC_CHECK_PROG(MSGMERGE, msgmerge, /usr/bin/msgmerge)
 msgmerge=$MSGMERGE
 AC_SUBST(msgmerge)
 
 dnl ensure xgettext is installed
-test -z "$XGETTEXT" && AC_CHECK_PROG(XGETTEXT, xgettext, /usr/bin/xgettext)
+AC_CHECK_PROG(XGETTEXT, xgettext, /usr/bin/xgettext)
 if test "$XGETTEXT" = ""; then
 	echo
 	echo 'FATAL ERROR: xgettext does not seem to be installed.'
@@ -140,7 +140,7 @@
 AC_SUBST(xgettext)
 
 dnl ensure libtool is installed
-test -z "$LIBTOOL" && AC_PATH_PROG(LIBTOOL, libtool,,/usr/bin)
+AC_PATH_PROG(LIBTOOL, libtool,,/usr/bin)
 if test "$LIBTOOL" = ""; then
 	echo
 	echo 'FATAL ERROR: libtool does not seem to be installed.'