|
|
@ -20,94 +20,15 @@ |
|
|
|
# |
|
|
|
# --- 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) |
|
|
|
|
|
|
|
--- xfsprogs-2.6.0/configure.in.orig 2004-01-05 23:02:03.000000000 +0100
|
|
|
|
+++ xfsprogs-2.6.0/configure.in 2004-01-05 23:02:14.000000000 +0100
|
|
|
|
@@ -1,6 +1,8 @@
|
|
|
|
AC_INIT(include/libxfs.h) |
|
|
|
AC_CONFIG_HEADER(include/platform_defs.h) |
|
|
|
|
|
|
|
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.' |
|
|
|
+
|
|
|
|
AC_ARG_ENABLE(shared, |
|
|
|
[ --enable-shared=[yes/no] Enable use of shared libraries [default=yes]],, |
|
|
|
enable_shared=yes) |