From b351bfcc85d3d4dd6ec81a55b15ec898d594417d Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Wed, 2 Nov 2005 18:19:09 +0000 Subject: [PATCH] - Move the -lcrypt for PostgreSQL after the PostgreSQL libs in autoconf/bacula-macros/db.m4 as suggested by user. Fixes bug #457. - Remove @STATIC_CONS@ from tray-monitor Makefile as suggested by user. Fixes bug #456. git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2523 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/autoconf/bacula-macros/db.m4 | 3 +-- bacula/src/tray-monitor/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/bacula/autoconf/bacula-macros/db.m4 b/bacula/autoconf/bacula-macros/db.m4 index 8f0e4a2488..8428ab8a88 100644 --- a/bacula/autoconf/bacula-macros/db.m4 +++ b/bacula/autoconf/bacula-macros/db.m4 @@ -321,7 +321,7 @@ AC_ARG_WITH(postgresql, AC_MSG_ERROR(Invalid PostgreSQL directory $withval - unable to find libpq-fe.h under $withval) fi POSTGRESQL_LFLAGS="-L$POSTGRESQL_LIBDIR -lpq" - AC_CHECK_FUNC(crypt, , AC_CHECK_LIB(crypt, crypt, [POSTGRESQL_LFLAGS="-lcrypt $POSTGRESQL_LFLAGS"])) + AC_CHECK_FUNC(crypt, , AC_CHECK_LIB(crypt, crypt, [POSTGRESQL_LFLAGS="$POSTGRESQL_LFLAGS -lcrypt"])) SQL_INCLUDE=-I$POSTGRESQL_INCDIR SQL_LFLAGS=$POSTGRESQL_LFLAGS SQL_BINDIR=$POSTGRESQL_BINDIR @@ -802,4 +802,3 @@ else $1_TRUE='#' $1_FALSE= fi]) - diff --git a/bacula/src/tray-monitor/Makefile.in b/bacula/src/tray-monitor/Makefile.in index 55251e94ee..8860034004 100644 --- a/bacula/src/tray-monitor/Makefile.in +++ b/bacula/src/tray-monitor/Makefile.in @@ -41,7 +41,7 @@ OPENSSL_LIBS = @OPENSSL_LIBS@ $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(MONITOR_CPPFLAGS) \ $(OPENSSL_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< #------------------------------------------------------------------------- -all: Makefile bacula-tray-monitor @STATIC_CONS@ +all: Makefile bacula-tray-monitor @echo "==== Make of bacula-tray-monitor is good ====" @echo " " -- 2.39.5