Skip to content

Commit

Permalink
Add FreeBSD -lcam to build flags.
Browse files Browse the repository at this point in the history
  • Loading branch information
Marco van Wieringen committed Feb 17, 2015
1 parent f572f38 commit 4c73066
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 1 deletion.
3 changes: 3 additions & 0 deletions autoconf/configure.in
Expand Up @@ -3106,6 +3106,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
Expand Down Expand Up @@ -3134,6 +3135,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
Expand Down Expand Up @@ -3163,6 +3165,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
Expand Down
3 changes: 2 additions & 1 deletion src/lib/Makefile.in
Expand Up @@ -20,6 +20,7 @@ thisdir = src/lib
CPPFLAGS += @ZLIB_INC@

DEBUG = @DEBUG@
CAM_LIBS = @CAM_LIBS@
CAP_LIBS = @CAP_LIBS@
ZLIB_LIBS = @ZLIB_LIBS@

Expand Down Expand Up @@ -92,7 +93,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) $(OPENSSL_LIBS) $(LIBS) $(DLLIBS)
$(LIBTOOL_LINK) $(CXX) $(DEFS) $(DEBUG) $(LDFLAGS) -o $@ $(LIBBAREOS_LOBJS) -export-dynamic -rpath $(libdir) -release $(LIBBAREOS_LT_RELEASE) $(WRAPLIBS) $(CAM_LIBS) $(CAP_LIBS) $(ZLIB_LIBS) $(OPENSSL_LIBS) $(LIBS) $(DLLIBS)

libbareoscfg.a: $(LIBBAREOSCFG_OBJS)
@echo "Making $@ ..."
Expand Down

0 comments on commit 4c73066

Please sign in to comment.