X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fconfigure;h=a73913e7129a948c484a64088cac7c057c580598;hb=1fe2b1f04aa74f096b9f5d607b95524a64ea52f5;hp=303519c3e44e7b2a546a79b701df63c2a87097d5;hpb=dde72dc2340ee538b5d23177aa93e7d5acce7b33;p=bacula%2Fbacula diff --git a/bacula/configure b/bacula/configure index 303519c3e4..a73913e712 100755 --- a/bacula/configure +++ b/bacula/configure @@ -6736,6 +6736,10 @@ cat >>confdefs.h <<_ACEOF #define LOCALEDIR "$localedir" _ACEOF +cat >>confdefs.h <<_ACEOF +#define SYSCONFDIR "$sysconfdir" +_ACEOF + # ------------------------------------------------------------------------- # If the user has not set --exec-prefix, we default to ${prefix} @@ -12883,7 +12887,7 @@ if test x$support_tray_monitor = xyes; then abc=`$PKGCONFIG --atleast-version=2.4 gtk+-2.0` pkg=$? if test $pkg = 0; then - cat >>confdefs.h <<\_ACEOF + cat >>confdefs.h <<\_ACEOF #define HAVE_GTK_2_4 1 _ACEOF @@ -15867,10 +15871,10 @@ if test "x$with_openssl_directory" != "x"; then OPENSSL_INC="-I$with_openssl_directory/include $OPENSSL_INC" fi - saved_LIBS="$LIBS" - saved_CFLAGS="$CFLAGS" - LIBS="$saved_LIBS $OPENSSL_LIBS" - CFLAGS="$saved_CFLAGS $OPENSSL_INC" + saved_LIBS="${LIBS}" + saved_CFLAGS="${CFLAGS}" + LIBS="${saved_LIBS} ${OPENSSL_LIBS}" + CFLAGS="${saved_CFLAGS} ${OPENSSL_INC}" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ @@ -15971,8 +15975,8 @@ fi rm -f conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext - LIBS="$saved_LIBS" - CFLAGS="$saved_CFLAGS" + LIBS="${saved_LIBS}" + CFLAGS="${saved_CFLAGS}" if test "$support_tls" = "yes"; then @@ -29789,7 +29793,7 @@ freebsd) ;; hpux) PSCMD="UNIX95=1 ps -e -o pid,comm" - CFLAGS="$(CFLAGS) -D_XOPEN_SOURCE_EXTENDED=1" + CFLAGS="${CFLAGS} -D_XOPEN_SOURCE_EXTENDED=1" DISTVER=`uname -r` TAPEDRIVE="/dev/rmt/0hnb" PTHREAD_LIB="-lpthread"