From 0add64c1a963a83286f2a095a6015c8d82673f1a Mon Sep 17 00:00:00 2001 From: Andreas Gruenbacher Date: Sat, 1 Feb 2003 18:32:21 +0000 Subject: Add some messages in configure.ac. Make distclean removes autoconf garbage. The configure script is no source file. Add rule to create it when necessary. Invoke configure in the RPM spec file. Merge James Rowe's guidiff. --- Makefile.in | 23 +++++++++++++++++------ configure.ac | 18 +++++++++++++++++- quilt.changes | 5 +++++ quilt.spec.in | 1 + 4 files changed, 40 insertions(+), 7 deletions(-) diff --git a/Makefile.in b/Makefile.in index a689659..2bce806 100644 --- a/Makefile.in +++ b/Makefile.in @@ -21,6 +21,7 @@ BASH := @BASH@ DIFF := @DIFF@ PATCH := @PATCH@ MKTEMP := @MKTEMP@ +GUIDIFF := @GUIDIFF@ CFLAGS := @CFLAGS@ -Wall @@ -30,7 +31,7 @@ ISODATE := $(shell date +%Y-%m-%d) DIRT += $(shell find -name '*~') SRC += COPYING AUTHORS TODO BUGS Makefile.in \ - configure.ac configure config/install-sh \ + configure.ac config/install-sh \ quilt.spec.in quilt.spec quilt.changes DIRT += quilt.spec @@ -42,6 +43,9 @@ DIRT += $(BIN_IN:%=bin/%) QUILT_IN := add applied delete diff files import new next patches \ pop previous push refresh remove series setup top unapplied +ifneq "$(GUIDIFF)" "" +QUILT_IN += guidiff +endif QUILT_SRC := $(QUILT_IN:%=%.in) QUILT := $(QUILT_IN) @@ -82,7 +86,6 @@ dist : $(PACKAGE)-$(VERSION).tar.gz dist-snapshot : $(PACKAGE)-$(ISODATE).tar.bz2 - rpm : $(PACKAGE)-$(VERSION).tar.gz rpm -tb $< @@ -106,21 +109,24 @@ bin/guards.1 : bin/guards mkdir -p $$(dirname $@) pod2man $< > $@ -$(PACKAGE)-$(VERSION).tar.gz : $(SRC) +$(PACKAGE)-$(VERSION).tar.gz : $(SRC) configure rm -f $(PACKAGE)-$(VERSION) $@ ln -s . $(PACKAGE)-$(VERSION) tar chf - $(+:%=$(PACKAGE)-$(VERSION)/%) | gzip -9 > $@ rm -f $(PACKAGE)-$(VERSION) @echo "File $@ created." -$(PACKAGE)-$(ISODATE).tar.bz2 : $(SRC) +$(PACKAGE)-$(ISODATE).tar.bz2 : $(SRC) configure rm -f $(PACKAGE)-$(ISODATE) $@ ln -s . $(PACKAGE)-$(ISODATE) tar chf - $(+:%=$(PACKAGE)-$(ISODATE)/%) | bzip2 -9 > $@ rm -f $(PACKAGE)-$(ISODATE) @echo "File $@ created." -install : all +configure : configure.ac + autoconf + +install : scripts @INSTALL@ -d $(BUILD_ROOT)$(bindir) @INSTALL@ -m 755 $(BIN:%=bin/%) $(BUILD_ROOT)$(bindir)/ @@ -160,8 +166,12 @@ $(PACKAGE).spec : $(PACKAGE).spec.in $(PACKAGE).changes Makefile \ ' $(PACKAGE).changes \ | scripts/parse-patch -u changelog $@ -clean distclean : +clean : rm -f $(DIRT) + +distclean : clean + rm -f config.log config.status Makefile + rm -rf autom4te.cache/ % : %.in @echo "$< -> $@" @@ -173,6 +183,7 @@ clean distclean : -e 's:@DIFF''@:$(DIFF):g' \ -e 's:@PATCH''@:$(PATCH):g' \ -e 's:@MKTEMP''@:$(MKTEMP):g' \ + -e 's:@GUIDIFF''@:$(GUIDIFF):g' \ -e 's:@PACKAGE_BUGREPORT''@:$(PACKAGE_BUGREPORT):g' \ -e 's:@VERSION''@:$(VERSION):g' \ -e 's:@RELEASE''@:$(RELEASE):g' \ diff --git a/configure.ac b/configure.ac index b6e6b63..8b9af20 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.21],[quilt-dev@nongnu.org]) AC_CONFIG_AUX_DIR(config) #AC_PREREQ(2.57) -AC_REVISION ($Revision: 1.1 $) +AC_REVISION ($Revision: 1.2 $) PACKAGE_RELEASE=1 AC_SUBST(PACKAGE_RELEASE) @@ -34,6 +34,7 @@ AC_ARG_WITH(bash, AC_HELP_STRING( [ BASH="$withval" AC_SUBST(BASH) + AC_MSG_NOTICE([Using bash executable $BASH]) ],[ AC_PATH_PROG(BASH, bash) ]) @@ -47,6 +48,7 @@ AC_ARG_WITH(perl, AC_HELP_STRING( [ PERL="$withval" AC_SUBST(PERL) + AC_MSG_NOTICE([Using Perl executable $PERL]) ],[ AC_PATH_PROGS(PERL, [perl perl5]) ]) @@ -60,6 +62,7 @@ AC_ARG_WITH(mktemp, AC_HELP_STRING( [ MKTEMP="$withval" AC_SUBST(MKTEMP) + AC_MSG_NOTICE([Using mktemp executable $MKTEMP]) ],[ AC_PATH_PROG(MKTEMP, mktemp) ]) @@ -82,6 +85,7 @@ AC_ARG_WITH(diff, AC_HELP_STRING( [ DIFF="$withval" AC_SUBST(DIFF) + AC_MSG_NOTICE([Using diff executable $DIFF]) ],[ AC_PATH_PROG(DIFF, diff) ]) @@ -95,6 +99,7 @@ AC_ARG_WITH(patch, AC_HELP_STRING( [ PATCH="$withval" AC_SUBST(PATCH) + AC_MSG_NOTICE([Using patch executable $PATCH]) ],[ AC_PATH_PROG(PATCH, patch) ]) @@ -117,6 +122,17 @@ else AC_MSG_RESULT(yes) fi +# Allow to specify a GUI diff utility used by `quilt guidiff' +AC_ARG_WITH(guidiff, AC_HELP_STRING( + [--with-guidiff], [name of a GUI diff utility (default: none)]), + [ + GUIDIFF="$withval" + AC_MSG_NOTICE([Using guidiff executable $GUIDIFF]) + ],[ + GUIDIFF="" + ]) +AC_SUBST(GUIDIFF) + AC_CONFIG_FILES(Makefile) AC_OUTPUT diff --git a/quilt.changes b/quilt.changes index 0d38c8c..4d559a2 100644 --- a/quilt.changes +++ b/quilt.changes @@ -3,6 +3,11 @@ Sat Feb 1 18:52:15 CET 2003 - agruen@suse.de - Integrate James Rowe's Autoconf setup (with a comple of additional changes/fixes). +- Add some messages in configure.ac. +- Make distclean removes autoconf garbage. The configure script is + no source file. Add rule to create it when necessary. +- Invoke configure in the RPM spec file. +- Merge James Rowe's guidiff. ------------------------------------------------------------------- Fri Jan 31 13:05:18 CET 2003 - agruen@suse.de diff --git a/quilt.spec.in b/quilt.spec.in index 2455cde..589eb0e 100644 --- a/quilt.spec.in +++ b/quilt.spec.in @@ -33,6 +33,7 @@ fi %setup %build +configure make prefix=/usr BUILD_ROOT=$RPM_BUILD_ROOT %install -- cgit