X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fautoconf%2FMake.common.in;h=aba79f4dbec7b265194ffc899c2da651caae7309;hb=af4dda2b1458c878378e662748a3d29750dcb2b1;hp=f8b6daa6c7a7c786d12fde228931969a94f8f4e0;hpb=2bc6feb9479389b2b9464110b3c6252bb08ee90f;p=bacula%2Fbacula

diff --git a/bacula/autoconf/Make.common.in b/bacula/autoconf/Make.common.in
index f8b6daa6c7..aba79f4dbe 100644
--- a/bacula/autoconf/Make.common.in
+++ b/bacula/autoconf/Make.common.in
@@ -1,5 +1,8 @@
-# autoconf/Make.common.in	 -*- Makefile -*-
-# release date (man), LSM date, version number/name, current maintainer
+#
+# This file is pulled in by all the Unix Bacula Makefiles
+#   so it has all the "common" definitions
+#
+
 DATE="@DATE@"
 LSMDATE=@LSMDATE@
 VERSION=@VERSION@
@@ -20,8 +23,13 @@ prefix = @prefix@
 exec_prefix = @exec_prefix@
 binprefix =
 manprefix =
+datarootdir = @datarootdir@
+docdir = @docdir@
 sbindir = @sbindir@
+libdir = @libdir@
+includedir = @includedir@
 sysconfdir = @sysconfdir@
+plugindir = @plugindir@
 scriptdir = @scriptdir@
 mandir = @mandir@
 manext = 8
@@ -33,8 +41,8 @@ CC = @CC@
 CPP = @CPP@
 CXX = @CXX@
 MV = @MV@
-RM = @RM@
-RMF = @RM@ -f
+RM = @REMOVE@
+RMF = $(RM) -f
 CP = @CP@
 SED = @SED@
 AWK = @AWK@
@@ -42,18 +50,34 @@ ECHO = @ECHO@
 CMP = @CMP@
 TBL = @TBL@
 AR = @AR@
+GMAKE = @GMAKE@
 RANLIB = @RANLIB@
 MKDIR = @BUILD_DIR@/autoconf/mkinstalldirs
 INSTALL = @INSTALL@
 # add the -s to the following in PRODUCTION mode
-INSTALL_PROGRAM = @INSTALL@ -m @SBINPERM@
-INSTALL_DATA = @INSTALL@ -m 644
-INSTALL_SCRIPT = @INSTALL@ -m @SBINPERM@
-INSTALL_CONFIG = @INSTALL@ -m 640
+INSTALL_PROGRAM = $(INSTALL) -m @SBINPERM@
+INSTALL_DATA = $(INSTALL) -m 644
+INSTALL_SCRIPT = $(INSTALL) -m @SBINPERM@
+INSTALL_CONFIG = $(INSTALL) -m 640
+
+#
+# Libtool specific settings
+#
+DEFAULT_OBJECT_TYPE = @DEFAULT_OBJECT_TYPE@
+DEFAULT_ARCHIVE_TYPE = @DEFAULT_ARCHIVE_TYPE@
+DEFAULT_SHARED_OBJECT_TYPE = @DEFAULT_SHARED_OBJECT_TYPE@
+LIBTOOL = @BUILD_DIR@/libtool
+LIBTOOL_COMPILE = @LIBTOOL@ --silent --tag=CXX --mode=compile
+LIBTOOL_LINK = @LIBTOOL@ --silent --tag=CXX --mode=link
+LIBTOOL_INSTALL = @LIBTOOL@ --silent --tag=CXX --mode=install
+LIBTOOL_INSTALL_FINISH = @LIBTOOL@ --silent --tag=CXX --finish --mode=install
+LIBTOOL_UNINSTALL = @LIBTOOL@ --silent --tag=CXX --mode=uninstall
+LIBTOOL_CLEAN = @LIBTOOL@ --silent --tag=CXX --mode=clean
 
 # Flags & libs
-CFLAGS = @CFLAGS@ 
-CPPFLAGS = @CPPFLAGS@
+CFLAGS = @CFLAGS@ @OPENSSL_INC@
+
+CPPFLAGS = @CPPFLAGS@ @OPENSSL_INC@
 LDFLAGS = @LDFLAGS@
 TTOOL_LDFLAGS = @TTOOL_LDFLAGS@
 #DEFS = @DEFS@ @LOCAL_DEFS@
@@ -64,6 +88,10 @@ DLIB = @DLIB@
 DB_LIBS = @DB_LIBS@
 PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_INC = @PYTHON_INCDIR@
+OPENSSL_LIBS = @OPENSSL_LIBS@
+BDB_CPPFLAGS = @BDB_CPPFLAGS@
+BDB_LIBS = @BDB_LIBS@
+
 
 # Windows (cygwin) flags 
 WCFLAGS = @WCFLAGS@