Bunch of changes to make dpkg compile on HP-UX

diff --git a/ChangeLog b/ChangeLog
index f7e576e96d41b82f7a55790000b74bd5c2f034d1..00fbb0875d85def70bc051f8a93d0a8554a51254 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,15 @@
-Mon Jan 10 20:55:45 CET 2000 Wichert Akkerman <wakkerma@debian.org>
-
-  * Update Swedish and Russian translation
+Tue Jan 11 18:32:52 CET 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * configure.in: Fix include in test for alphasort 
+  * Makefile.in: add intl to subdirectory-list
+  * dpkg-deb/Makefile.in: set top_builddir
+  * dselect/Makefile.in: set top_builddir
+  * main/Makefile.in: set top_builddir
+  * lib/compat.c: add really simple snprintf (doesn't do range-checking)
+  * lib/compat.c: add sys_siglist
+  * configure.in: add tests for snprintf and sys_siglist
+  * include/dpkg.h.in: don't include sys/sysinfo.h, filesdb.c is the only
+    thing that needs it and it has its own include.
 
 Tue Jan 11 02:02:00 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
@@ -13,6 +22,10 @@ Tue Jan 11 02:02:00 CET 2000 Wichert Akkerman <wakkerma@debian.org>
   * dselect/method.cc: switch to using fcntl for lock since that is more
     portable, and revamp lockingcode to reduce code duplication
 
+Mon Jan 10 20:55:45 CET 2000 Wichert Akkerman <wakkerma@debian.org>
+
+  * Update Swedish and Russian translation
+
 Sun Jan  9 16:11:39 CET 2000 Wichert Akkerman <wakkerma@debian.org>
 
   * Merge patches from Josip Rodin:

diff --git a/Makefile.in b/Makefile.in
index 446c852fa140f76560c10f77a33b21737f10f1a5..5120232aa1243d9706b50f838cf808678fb8f995 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -8,7 +8,7 @@ GENFILES        = version.h
 
 include Makefile.conf
 
-SUBDIRS                = include lib optlib dpkg-deb split scripts utils main \
+SUBDIRS                = include lib optlib intl dpkg-deb split scripts utils main \
                  utils @DSELECTDIR@ po methods doc
 
 all: version.h all-recursive

diff --git a/configure.in b/configure.in
index 1320e1f3b5aeca59d9f0d4519c823ae392e3561f..73c938f15a9dbb12b627032d2924a5b8b642908f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -98,9 +98,11 @@ AC_C_BIGENDIAN
 AC_CHECK_SIZEOF(unsigned long)
 AC_CHECK_SIZEOF(unsigned int)
 AC_CHECK_TYPE(ptrdiff_t,int)
-AC_CHECK_FUNCS(unsetenv alphasort scandir strerror strsignal strtoul vsnprintf lchown)
+AC_CHECK_FUNCS(unsetenv alphasort scandir strerror strsignal strtoul)
+AC_CHECK_FUNCS(vsnprintf lchown snprintf)
 AC_CHECK_HEADERS(sys/cdefs.h sys/sysinfo.h syslog.h stddef.h)
 AC_CHECK_HEADERS(error.h hurd.h ps.h hurd/ihash.h)
+AC_SYS_SIGLIST_DECLARED
 
 AC_CHECK_LIB(shouldbeinlibc, fmt_past_time)
 AC_CHECK_LIB(ps, proc_stat_list_pid_proc_stat)
@@ -120,7 +122,7 @@ fi
 
 AC_TRY_COMPILE([
 #include <sys/types.h>
-#include <sys/dir.h>
+#include <dirent.h>
 ], alphasort, AC_DEFINE(HAVE_ALPHASORT_DECLARATION))
 
 AC_TRY_COMPILE(,[

diff --git a/dpkg-deb/Makefile.in b/dpkg-deb/Makefile.in
index f3d9c6cfec9cf6180fb52470fc95cfcf0f5d7628..12fc039319e0525b7b4f87cfc46781a4c9f7cbe0 100644 (file)
--- a/dpkg-deb/Makefile.in
+++ b/dpkg-deb/Makefile.in
@@ -2,6 +2,7 @@
 VPATH          = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
+top_builddir   = ..
 
 include ../Makefile.conf
 

diff --git a/dselect/Makefile.in b/dselect/Makefile.in
index 3eefba7a22a044af6a1671b01d7bc1430d60560e..4b428e6d7189d9c23ca391592870d30b1bfb3ab1 100644 (file)
--- a/dselect/Makefile.in
+++ b/dselect/Makefile.in
@@ -1,6 +1,7 @@
 VPATH          = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
+top_builddir   = ..
 
 include ../Makefile.conf
 

diff --git a/include/dpkg.h.in b/include/dpkg.h.in
index 00444f49cc82e7bcf4f737833bcc01c6122444f9..b053969dabe7a265fc0284952e4d5bd5a6298b65 100644 (file)
--- a/include/dpkg.h.in
+++ b/include/dpkg.h.in
@@ -26,7 +26,6 @@
 #include <stdarg.h>
 #include <stdio.h>
 #include <sys/types.h>
-#include <sys/sysinfo.h>
 
 #define ARCHIVEVERSION     "2.0"
 #define SPLITVERSION       "2.1"

diff --git a/lib/compat.c b/lib/compat.c
index b5cd17cb1dd6c803f54184f59ceea593e4ae4d77..77fa21a5be9dce0eff5663630293e341a2dd1157 100644 (file)
--- a/lib/compat.c
+++ b/lib/compat.c
@@ -66,6 +66,20 @@ int vsnprintf (char *buf, size_t maxsize, const char *fmt, va_list al) {
 }
 #endif
 
+#ifndef HAVE_SNPRINTF
+int
+snprintf (char *str, size_t n, char const *format, ...)
+{
+  va_list ap;
+  int i;
+  (void)n;
+  va_start (ap, format);
+  i = vsprintf (str, format, ap);
+  va_end (ap);
+  return i;
+}
+#endif
+
 #ifndef HAVE_STRERROR
 extern const char *const sys_errlist[];
 extern const int sys_nerr;
@@ -87,6 +101,43 @@ const char *strsignal(int e) {
 }
 #endif
 
+#ifndef SYS_SIGLIST_DECLARED
+const char *const sys_siglist[32] = {
+  "SIGHUP",      /*1*/
+  "SIGINT",      /*2*/
+  "SIGQUIT",     /*3*/
+  "SIGILL",      /*4*/
+  "SIGTRAP",     /*5*/
+  "SIGABRT",     /*6*/
+  "SIGEMT",      /*7*/
+  "SIGFPE",      /*8*/
+  "SIGKILL",     /*9*/
+  "SIGUSR1",     /*10*/
+  "SIGSEGV",     /*11*/
+  "SIGUSR2",     /*12*/
+  "SIGPIPE",     /*13*/
+  "SIGALRM",     /*14*/
+  "SIGTERM",     /*15*/
+  "SIGSTKFLT",   /*16*/
+  "SIGCHLD",     /*17*/
+  "SIGCONT",     /*18*/
+  "SIGSTOP",     /*19*/
+  "SIGTSTP",     /*20*/
+  "SIGTTIN",     /*21*/
+  "SIGTTOU",     /*22*/
+  "SIGXXX",      /*23*/
+  "SIGXXX",      /*24*/
+  "SIGXXX",      /*25*/
+  "SIGXXX",      /*26*/
+  "SIGXXX",      /*27*/
+  "SIGXXX",      /*28*/
+  "SIGXXX",      /*29*/
+  "SIGXXX",      /*30*/
+  "SIGXXX",      /*31*/
+  "SIGXXX"       /*32*/
+};
+#endif
+
 #ifndef HAVE_SCANDIR
 
 static int (*scandir_comparfn)(const void*, const void*);

diff --git a/main/Makefile.in b/main/Makefile.in
index 9d4f3a03820559e727c8f81311d2a2347b962a4c..2ad037199608c15d5c539f6017813bef7ad78aa1 100644 (file)
--- a/main/Makefile.in
+++ b/main/Makefile.in
@@ -1,6 +1,7 @@
 VPATH          = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
+top_builddir   = ..
 
 include ../Makefile.conf
 

diff --git a/split/Makefile.in b/split/Makefile.in
index fcdf95f3caea8b63f6a260b821511c134ccc3bb6..27f55ba2abe88e1f0e303fe80864d8a391961fec 100644 (file)
--- a/split/Makefile.in
+++ b/split/Makefile.in
@@ -2,6 +2,7 @@
 VPATH          = @srcdir@
 srcdir         = @srcdir@
 top_srcdir     = @top_srcdir@
+top_builddir = ..
 
 include ../Makefile.conf