dmapi/xfsdump configure fixes, some xfs_copy fixups.

dmapi package configure fixes.

4 files changed, 45 insertions, 14 deletions

diff --git a/VERSION b/VERSION
index 307cbbb..90e712b 100644
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=0
-PKG_REVISION=6
+PKG_REVISION=7
 PKG_BUILD=0
diff --git a/configure.in b/configure.in
index e698477..f3e05ce 100644
--- a/configure.in
+++ b/configure.in
@@ -53,37 +53,51 @@ 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)
 
 dnl check if users wants their own make
-test -z "$MAKE" && AC_PATH_PROG(MAKE, make, /usr/bin/make)
+if test -z "$MAKE"; then
+	AC_PATH_PROG(MAKE, make, /usr/bin/make)
+fi
 make=$MAKE
 AC_SUBST(make)
 
 dnl check if users wants their own linker
-test -z "$LD" && AC_PATH_PROG(LD, ld, /usr/bin/ld)
+if test -z "$LD"; then
+	AC_PATH_PROG(LD, ld, /usr/bin/ld)
+fi
 ld=$LD
 AC_SUBST(ld)
 
 dnl check if the tar program is available
-test -z "$TAR" && AC_PATH_PROG(TAR, tar)
+if test -z "$TAR"; then
+	AC_PATH_PROG(TAR, tar)
+fi
 tar=$TAR
 AC_SUBST(tar)
 
 dnl check if the gzip program is available
-test -z "$ZIP" && AC_PATH_PROG(ZIP, gzip, /bin/gzip)
+if test -z "$ZIP"; then
+	AC_PATH_PROG(ZIP, gzip, /bin/gzip)
+fi
 zip=$ZIP
 AC_SUBST(zip)
 
 dnl check if the makedepend program is available
-test -z "$MAKEDEPEND" && AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true)
+if test -z "$MAKEDEPEND"; then
+	AC_PATH_PROG(MAKEDEPEND, makedepend, /bin/true)
+fi
 makedepend=$MAKEDEPEND
 AC_SUBST(makedepend)
 
 dnl check if the rpm program is available
-test -z "$RPM" && AC_PATH_PROG(RPM, rpm, /bin/rpm)
+if test -z "$RPM"; then
+	AC_PATH_PROG(RPM, rpm, /bin/rpm)
+fi
 rpm=$RPM
 AC_SUBST(rpm)
 
@@ -109,13 +123,19 @@ dnl check if symbolic links are supported
 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)
+if test -z "$AWK"; then
+	AC_PATH_PROG(AWK, awk, /bin/awk)
+fi
 awk=$AWK
 AC_SUBST(awk)
-test -z "$SED" && AC_PATH_PROG(SED, sed, /bin/sed)
+if test -z "$SED"; then
+	AC_PATH_PROG(SED, sed, /bin/sed)
+fi
 sed=$SED
 AC_SUBST(sed)
-test -z "$ECHO" && AC_PATH_PROG(ECHO, echo, /bin/echo)
+if test -z "$ECHO"; then
+	AC_PATH_PROG(ECHO, echo, /bin/echo)
+fi
 echo=$ECHO
 AC_SUBST(echo)
 
@@ -128,8 +148,10 @@ AC_CHECK_HEADER(xfs/handle.h,, [
 ])
 
 dnl ensure libtool is installed
-test -z "$LIBTOOL" && AC_PATH_PROG(LIBTOOL, libtool,,/usr/bin)
-if test "$LIBTOOL" = ""; then
+if test -z "$LIBTOOL"; then
+	AC_PATH_PROG(LIBTOOL, libtool,,/usr/bin)
+fi
+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.
@@ -140,7 +162,7 @@ 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)
 
diff --git a/debian/changelog b/debian/changelog
index 822034a..f1f736c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+dmapi (2.0.7-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Nathan Scott <nathans@debian.org>  Mon, 14 Apr 2003 09:41:09 +1000
+
 dmapi (2.0.6-1) unstable; urgency=low
 
   * New upstream release
diff --git a/doc/CHANGES b/doc/CHANGES
index 1a7d87e..62f3de7 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,6 @@
+dmapi-2.0.7 (14 April 2003)
+	- Fix configure tests that used AC_PATH_PROG incorrectly.
+
 dmapi-2.0.6 (27 March 2003)
 	- Cleanups to the build process, in particular the automatic
 	  rpm package generation Makefile and spec file template.