Apply NetBSD patches provided by Frank Kardel

- Fix to search libraries differently for PostgreSQL in configure
- Fix to not #define the Bacula uintxx values if already defined

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1620 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/autoconf/aclocal.m4 b/bacula/autoconf/aclocal.m4
index 928b33e2d8bf03b76ae76ccecc235427cd7ea810..1f3cfb8796949951f54d4acb096624df4009cd97 100644 (file)
--- a/bacula/autoconf/aclocal.m4
+++ b/bacula/autoconf/aclocal.m4
@@ -587,6 +587,10 @@ AC_ARG_WITH(postgresql,
           POSTGRESQL_INCDIR=$withval/include
           POSTGRESQL_LIBDIR=$withval/lib
           POSTGRESQL_BINDIR=$withval/bin
+      elif test -f $withval/include/postgresql/libpq-fe.h; then
+          POSTGRESQL_INCDIR=$withval/include/postgresql
+          POSTGRESQL_LIBDIR=$withval/lib
+          POSTGRESQL_BINDIR=$withval/bin
       else
           AC_MSG_RESULT(no)
           AC_MSG_ERROR(Invalid PostgreSQL directory $withval - unable to find libpq-fe.h under $withval)

diff --git a/bacula/configure b/bacula/configure
index c57de6bd554971059251fa34098ffafe268a3b0e..a31ff1092253ad027c1d55d043a7d72e319a340e 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -7599,6 +7599,10 @@ echo "$as_me: error: Unable to find libpq-fe.h in standard locations" >&2;}
           POSTGRESQL_INCDIR=$withval/include
           POSTGRESQL_LIBDIR=$withval/lib
           POSTGRESQL_BINDIR=$withval/bin
+      elif test -f $withval/include/postgresql/libpq-fe.h; then
+          POSTGRESQL_INCDIR=$withval/include/postgresql
+          POSTGRESQL_LIBDIR=$withval/lib
+          POSTGRESQL_BINDIR=$withval/bin
       else
           echo "$as_me:$LINENO: result: no" >&5
 echo "${ECHO_T}no" >&6

diff --git a/bacula/src/bc_types.h b/bacula/src/bc_types.h
index f11df93f632337ae79b3f127c7b0149d4c7b7ff6..1f5738c37ccc09f3b3a61d67c5509aad05b3acbe 100644 (file)
--- a/bacula/src/bc_types.h
+++ b/bacula/src/bc_types.h
@@ -165,11 +165,13 @@ typedef float             float32_t;
 #endif /* __bc_types_INCLUDED */
 
 /* Define the uint versions actually used in Bacula */
+#ifndef uint8_t
 #define uint8_t u_int8_t
 #define uint16_t u_int16_t
 #define uint32_t u_int32_t
 #define uint64_t u_int64_t
 #define uintmax_t u_intmax_t
+#endif
 
 /* Bacula time -- Unix time with microseconds */
 #define btime_t int64_t