made include of alloca.h conditional

CVS patchset: 1227
CVS date: 1996/12/12 03:32:22

5 files changed, 17 insertions, 5 deletions

diff --git a/install.c b/install.c
index 7bed746c5..bc4e0f656 100644
--- a/install.c
+++ b/install.c
@@ -1,10 +1,13 @@
-#include <alloca.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
+
 #include "install.h"
 #include "lib/rpmlib.h"
 #include "messages.h"
diff --git a/lib/rebuilddb.c b/lib/rebuilddb.c
index 933e66123..ab0892ef4 100644
--- a/lib/rebuilddb.c
+++ b/lib/rebuilddb.c
@@ -1,10 +1,13 @@
-#include <alloca.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <sys/stat.h>	/* for mkdir(2) !?! */
 #include <unistd.h>
 
+#ifndef HAVE_ALLOCA_H
+#include <alloca.h>
+#endif
+
 #include "messages.h"
 #include "rpmdb.h"
 #include "rpmlib.h"
diff --git a/query.c b/query.c
index daed18c25..ae91b9d76 100644
--- a/query.c
+++ b/query.c
@@ -1,4 +1,3 @@
-#include <alloca.h>
 #include <ctype.h>
 #include <errno.h>
 #include <fcntl.h>
@@ -10,6 +9,10 @@
 #include <sys/param.h>
 #include <unistd.h>
 
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
+
 #include "lib/messages.h"
 #include "rpmlib.h"
 #include "query.h"
diff --git a/rpm.c b/rpm.c
index 747e6b857..67514951b 100755
--- a/rpm.c
+++ b/rpm.c
@@ -1,5 +1,4 @@
 #include <getopt.h>
-#include <libintl.h>
 #include <locale.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -8,6 +7,7 @@
 #include <sys/stat.h>
 
 #include "install.h"
+#include "intl.h"
 #include "lib/messages.h"
 #include "lib/signature.h"
 #include "query.h"
diff --git a/url.c b/url.c
index 635921b03..740fcd36f 100644
--- a/url.c
+++ b/url.c
@@ -1,4 +1,3 @@
-#include <alloca.h>
 #include <fcntl.h>
 #include <pwd.h>
 #include <string.h>
@@ -6,6 +5,10 @@
 #include <stdlib.h>
 #include <unistd.h>
 
+#ifdef HAVE_ALLOCA_H
+# include <alloca.h>
+#endif
+
 #include "ftp.h"
 #include "messages.h"
 #include "rpmlib.h"