From b73f87975b8e40ff47c955cb0e81cf3605e40d9f Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Mon, 27 Sep 2004 12:29:06 +0000 Subject: [PATCH] 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 --- bacula/autoconf/aclocal.m4 | 4 ++++ bacula/configure | 4 ++++ bacula/src/bc_types.h | 2 ++ 3 files changed, 10 insertions(+) diff --git a/bacula/autoconf/aclocal.m4 b/bacula/autoconf/aclocal.m4 index 928b33e2d8..1f3cfb8796 100644 --- 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 c57de6bd55..a31ff10922 100755 --- 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 f11df93f63..1f5738c37c 100644 --- 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 -- 2.39.2