From: Kern Sibbald Date: Fri, 21 Apr 2006 12:14:00 +0000 (+0000) Subject: Fix OPENSSL include in lib and findlib X-Git-Tag: Release-2.0.0~927 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6cd1689ca85b01d6a06010f7b66d345f350c87c3;p=bacula%2Fbacula Fix OPENSSL include in lib and findlib git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2953 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/src/findlib/Makefile.in b/bacula/src/findlib/Makefile.in index c4b46994d1..aee7123f8d 100644 --- a/bacula/src/findlib/Makefile.in +++ b/bacula/src/findlib/Makefile.in @@ -33,7 +33,7 @@ LIBOBJS = find.o match.o find_one.o attribs.o create_file.o \ # inference rules .c.o: - $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(OPENSSL_INC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< #------------------------------------------------------------------------- all: Makefile libfind.a ../lib/libbac.a @echo "==== Make of findlib is good ====" diff --git a/bacula/src/lib/Makefile.in b/bacula/src/lib/Makefile.in index e781491a63..1256c46f86 100644 --- a/bacula/src/lib/Makefile.in +++ b/bacula/src/lib/Makefile.in @@ -77,7 +77,7 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status pythonlib.o: pythonlib.c - $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(python) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< + $(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(OPENSSL_INC) $(python) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< rwlock_test: rm -f rwlock.o