automake linux fiddles.

CVS patchset: 2421
CVS date: 1998/10/08 11:19:57

diff --git a/Makefile.am b/Makefile.am
index 59ee1c5..3c25070 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,9 +34,9 @@ rpm.o:
        $(COMPILE) \
                -DRPMNLSDIR=\"$(RPMNLSDIR)\" \
                -DRPMNLSPACKAGE=\"$(PACKAGE)\" \
-                -DVERSION=\"$(VERSION)\"  \
+               -DVERSION=\"$(VERSION)\"  \
                -DLIBRPMALIAS_FILENAME=\"$(LIBRPMALIAS_FILENAME)\" \
-                -DRPMCONFIGDIR="\"$(RPMCONFIGDIR)"\" \
+               -DRPMCONFIGDIR="\"$(RPMCONFIGDIR)"\" \
                -c rpm.c
 
 include ./Makefile.inc

diff --git a/Makefile.in b/Makefile.in
index fdcb7cc..921b6d4 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -686,9 +686,9 @@ rpm.o:
        $(COMPILE) \
                -DRPMNLSDIR=\"$(RPMNLSDIR)\" \
                -DRPMNLSPACKAGE=\"$(PACKAGE)\" \
-                -DVERSION=\"$(VERSION)\"  \
+               -DVERSION=\"$(VERSION)\"  \
                -DLIBRPMALIAS_FILENAME=\"$(LIBRPMALIAS_FILENAME)\" \
-                -DRPMCONFIGDIR="\"$(RPMCONFIGDIR)"\" \
+               -DRPMCONFIGDIR="\"$(RPMCONFIGDIR)"\" \
                -c rpm.c
 
 include ./Makefile.inc

diff --git a/acconfig.h b/acconfig.h
index adde423..9e78156 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -14,6 +14,15 @@
    Leave the following blank line there!!  Autoheader needs it.  */
 ^L
 
+/* Define to the name of the distribution.  */
+#undef PACKAGE
+
+/* Define to the version of the distribution.  */
+#undef VERSION
+
+/* Define to 1 if ANSI function prototypes are usable.  */
+#undef PROTOTYPES
+
 /* Define to 1 if NLS is requested.  */
 #undef ENABLE_NLS
 

diff --git a/popt/config.h.in b/popt/config.h.in
index 2641ff2..21a4244 100644 (file)
--- a/popt/config.h.in
+++ b/popt/config.h.in
@@ -1,10 +1,25 @@
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
+/* Define if you have the ANSI C header files.  */
+#undef STDC_HEADERS
+
+/* Define to the name of the distribution.  */
+#undef PACKAGE
+
+/* Define to the version of the distribution.  */
+#undef VERSION
+
+/* Define to 1 if ANSI function prototypes are usable.  */
+#undef PROTOTYPES
+
 /* Define if you have the strerror function.  */
 #undef HAVE_STRERROR
 
 /* Define if you have the <alloca.h> header file.  */
 #undef HAVE_ALLOCA_H
 
+/* Define if you have the <string.h> header file.  */
+#undef HAVE_STRING_H
+
 /* Define if you have the <unistd.h> header file.  */
 #undef HAVE_UNISTD_H

diff --git a/popt/findme.c b/popt/findme.c
index 528d401..1086b28 100644 (file)
--- a/popt/findme.c
+++ b/popt/findme.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/popt/popt.c b/popt/popt.c
index 025d2d5..7678734 100644 (file)
--- a/popt/popt.c
+++ b/popt/popt.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <errno.h>
 #include <ctype.h>
 #include <fcntl.h>

diff --git a/popt/poptconfig.c b/popt/poptconfig.c
index cd4e239..0a81ca4 100644 (file)
--- a/popt/poptconfig.c
+++ b/popt/poptconfig.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>

diff --git a/popt/popthelp.c b/popt/popthelp.c
index 326f0ae..95f3b4b 100644 (file)
--- a/popt/popthelp.c
+++ b/popt/popthelp.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <ctype.h>
 #include <stdio.h>
 #include <stdlib.h>

diff --git a/popt/poptparse.c b/popt/poptparse.c
index ade5a79..aea784b 100644 (file)
--- a/popt/poptparse.c
+++ b/popt/poptparse.c
@@ -1,3 +1,7 @@
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include <ctype.h>
 #include <stdlib.h>
 #include <string.h>

diff --git a/popt/stamp-h.in b/popt/stamp-h.in
index e69de29..9788f70 100644 (file)
--- a/popt/stamp-h.in
+++ b/popt/stamp-h.in
@@ -0,0 +1 @@
+timestamp