summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2006-01-20 00:13:10 +0000
committerAndreas Gruenbacher <agruen@suse.de>2006-01-20 00:13:10 +0000
commit10da446fefed7a4a9e75134a6fbd12d4822a24b8 (patch)
tree60d25e2e13fd60b564de74b446ac6651b1808039
parent2dfc510694d937b097a26e5dd2a64102c15dddf9 (diff)
downloadquilt-10da446fefed7a4a9e75134a6fbd12d4822a24b8.tar.gz
- configure.in: Document to use --without-foo instead of
--with-foo=none.
-rw-r--r--aclocal.m45
-rw-r--r--configure.ac6
-rw-r--r--quilt.changes6
3 files changed, 13 insertions, 4 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 4e7d492..5000f61 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -10,7 +10,10 @@ AC_DEFUN([QUILT_COMPAT_PROG_PATH],[
m4_if(internal_$2_cmd,[],[],[ (use --without-$2
to use an internal mechanism)])),
[
- if test ! x"$withval" = xno; then
+ if test x"$withval" = xnone; then
+ AC_MSG_ERROR([Invalid configure argument. use --without-$2])
+ fi
+ if test x"$withval" != xno; then
$1="$withval"
AC_MSG_NOTICE([Using $2 executable $$1])
COMPAT_SYMLINKS="$COMPAT_SYMLINKS $2"
diff --git a/configure.ac b/configure.ac
index 17de4a0..1f51420 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT([quilt],[0.42],[quilt-dev@nongnu.org])
AC_CONFIG_AUX_DIR(config)
AC_PREREQ(2.53)
-AC_REVISION ($Revision: 1.60 $)
+AC_REVISION ($Revision: 1.61 $)
PACKAGE_RELEASE=1
AC_SUBST(PACKAGE_RELEASE)
@@ -149,7 +149,7 @@ if test -z "$INTERNAL_GETOPT"; then
AC_MSG_ERROR([
$GETOPT does not support the --long option.
If you don't have a version of getopt that supports long options, you
-can specify '--with-getopt=none' and $PACKAGE_NAME will use its own
+can specify '--without-getopt' and $PACKAGE_NAME will use its own
internal getopt.
])
fi
@@ -166,7 +166,7 @@ if test -z "$INTERNAL_MKTEMP" ; then
AC_MSG_ERROR([
'$MKTEMP -d' does not create temporary directories.
If you don't have a version of mktemp that can create directories, you
-can specify '--with-mktemp=none' and $PACKAGE_NAME will use its own
+can specify '--without-mktemp' and $PACKAGE_NAME will use its own
internal tempfile generation mechanism.
])
fi
diff --git a/quilt.changes b/quilt.changes
index ae9c24d..d1c9f93 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,10 @@
-------------------------------------------------------------------
+Fri Jan 20 01:11:00 CET 2006 - jayvdb@gmail.com
+
+- configure.in: Document to use --without-foo instead of
+ --with-foo=none.
+
+-------------------------------------------------------------------
Thu Jan 19 17:34:05 CET 2006 - agruen@suse.de
- Make sure quilt diff --snapshot visits files in a defined order.