Add rudimentary support for saving AFS acls.

[bacula/bacula] / bacula / src / filed / Makefile.in

diff --git a/bacula/src/filed/Makefile.in b/bacula/src/filed/Makefile.in
index 00340456354fe8f3e18ce940f01f9d6d2796a2dc..d2f452888b29fbf9cbdbbebccfa90d60b036cd02 100644 (file)
--- a/bacula/src/filed/Makefile.in
+++ b/bacula/src/filed/Makefile.in
@@ -1,7 +1,6 @@
 #
 # Bacula Makefile for the File daemon
 #
-#  Version $Id$
 #
 
 @MCOMMON@
@@ -10,6 +9,8 @@ srcdir =       .
 VPATH =        .
 .PATH:         .
 
+fd_group=@fd_group@
+
 # one up
 basedir = ..
 # top dir
@@ -23,6 +24,8 @@ GETTEXT_LIBS = @LIBINTL@
 
 PYTHON_LIBS = @PYTHON_LIBS@
 PYTHON_INC = @PYTHON_INCDIR@
+AFS_CFLAGS = @AFS_CFLAGS@
+AFS_LIBS = @AFS_LIBS@
 
 first_rule: all
 dummy:
@@ -31,13 +34,16 @@ dummy:
 SVRSRCS = filed.c authenticate.c acl.c backup.c estimate.c \
          fd_plugins.c accurate.c \
          filed_conf.c heartbeat.c job.c pythonfd.c \
-         restore.c status.c verify.c verify_vol.c
+         restore.c status.c verify.c verify_vol.c xattr.c
 SVROBJS = $(SVRSRCS:.c=.o)
 
 # these are the objects that are changed by the .configure process
 EXTRAOBJS = @OBJLIST@
 
+CAP_LIBS = @CAP_LIBS@
 FDLIBS = @FDLIBS@                # extra libs for File daemon
+ZLIBS = @ZLIBS@
+LZOLIBS = @LZOLIBS@
 
 # extra items for linking on Win32
 WIN32OBJS = win32/winmain.o win32/winlib.a win32/winres.res
@@ -58,33 +64,45 @@ all: Makefile @WIN32@ bacula-fd @STATIC_FD@
        @echo "==== Make of filed is good ===="
        @echo " "
 
+acl.o: acl.c
+       @echo "Compiling $<"
+       $(NO_ECHO)$(CXX) $(DEFS) $(DEBUG) -c $(WCFLAGS) $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $(AFS_CFLAGS) $<
+
 win32/winlib.a:
-       (cd win32; $(MAKE) DESTDIR=$(DESTDIR))
+       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
+          (cd win32; $(GMAKE) DESTDIR=$(DESTDIR)); \
+       fi
        @rm -f bacula-fd.exe
 
 win32/winmain.o:
-       (cd win32; $(MAKE) DESTDIR=$(DESTDIR))
+       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
+          (cd win32; $(GMAKE) DESTDIR=$(DESTDIR)); \
+       fi
        @rm -f bacula-fd.exe
 
 win32/winres.res:
-       (cd win32; $(MAKE) DESTDIR=$(DESTDIR))
+       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
+          (cd win32; $(GMAKE) DESTDIR=$(DESTDIR)); \
+       fi
        @rm -f bacula-fd.exe
 
 # win32 libraries if needed
 win32: $(WIN32OBJS)
-       (cd win32; $(MAKE) DESTDIR=$(DESTDIR))
+       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
+          (cd win32; $(GMAKE) DESTDIR=$(DESTDIR)); \
+       fi
        @rm -f bacula-fd.exe
 
 bacula-fd:  Makefile $(SVROBJS) ../findlib/libbacfind$(DEFAULT_ARCHIVE_TYPE) ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
        @echo "Linking $@ ..."
        $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -L../lib -L../findlib -o $@ $(SVROBJS) \
-         $(WIN32LIBS) $(FDLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
-         $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+         $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
+         $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
 
 static-bacula-fd: Makefile $(SVROBJS) ../findlib/libbacfind.a ../lib/libbacpy$(DEFAULT_ARCHIVE_TYPE) ../lib/libbaccfg$(DEFAULT_ARCHIVE_TYPE) ../lib/libbac$(DEFAULT_ARCHIVE_TYPE) @WIN32@
        $(LIBTOOL_LINK) $(CXX) $(WLDFLAGS) $(LDFLAGS) -static -L../lib -L../findlib -o $@ $(SVROBJS) \
-          $(WIN32LIBS) $(FDLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
-          $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS)
+          $(WIN32LIBS) $(FDLIBS) $(ZLIBS) -lbacfind -lbacpy -lbaccfg -lbac -lm $(PYTHON_LIBS) $(LIBS) \
+          $(DLIB) $(WRAPLIBS) $(GETTEXT_LIBS) $(OPENSSL_LIBS) $(CAP_LIBS) $(AFS_LIBS) $(LZOLIBS)
        strip $@
 
 Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
@@ -92,13 +110,13 @@ Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
          && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status
 
 libtool-clean:
-       $(RMF) -r .libs _libs
+       @$(RMF) -r .libs _libs
 
-clean: @LIBTOOL_CLEAN_TARGET@
+clean: libtool-clean
        @$(RMF) bacula-fd filed core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
        @$(RMF) static-bacula-fd
-       if test -f win32/Makefile; then \
-          (cd win32; $(MAKE) clean); \
+       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
+          (cd win32; $(GMAKE) clean); \
        fi
 
 realclean: clean
@@ -107,15 +125,15 @@ realclean: clean
 distclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
        (cd $(srcdir); $(RMF) Makefile)
-       if test -f win32/Makefile; then \
-          (cd win32; $(MAKE) distclean); \
+       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
+          (cd win32; $(GMAKE) distclean); \
        fi
 
 devclean: realclean
        if test $(srcdir) = .; then $(MAKE) realclean; fi
        (cd $(srcdir); $(RMF) Makefile)
-       if test -f win32/Makefile; then \
-          (cd win32; $(MAKE) devclean); \
+       @if test -f win32/Makefile -a "${GMAKE}" != "none"; then \
+          (cd win32; $(GMAKE) devclean); \
        fi
 
 install: all
@@ -129,8 +147,11 @@ install: all
        fi; \
        echo "${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf"; \
        ${INSTALL_CONFIG} $$srcconf ${DESTDIR}${sysconfdir}/$$destconf
+       @if test "x${fd_group}" != "x"; then \
+          chgrp -f ${fd_group} ${DESTDIR}${sysconfdir}/$$destconf ; \
+       fi
        @if test -f static-bacula-fd; then \
-          $(LIBTOOL_INSTALL) install $(INSTALL_PROGRAM) static-bacula-fd $(DESTDIR)$(sbindir)/static-bacula-fd; \
+          $(LIBTOOL_INSTALL) $(INSTALL_PROGRAM) static-bacula-fd $(DESTDIR)$(sbindir)/static-bacula-fd; \
        fi
 
 
@@ -151,7 +172,7 @@ depend:
        @$(MV) Makefile Makefile.bak
        @$(SED) "/^# DO NOT DELETE:/,$$ d" Makefile.bak > Makefile
        @$(ECHO) "# DO NOT DELETE: nice dependency list follows" >> Makefile
-       @$(CXX) -S -M $(CPPFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(SQL_INC) *.c >> Makefile
+       @$(CXX) -S -M $(CPPFLAGS) $(AFS_CFLAGS) $(XINC) $(PYTHON_INC) -I$(srcdir) -I$(basedir) *.c >> Makefile
        @if test -f Makefile ; then \
            $(RMF) Makefile.bak; \
        else \