From: Landon Fuller <landonf@opendarwin.org>
Date: Sat, 20 Aug 2005 19:57:01 +0000 (+0000)
Subject: Include the appropriate libintl linker flags. Tested on Linux, Solaris, FreeBSD and... 
X-Git-Tag: Release-1.38.0~158
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=bc0cdecd0706379da4c5be4dcf87b693b5dc7215;p=bacula%2Fbacula

Include the appropriate libintl linker flags. Tested on Linux, Solaris, FreeBSD and Mac OS X.


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

diff --git a/bacula/src/console/Makefile.in b/bacula/src/console/Makefile.in
index 95f2026de7..b930c0b979 100644
--- a/bacula/src/console/Makefile.in
+++ b/bacula/src/console/Makefile.in
@@ -26,6 +26,8 @@ CONSOBJS = console.o console_conf.o authenticate.o @CONS_OBJ@
 # these are the objects that are changed by the .configure process
 EXTRAOBJS = @OBJLIST@
 
+GETTEXT_LIBS = @LIBINTL@
+
 OPENSSL_INC = @OPENSSL_INC@
 OPENSSL_LIBS = @OPENSSL_LIBS@
 
@@ -48,11 +50,13 @@ all: Makefile bconsole @STATIC_CONS@
 
 bconsole: $(CONSOBJS) ../lib/libbac.a
 	$(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
-	      $(DLIB) $(CONS_LIBS)  -lbac -lm $(LIBS) $(OPENSSL_LIBS)
+	      $(DLIB) $(CONS_LIBS)  -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+	      $(OPENSSL_LIBS)
 
 static-bconsole: $(CONSOBJS) ../lib/libbac.a
 	$(CXX) -static $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
-	      $(DLIB) $(CONS_LIBS)  -lbac -lm $(LIBS) $(OPENSSL_LIBS)
+	      $(DLIB) $(CONS_LIBS)  -lbac -lm $(LIBS) $(GETTEXT_LIBS) \
+	      $(OPENSSL_LIBS)
 	strip $@
 
 
diff --git a/bacula/src/dird/Makefile.in b/bacula/src/dird/Makefile.in
index 3304e86327..87c26a32a3 100644
--- a/bacula/src/dird/Makefile.in
+++ b/bacula/src/dird/Makefile.in
@@ -18,6 +18,8 @@ thisdir = src/dird
 
 DEBUG=@DEBUG@
 
+GETTEXT_LIBS = @LIBINTL@
+
 OPENSSL_LIBS = @OPENSSL_LIBS@
 OPENSSL_INC = @OPENSSL_INC@
 
@@ -76,11 +78,13 @@ all: Makefile bacula-dir @STATIC_DIR@
 
 bacula-dir:  $(SVROBJS) ../lib/libbac.a ../cats/libsql.a ../findlib/libfind.a
 	$(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
-	      -lsql -lfind -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) $(OPENSSL_LIBS)
+	      -lsql -lfind -lbac -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
+	      $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 static-bacula-dir:  $(SVROBJS) ../lib/libbac.a ../cats/libsql.a ../findlib/libfind.a
 	$(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../cats -L../findlib -o $@ $(SVROBJS) \
-	      -lsql -lbac -lfind -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) $(OPENSSL_LIBS)
+	      -lsql -lbac -lfind -lm $(PYTHON_LIBS) $(DLIB) $(DB_LIBS) $(LIBS) \
+	      $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 	strip $@
 
 
diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in
index 9cfbaf286c..7eb3ffa048 100755
--- a/bacula/src/filed/Makefile.in
+++ b/bacula/src/filed/Makefile.in
@@ -19,6 +19,8 @@ thisdir = src/filed
 
 DEBUG=@DEBUG@
 
+GETTEXT_LIBS = @LIBINTL@
+
 OPENSSL_LIBS = @OPENSSL_LIBS@
 OPENSSL_INC = @OPENSSL_INC@
 
@@ -78,11 +80,13 @@ win32:	$(WIN32OBJS)
 
 bacula-fd:  $(SVROBJS) ../findlib/libfind.a ../lib/libbac.a @WIN32@
 	$(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
-	  $(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(PYTHON_LIBS) $(LIBS) $(DLIB) $(OPENSSL_LIBS)
+	  $(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(PYTHON_LIBS) $(LIBS) \
+	  $(DLIB) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 static-bacula-fd:  $(SVROBJS) ../findlib/libfind.a ../lib/libbac.a @WIN32@
 	$(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
-	   $(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(PYTHON_LIBS) $(LIBS) $(DLIB) $(OPENSSL_LIBS)
+	   $(WIN32LIBS) $(FDLIBS) -lfind -lbac -lm $(PYTHON_LIBS) $(LIBS) \
+	   $(DLIB) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 	strip $@
 
 
diff --git a/bacula/src/stored/Makefile.in b/bacula/src/stored/Makefile.in
index e422453295..cbf7d332b3 100644
--- a/bacula/src/stored/Makefile.in
+++ b/bacula/src/stored/Makefile.in
@@ -14,6 +14,8 @@ thisdir = src/stored
 
 DEBUG=@DEBUG@
 
+GETTEXT_LIBS = @LIBINTL@
+
 OPENSSL_LIBS = @OPENSSL_LIBS@
 OPENSSL_INC = @OPENSSL_INC@
 
@@ -98,11 +100,11 @@ all: Makefile bacula-sd @STATIC_SD@ bls bextract bscan btape bcopy
 
 bacula-sd: $(SVROBJS) ../lib/libbac.a
 	$(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -o $@ $(SVROBJS) $(FDLIBS) \
-	  -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(OPENSSL_LIBS)
+	  -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 static-bacula-sd: $(SVROBJS) ../lib/libbac.a
 	$(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -o $@ $(SVROBJS) $(FDLIBS) \
- -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(OPENSSL_LIBS)
+ -lbac -lm $(PYTHON_LIBS) $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 	strip $@
 
 btape.o: btape.c
@@ -111,7 +113,7 @@ btape.o: btape.c
 
 btape:	$(TAPEOBJS) ../lib/libbac.a ../cats/libsql.a
 	$(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats  -o $@ $(TAPEOBJS) \
- -lsql $(DLIB) -lbac -lm $(LIBS) $(OPENSSL_LIBS)
+ -lsql $(DLIB) -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bls.o:	bls.c
 	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) \
@@ -119,7 +121,7 @@ bls.o:	bls.c
 
 bls:	../findlib/libfind.a $(BLSOBJS) ../lib/libbac.a
 	$(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BLSOBJS) $(DLIB) -lfind \
- -lbac -lm $(LIBS) $(OPENSSL_LIBS)
+ -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bextract.o: bextract.c
 	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) \
@@ -127,7 +129,7 @@ bextract.o: bextract.c
 
 bextract: ../findlib/libfind.a $(BEXTOBJS) ../lib/libbac.a
 	$(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(BEXTOBJS) $(DLIB) $(FDLIBS) \
- -lfind -lbac -lm $(PYTHON_LIBS) $(LIBS) $(OPENSSL_LIBS)
+ -lfind -lbac -lm $(PYTHON_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bscan.o: bscan.c
 	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) \
@@ -135,7 +137,7 @@ bscan.o: bscan.c
 
 bscan:	../findlib/libfind.a $(SCNOBJS) ../cats/libsql.a
 	$(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../cats -L../findlib -o $@ $(SCNOBJS) \
- -lsql $(DB_LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) $(OPENSSL_LIBS)
+ -lsql $(DB_LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 bcopy.o: bcopy.c
 	$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) -I$(srcdir) \
@@ -143,7 +145,7 @@ bcopy.o: bcopy.c
 
 bcopy:	$(COPYOBJS) ../findlib/libfind.a ../lib/libbac.a
 	$(CXX) $(TTOOL_LDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(COPYOBJS) \
- $(DB_LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) $(OPENSSL_LIBS)
+ $(DB_LIBS) $(FDLIBS) -lfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
diff --git a/bacula/src/tools/Makefile.in b/bacula/src/tools/Makefile.in
index 04bcb24aa1..340909dd25 100644
--- a/bacula/src/tools/Makefile.in
+++ b/bacula/src/tools/Makefile.in
@@ -25,6 +25,8 @@ dummy:
 
 #
 
+GETTEXT_LIBS = @LIBINTL@
+
 OPENSSL_INC = @OPENSSL_INC@
 OPENSSL_LIBS = @OPENSSL_LIBS@
 
@@ -57,21 +59,21 @@ all: Makefile $(TOOLS)
 	@echo " "
 
 bsmtp:	bsmtp.o ../lib/libbac.a        
-	$(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(OPENSSL_LIBS)
+	$(CXX) $(LDFLAGS) -L../lib -o $@ bsmtp.o -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 dbcheck: dbcheck.o ../lib/libbac.a ../cats/libsql.a $(DIRCONFOBJS)
-	$(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o $(DIRCONFOBJS) -lsql -lbac -lm $(DB_LIBS) $(LIBS) $(OPENSSL_LIBS)
+	$(CXX) $(LDFLAGS) -L../lib -L../cats -o $@ dbcheck.o $(DIRCONFOBJS) -lsql -lbac -lm $(DB_LIBS) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 fstype: fstype.o ../lib/libbac.a ../findlib/libfind.a
-	$(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o -lfind -lbac -lm $(DLIB) $(LIBS) $(OPENSSL_LIBS)
+	$(CXX) $(LDFLAGS) -L../lib -L../findlib -o $@ fstype.o -lfind -lbac -lm $(DLIB) $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 testfind: ../findlib/libfind.a ../lib/libbac.a $(FINDOBJS)
 	$(CXX) -g $(LDFLAGS) -L. -L../lib -L../findlib -o $@ $(FINDOBJS) \
-	  $(DLIB) -lfind -lbac -lm $(LIBS) $(OPENSSL_LIBS)
+	  $(DLIB) -lfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 testls: ../findlib/libfind.a ../lib/libbac.a testls.o
 	$(CXX) -g $(LDFLAGS) -L. -L../lib -L../findlib -o $@ testls.o \
-	  $(DLIB) -lfind -lbac -lm $(LIBS) $(OPENSSL_LIBS)
+	  $(DLIB) -lfind -lbac -lm $(LIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
 	cd $(topdir) \