Sub-dir compilation on solaris.

CVS patchset: 2442
CVS date: 1998/10/11 16:17:45

diff --git a/misc/inet_aton.c b/misc/inet_aton.c
index bee4186..2f9df52 100644 (file)
--- a/misc/inet_aton.c
+++ b/misc/inet_aton.c
@@ -8,8 +8,6 @@
 #include <netinet/ip.h>
 #include <arpa/inet.h>
 
-#include "inet_aton.h"
-
 int
 inet_aton(const char *cp, struct in_addr *inp)
 {

diff --git a/popt/config.h.in b/popt/config.h.in
index 21a4244..e5af0d4 100644 (file)
--- a/popt/config.h.in
+++ b/popt/config.h.in
@@ -1,5 +1,19 @@
 /* config.h.in.  Generated automatically from configure.in by autoheader.  */
 
+/* Avoid autoheader noise */
+#ifndef PACKAGE
+#undef PACKAGE
+#endif
+#ifndef VERSION
+#undef VERSION
+#endif
+#ifndef PROTOTYPES
+#undef PROTOTYPES
+#endif
+#ifndef _GNU_SOURCE
+#undef _GNU_SOURCE
+#endif
+
 /* Define if you have the ANSI C header files.  */
 #undef STDC_HEADERS
 

diff --git a/rpm.c b/rpm.c
index 75c340e..ea58191 100755 (executable)
--- a/rpm.c
+++ b/rpm.c
@@ -919,17 +919,19 @@ int main(int argc, char ** argv) {
     if (rmsource && bigMode == MODE_UNKNOWN)
        bigMode = MODE_BUILD;
     
-    if (initdb)
+    if (initdb) {
        if (bigMode != MODE_UNKNOWN) 
            argerror(_("only one major mode may be specified"));
        else
            bigMode = MODE_INITDB;
+    }
 
-    if (queryTags)
+    if (queryTags) {
        if (bigMode != MODE_UNKNOWN) 
            argerror(_("only one major mode may be specified"));
        else
            bigMode = MODE_QUERYTAGS;
+    }
 
     if (buildRootOverride && bigMode != MODE_BUILD &&
        bigMode != MODE_REBUILD && bigMode != MODE_TARBUILD) {