summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruen@suse.de>2005-09-19 10:26:16 +0000
committerAndreas Gruenbacher <agruen@suse.de>2005-09-19 10:26:16 +0000
commitc50beee0cac17382c8f1c9526db30e8449d94f89 (patch)
tree2af4cf2d6a9bac334455dfbe4e4bfd7467418adc
parent077fd7ccb883f768adee924bc8d3df750c811491 (diff)
downloadquilt-c50beee0cac17382c8f1c9526db30e8449d94f89.tar.gz
- configure.ac: Don't run tests when using internal compatibility
programs.
-rw-r--r--aclocal.m41
-rw-r--r--configure.ac6
-rw-r--r--quilt.changes4
3 files changed, 7 insertions, 4 deletions
diff --git a/aclocal.m4 b/aclocal.m4
index 38b8852..aeb4d72 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -25,6 +25,7 @@ AC_DEFUN([QUILT_COMPAT_PROG_PATH],[
AC_MSG_WARN([Using internal $2 mechanism. Use option '--with-$2' to override])
COMPAT_PROGRAMS="$COMPAT_PROGRAMS $2"
$1=$2
+ INTERNAL_$1=1
])
fi
AC_SUBST($1)
diff --git a/configure.ac b/configure.ac
index 73408ce..c74c5e8 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.53 $)
+AC_REVISION ($Revision: 1.54 $)
PACKAGE_RELEASE=1
AC_SUBST(PACKAGE_RELEASE)
@@ -77,7 +77,7 @@ QUILT_COMPAT_PROG_PATH(POD2MAN, pod2man)
QUILT_COMPAT_PROG_PATH(COLUMN, column)
QUILT_COMPAT_PROG_PATH(GETOPT, getopt)
-if test -n "$GETOPT"; then
+if test -z "$INTERNAL_GETOPT"; then
AC_MSG_CHECKING(for getopt --long syntax)
dnl check GNU syntax
$GETOPT -o t --long test -- --test | grep -q 'illegal option'
@@ -98,7 +98,7 @@ internal getopt.
fi
QUILT_COMPAT_PROG_PATH(MKTEMP, mktemp)
-if test -n "$MKTEMP" ; then
+if test -z "$INTERNAL_MKTEMP" ; then
AC_MSG_CHECKING(whether $MKTEMP -d works)
if tempdir=`$MKTEMP -d /tmp/$PACKAGE_NAME.XXXXXX 2>/dev/null` && \
rmdir "$tempdir" ; then
diff --git a/quilt.changes b/quilt.changes
index 9d3d12e..168f8de 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,8 +1,10 @@
-------------------------------------------------------------------
-Mon Sep 19 11:48:00 CEST 2005 - agruen@suse.de
+Mon Sep 19 12:25:15 CEST 2005 - agruen@suse.de
- Fix mta check when sendmail is found.
- Fix --disable-nls.
+- configure.ac: Don't run tests when using internal compatibility
+ programs.
-------------------------------------------------------------------
Sun Sep 18 18:39:56 CEST 2005 - agruen@suse.de