- Remove config.h, and use @DEFS@ in Makefile.in instead

  (Gary V. Vaughan <gary@gnu.org>).

7 files changed, 30 insertions, 106 deletions

diff --git a/.cvsignore b/.cvsignore
index ab590c1..055caa7 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-README build-stamp configure-stamp quilt.spec *.tar.gz configure Makefile autom4te.cache config.log config.status config.h
+README build-stamp configure-stamp quilt.spec *.tar.gz configure Makefile autom4te.cache config.log config.status
diff --git a/Makefile.in b/Makefile.in
index 783efb4..b90ca43 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -50,7 +50,7 @@ $(foreach symlink, $(COMPAT_SYMLINKS), $(eval $(call COMPAT_SYMLINK_install, $(s
 install-compat-symlinks: $(COMPAT_SYMLINKS:%=install-compat-symlink-%)
 
 CC :=		@CC@
-CPPFLAGS +=	@CPPFLAGS@ -I.
+CPPFLAGS +=	@CPPFLAGS@ @DEFS@
 CFLAGS +=	@CFLAGS@
 LDFLAGS +=	@LDFLAGS@
 LIBS :=		@LIBS@
@@ -96,7 +96,7 @@ LIB :=		backup-files$(EXEEXT)
 SRC +=		$(LIB_SRC:%=lib/%)
 DIRT +=		lib/backup-files$(EXEEXT) $(LIB_SRC:%.c=lib/%.o)
 
-DOC_IN :=	README 
+DOC_IN :=	README
 DOC_SRC :=	$(DOC_IN:%=doc/%.in)
 DOC :=		$(DOC_IN)
 SRC +=		$(DOC_SRC)
@@ -107,7 +107,7 @@ DIRT +=		$(DOC_IN:%=doc/%) doc/quilt.1
 MAN1 :=		bin/guards.1 doc/quilt.1
 DIRT +=		$(MAN1)
 
-#DEBIAN :=	changelog control copyright rules 
+#DEBIAN :=	changelog control copyright rules
 #
 #SRC +=		$(DEBIAN:%=debian/%)
 
@@ -171,7 +171,7 @@ doc/README : doc/README.in $(QUILT:%=quilt/%)
 			;; \
 		esac ; \
 	done 2>&1 < $< > $@
-	
+
 doc/quilt.1: doc/quilt.1.in $(QUILT:%=quilt/%)
 	@echo "quilt.1.in -> quilt.1"
 	@here=`pwd`;                                     \
@@ -263,7 +263,7 @@ $(patsubst %.in,%,$(wildcard quilt/*.in scripts/*.in)) :: Makefile
 	     -e 's:@DOCSUBDIR''@:$(docdir)/$(PACKAGE)-$(VERSION):g' \
 	     $< > $@
 
-lib/backup-files.o :: config.h
+lib/backup-files.o :: Makefile
 
 Makefile : Makefile.in
 	@echo "Please run ./configure"
@@ -275,7 +275,7 @@ install-main ::
 
 	$(INSTALL) -d $(BUILD_ROOT)$(QUILT_DIR)
 	$(INSTALL) -m 755 $(QUILT:%=quilt/%) $(BUILD_ROOT)$(QUILT_DIR)/
-	
+
 	$(INSTALL) -d $(BUILD_ROOT)$(SCRIPTS_DIR)
 	$(INSTALL) -m 755 $(patsubst %,scripts/%, \
 			     $(filter-out patchfns,$(SCRIPTS))) \
@@ -293,7 +293,7 @@ install-main ::
 
 	$(INSTALL) -d $(BUILD_ROOT)$(mandir)/man1
 	$(INSTALL) -m 644 $(MAN1) $(BUILD_ROOT)$(mandir)/man1/
-	
+
 	$(INSTALL) -d $(BUILD_ROOT)$(etcdir)
 	$(INSTALL) -d $(BUILD_ROOT)$(etcdir)/bash_completion.d
 	$(INSTALL) -m 644 bash_completion $(BUILD_ROOT)$(etcdir)/bash_completion.d/quilt
@@ -322,9 +322,9 @@ uninstall ::
 
 clean :
 	rm -f $(DIRT)
-	
+
 distclean : clean
-	rm -f config.log config.status config.h Makefile
+	rm -f config.log config.status Makefile
 	rm -rf autom4te.cache/
 
 ifneq ($(MSGFMT),)
diff --git a/config.h.in b/config.h.in
deleted file mode 100644
index fce2675..0000000
--- a/config.h.in
+++ /dev/null
@@ -1,84 +0,0 @@
-/* config.h.in.  Generated from configure.ac by autoheader.  */
-
-/* Define to 1 if you have the `chmod' function. */
-#undef HAVE_CHMOD
-
-/* Define to 1 if you have the `fchmod' function. */
-#undef HAVE_FCHMOD
-
-/* Define to 1 if you have the <inttypes.h> header file. */
-#undef HAVE_INTTYPES_H
-
-/* Define to 1 if you have the <memory.h> header file. */
-#undef HAVE_MEMORY_H
-
-/* Define to 1 if you have the `mkdir' function. */
-#undef HAVE_MKDIR
-
-/* Define to 1 if you have the `mkstemp' function. */
-#undef HAVE_MKSTEMP
-
-/* Define to 1 if you have the `mktemp' function. */
-#undef HAVE_MKTEMP
-
-/* Define to 1 if you have the `rmdir' function. */
-#undef HAVE_RMDIR
-
-/* Define to 1 if `stat' has the bug that it succeeds when given the
-   zero-length file name argument. */
-#undef HAVE_STAT_EMPTY_STRING_BUG
-
-/* Define to 1 if you have the <stdint.h> header file. */
-#undef HAVE_STDINT_H
-
-/* Define to 1 if you have the <stdlib.h> header file. */
-#undef HAVE_STDLIB_H
-
-/* Define to 1 if you have the `strchr' function. */
-#undef HAVE_STRCHR
-
-/* Define to 1 if you have the `strerror' function. */
-#undef HAVE_STRERROR
-
-/* Define to 1 if you have the <strings.h> header file. */
-#undef HAVE_STRINGS_H
-
-/* Define to 1 if you have the <string.h> header file. */
-#undef HAVE_STRING_H
-
-/* Define to 1 if you have the `strrchr' function. */
-#undef HAVE_STRRCHR
-
-/* Define to 1 if you have the <sys/stat.h> header file. */
-#undef HAVE_SYS_STAT_H
-
-/* Define to 1 if you have the <sys/types.h> header file. */
-#undef HAVE_SYS_TYPES_H
-
-/* Define to 1 if you have the <unistd.h> header file. */
-#undef HAVE_UNISTD_H
-
-/* Define to 1 if `lstat' dereferences a symlink specified with a trailing
-   slash. */
-#undef LSTAT_FOLLOWS_SLASHED_SYMLINK
-
-/* Define to the address where bug reports for this package should be sent. */
-#undef PACKAGE_BUGREPORT
-
-/* Define to the full name of this package. */
-#undef PACKAGE_NAME
-
-/* Define to the full name and version of this package. */
-#undef PACKAGE_STRING
-
-/* Define to the one symbol short name of this package. */
-#undef PACKAGE_TARNAME
-
-/* Define to the version of this package. */
-#undef PACKAGE_VERSION
-
-/* Define to 1 if you have the ANSI C header files. */
-#undef STDC_HEADERS
-
-/* Define to empty if `const' does not conform to ANSI C. */
-#undef const
diff --git a/configure.ac b/configure.ac
index fb04ee8..093f923 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.48 $)
+AC_REVISION ($Revision: 1.49 $)
 
 PACKAGE_RELEASE=1
 AC_SUBST(PACKAGE_RELEASE)
@@ -223,7 +223,6 @@ AC_SUBST(RPMBUILD)
 AC_SUBST(COMPAT_SYMLINKS)
 AC_SUBST(COMPAT_PROGRAMS)
 
-AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_FILES(Makefile)
 AC_OUTPUT
 
diff --git a/lib/backup-files.c b/lib/backup-files.c
index 831379f..161ea1c 100644
--- a/lib/backup-files.c
+++ b/lib/backup-files.c
@@ -27,7 +27,10 @@
 
 #define _GNU_SOURCE
 
-#include "config.h"
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif
+
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <utime.h>
@@ -123,7 +126,7 @@ remove_parents(char *filename)
 			*g = '/';
 		g = f;
 		*f= '\0';
-		
+
 		rmdir(filename);
 	}
 	if (g != NULL)
@@ -204,7 +207,7 @@ ensure_nolinks(const char *filename)
 		from_fd = open(filename, O_RDONLY);
 		if (from_fd == -1)
 			goto fail;
-		
+
 		/* Temp file name is "path/to/.file.XXXXXX" */
 		strcpy(tmpname, filename);
 		strcat(tmpname, ".XXXXXX");
@@ -215,7 +218,7 @@ ensure_nolinks(const char *filename)
 			c++;
 		memmove(c + 1, c, strlen(c) + 1);
 		*c = '.';
-		
+
 		to_fd = mkstemp(tmpname);
 		if (to_fd == -1)
 			goto fail;
@@ -362,7 +365,7 @@ int
 main(int argc, char *argv[])
 {
 	int opt, status=0;
-	
+
 	progname = argv[0];
 
 	while ((opt = getopt(argc, argv, "brxB:z:f:shLt")) != -1) {
@@ -382,7 +385,7 @@ main(int argc, char *argv[])
 			case 'B':
 				opt_prefix = optarg;
 				break;
-				
+
 			case 'f':
 				opt_file = optarg;
 				break;
@@ -436,7 +439,7 @@ main(int argc, char *argv[])
 				*(l-1) = '\0';
 			if (*line == '\0')
 				continue;
-				
+
 			if ((status = process_file(line)) != 0)
 				return status;
 		}
diff --git a/po/de.po b/po/de.po
index 7bf889e..201e054 100644
--- a/po/de.po
+++ b/po/de.po
@@ -923,9 +923,9 @@ msgstr ""
 "\n"
 "Patches in der series-Datei anwenden. Es kann eine Anzahl von Patches,\n"
 "die angewandt werden soll, oder der Name eines Patches angegeben werden.\n"
-"Wenn ein Name angegeben wird, werden alle Patches bis einschließlich zum\n"
-"angegebenen Patch angewandt. Wenn weder ein Patchname noch eine Nummer\n"
-"angegeben wird, wird der nächste Patch angewandt.\n"
+"Wenn ein Name angegeben wird, werden alle Patches bis einschliesslich\n"
+"diesem Patch angewandt. Wenn weder ein Patchname noch eine Nummer angegeben\n"
+"wird, wird der nächste Patch angewandt.\n"
 "\n"
 "-a\tAlle folgenden Patches anwenden.\n"
 "\n"
diff --git a/quilt.changes b/quilt.changes
index b442d75..72eb028 100644
--- a/quilt.changes
+++ b/quilt.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Sun Sep 18 15:05:43 CEST 2005 - agruen@suse.de
+
+- Remove config.h, and use @DEFS@ in Makefile.in instead
+  (Gary V. Vaughan <gary@gnu.org>).
+
+-------------------------------------------------------------------
 Sun Sep 18 14:30:53 CEST 2005 - khali@linux-fr.org
 
 - configure.ac: Drop useless -e to grep.