Add FreeBSD -lcam to build flags.

bareos · Feb 17, 2015 · cc77412 · cc77412
1 parent 92a5f7e
commit cc77412
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/autoconf/configure.in b/autoconf/configure.in
@@ -3311,6 +3311,7 @@ AC_ARG_ENABLE(scsi-crypto,
    ]
 )
 
+CAM_LIBS=""
 have_scsi_crypto=no
 if test x$support_scsi_crypto = xyes; then
    if test x${HAVE_LINUX_OS_TRUE} = x; then
@@ -3339,6 +3340,7 @@ if test x$support_scsi_crypto = xyes; then
 
       if test x$ac_cv_header_camlib_h = xyes -a \
               x$ac_cv_header_cam_scsi_scsi_message_h = xyes; then
+         CAM_LIBS="-lcam"
          have_scsi_crypto=yes
       fi
    fi
@@ -3368,6 +3370,7 @@ if test x$support_scsi_crypto = xyes; then
       AC_DEFINE([HAVE_LOWLEVEL_SCSI_INTERFACE], 1, [Low level SCSI Interface support])
    fi
 fi
+AC_SUBST(CAM_LIBS)
 
 dnl
 dnl Check for pthread libraries

diff --git a/src/lib/Makefile.in b/src/lib/Makefile.in
@@ -22,6 +22,7 @@ CPPFLAGS += @ZLIB_INC@
 COMPRESS_CPPFLAGS += @ZLIB_INC@ @LZO_INC@ @FASTLZ_INC@
 
 DEBUG = @DEBUG@
+CAM_LIBS = @CAM_LIBS@
 CAP_LIBS = @CAP_LIBS@
 ZLIB_LIBS = @ZLIB_LIBS@
 LZO_LIBS = @LZO_LIBS@
@@ -156,7 +157,7 @@ libbareos.a: $(LIBBAREOS_OBJS)
 libbareos.la: Makefile $(LIBBAREOS_LOBJS)
 	@echo "Making $@ ..."
 	$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAREOS_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAREOS_LT_RELEASE) \
-	                $(WRAPLIBS) $(CAP_LIBS) $(ZLIB_LIBS) $(LZO_LIBS) $(FASTLZ_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(LIBS) $(DLLIBS)
+	                $(WRAPLIBS) $(CAM_LIBS) $(CAP_LIBS) $(ZLIB_LIBS) $(LZO_LIBS) $(FASTLZ_LIBS) $(OPENSSL_LIBS) $(GNUTLS_LIBS) $(LIBS) $(DLLIBS)
 
 libbareoscfg.a: $(LIBBAREOSCFG_OBJS)
 	@echo "Making $@ ..."