From: Kern Sibbald Date: Wed, 17 Aug 2005 08:09:23 +0000 (+0000) Subject: - Apply patch from Chris Lee for X-Git-Tag: Release-7.0.0~8512 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=12748d7270458559b94c12bbe173fae495d0ebb4;p=bacula%2Fbacula - Apply patch from Chris Lee for adding --enable-build-dird --enable-build-stored. - Tweak datadir definition in configure.in git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2319 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/Makefile.in b/bacula/Makefile.in index ead9bd8fd3..71d0b70c99 100755 --- a/bacula/Makefile.in +++ b/bacula/Makefile.in @@ -21,7 +21,7 @@ fd_subdirs = src scripts src/lib src/findlib src/filed \ @GNOME_DIR@ @TRAY_MONITOR_DIR@ @WX_DIR@ # Non-client-only directores -subdirs = src/cats src/dird src/stored src/tools +subdirs = src/cats @DIRD_DIR@ @STORED_DIR@ src/tools all_subdirs = ${fd_subdirs} ${@ALL_DIRS@} diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index a0a1aec20c..0f7242eb2b 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -119,8 +119,10 @@ BA_CHECK_OPSYS_DISTNAME # By default, $datadir is ${prefix}/share # -------------------------------------------------- AM_GNU_GETTEXT([external]) -if test x${prefix} = xNONE && test x${datadir} = x${prefix}/share ; then - datadir=/usr/share +if test x${prefix} = xNONE ; then + if test `eval echo ${datadir}` = NONE/share ; then + datadir=/usr/share + fi fi # ------------------------------------------------------------------ @@ -199,6 +201,8 @@ support_static_dir=no support_static_cons=no support_python=no build_client_only=no +build_dird=yes +build_stored=yes cats= db_name=Internal DB_NAME=bdb @@ -397,9 +401,9 @@ AC_SUBST(STATIC_WX_CONS) AC_ARG_ENABLE(client-only, [ --enable-client-only build client (File daemon) only [disabled]], [if test x$enableval = xyes; then - build_client_only=yes - db_name=None - DB_NAME=none + build_client_only=yes + db_name=None + DB_NAME=none fi]) if test x$build_client_only = xno; then ALL_DIRS="subdirs" @@ -408,6 +412,39 @@ else fi AC_SUBST(ALL_DIRS) +# ------------------------------------------- +# director (default on) +# ------------------------------------------- +AC_ARG_ENABLE(build-dird, + [ --enable-build-dird enable building of dird (Director) [enabled]], + [if test x$enableval = xno; then + build_dird=no + fi]) +if test x$build_dird = xyes; then + DIRD_DIR="src/dird" + DIR_TOOLS="DIRTOOLS" +else + DIRD_DIR="" + DIR_TOOLS="NODIRTOOLS" +fi +AC_SUBST(DIRD_DIR) +AC_SUBST(DIR_TOOLS) + +# ------------------------------------------- +# stored (default on) +# ------------------------------------------- +AC_ARG_ENABLE(build-stored, + [ --enable-build-stored enable building of stored (Storage daemon) [enabled]], + [if test x$enableval = xno; then + build_stored=no + fi]) +if test x$build_stored = xyes; then + STORED_DIR="src/stored" +else + STORED_DIR="" +fi +AC_SUBST(STORED_DIR) + # --------------------------------------------------- # Check for conio (Bacula readline substitute)( # --------------------------------------------------- @@ -2060,6 +2097,8 @@ Configuration on `date`: enable-wx-console: ${support_wx_console} ${wx_version} enable-tray-monitor: ${support_tray_monitor} client-only: ${build_client_only} + build-dird: ${build_dird} + build-stored: ${build_stored} ACL support: ${have_acl} Python support: ${support_python} ${PYTHON_LIBS} diff --git a/bacula/configure b/bacula/configure index 18b8b1eea8..79b4336957 100755 --- a/bacula/configure +++ b/bacula/configure @@ -309,7 +309,7 @@ ac_includes_default="\ # include #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TRUEPRG FALSEPRG VERSION DATE LSMDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB MV RM CP SED ECHO CMP TBL AR OPENSSL MTX DF MKISOFS PYTHON GROWISOFS DVDRWMEDIAINFO PKGCONFIG WXCONFIG WXFLAGS CDRECORD PIDOF AWK ARFLAGS MAKE_SHELL LOCAL_LIBS LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE SET_MAKE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOME_DIR WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_DIR TRAY_MONITOR_CPPFLAGS TRAY_MONITOR_LDFLAGS TRAY_MONITOR_DIR TTOOL_LDFLAGS STATIC_FD STATIC_SD STATIC_DIR STATIC_CONS STATIC_GNOME_CONS STATIC_WX_CONS ALL_DIRS CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC PYTHON_LIBS PYTHON_INCDIR OPENSSL_LIBS OPENSSL_INC working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password mon_dir_password mon_fd_password mon_sd_password dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_NAME GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS ALLOCA FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS OBJLIST hostname TAPEDRIVE PSCMD WIN32 MACOSX DISTNAME DISTVER LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS BUILD_DIR TRUEPRG FALSEPRG VERSION DATE LSMDATE CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX CPP EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA RANLIB ac_ct_RANLIB MV RM CP SED ECHO CMP TBL AR OPENSSL MTX DF MKISOFS PYTHON GROWISOFS DVDRWMEDIAINFO PKGCONFIG WXCONFIG WXFLAGS CDRECORD PIDOF AWK ARFLAGS MAKE_SHELL LOCAL_LIBS LOCAL_CFLAGS LOCAL_LDFLAGS LOCAL_DEFS build build_cpu build_vendor build_os host host_cpu host_vendor host_os HAVE_SUN_OS_TRUE HAVE_SUN_OS_FALSE HAVE_OSF1_OS_TRUE HAVE_OSF1_OS_FALSE HAVE_AIX_OS_TRUE HAVE_AIX_OS_FALSE HAVE_HPUX_OS_TRUE HAVE_HPUX_OS_FALSE HAVE_LINUX_OS_TRUE HAVE_LINUX_OS_FALSE HAVE_FREEBSD_OS_TRUE HAVE_FREEBSD_OS_FALSE HAVE_NETBSD_OS_TRUE HAVE_NETBSD_OS_FALSE HAVE_OPENBSD_OS_TRUE HAVE_OPENBSD_OS_FALSE HAVE_BSDI_OS_TRUE HAVE_BSDI_OS_FALSE HAVE_SGI_OS_TRUE HAVE_SGI_OS_FALSE HAVE_IRIX_OS_TRUE HAVE_IRIX_OS_FALSE HAVE_DARWIN_OS_TRUE HAVE_DARWIN_OS_FALSE SET_MAKE MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE INTL_MACOSX_LIBS LIBICONV LTLIBICONV INTLLIBS LIBINTL LTLIBINTL POSUB GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOME_DIR WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_DIR TRAY_MONITOR_CPPFLAGS TRAY_MONITOR_LDFLAGS TRAY_MONITOR_DIR TTOOL_LDFLAGS STATIC_FD STATIC_SD STATIC_DIR STATIC_CONS STATIC_GNOME_CONS STATIC_WX_CONS ALL_DIRS DIRD_DIR DIR_TOOLS STORED_DIR CONS_INC CONS_OBJ CONS_SRC CONS_LIBS CONS_LDFLAGS READLINE_SRC PYTHON_LIBS PYTHON_INCDIR OPENSSL_LIBS OPENSSL_INC working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password mon_dir_password mon_fd_password mon_sd_password dir_user dir_group sd_user sd_group fd_user fd_group SBINPERM SQL_LFLAGS SQL_INCLUDE SQL_BINDIR cats DB_NAME GETCONF ac_ct_GETCONF X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS LIBOBJS ALLOCA FDLIBS DEBUG DINCLUDE DLIB DB_LIBS WCFLAGS WLDFLAGS OBJLIST hostname TAPEDRIVE PSCMD WIN32 MACOSX DISTNAME DISTVER LTLIBOBJS' ac_subst_files='MCOMMON' # Initialize some variables set by options. @@ -876,6 +876,8 @@ Optional Features: --enable-static-dir enable static Director disabled --enable-static-cons enable static Console disabled --enable-client-only build client (File daemon) only disabled + --enable-build-dird enable building of dird (Director) enabled + --enable-build-stored enable building of stored (Storage daemon) enabled --disable-conio disable conio support enabled --disable-readline disable readline support disable @@ -6664,8 +6666,10 @@ _ACEOF -if test x${prefix} = xNONE && test x${datadir} = x${prefix}/share ; then - datadir=/usr/share +if test x${prefix} = xNONE ; then + if test `eval echo ${datadir}` = NONE/share ; then + datadir=/usr/share + fi fi # ------------------------------------------------------------------ @@ -6791,6 +6795,8 @@ support_static_dir=no support_static_cons=no support_python=no build_client_only=no +build_dird=yes +build_stored=yes cats= db_name=Internal DB_NAME=bdb @@ -7013,9 +7019,9 @@ fi if test "${enable_client_only+set}" = set; then enableval="$enable_client_only" if test x$enableval = xyes; then - build_client_only=yes - db_name=None - DB_NAME=none + build_client_only=yes + db_name=None + DB_NAME=none fi fi; if test x$build_client_only = xno; then @@ -7025,6 +7031,43 @@ else fi +# ------------------------------------------- +# director (default on) +# ------------------------------------------- +# Check whether --enable-build-dird or --disable-build-dird was given. +if test "${enable_build_dird+set}" = set; then + enableval="$enable_build_dird" + if test x$enableval = xno; then + build_dird=no + fi +fi; +if test x$build_dird = xyes; then + DIRD_DIR="src/dird" + DIR_TOOLS="DIRTOOLS" +else + DIRD_DIR="" + DIR_TOOLS="NODIRTOOLS" +fi + + + +# ------------------------------------------- +# stored (default on) +# ------------------------------------------- +# Check whether --enable-build-stored or --disable-build-stored was given. +if test "${enable_build_stored+set}" = set; then + enableval="$enable_build_stored" + if test x$enableval = xno; then + build_stored=no + fi +fi; +if test x$build_stored = xyes; then + STORED_DIR="src/stored" +else + STORED_DIR="" +fi + + # --------------------------------------------------- # Check for conio (Bacula readline substitute)( # --------------------------------------------------- @@ -24395,6 +24438,9 @@ s,@STATIC_CONS@,$STATIC_CONS,;t t s,@STATIC_GNOME_CONS@,$STATIC_GNOME_CONS,;t t s,@STATIC_WX_CONS@,$STATIC_WX_CONS,;t t s,@ALL_DIRS@,$ALL_DIRS,;t t +s,@DIRD_DIR@,$DIRD_DIR,;t t +s,@DIR_TOOLS@,$DIR_TOOLS,;t t +s,@STORED_DIR@,$STORED_DIR,;t t s,@CONS_INC@,$CONS_INC,;t t s,@CONS_OBJ@,$CONS_OBJ,;t t s,@CONS_SRC@,$CONS_SRC,;t t @@ -25308,6 +25354,8 @@ Configuration on `date`: enable-wx-console: ${support_wx_console} ${wx_version} enable-tray-monitor: ${support_tray_monitor} client-only: ${build_client_only} + build-dird: ${build_dird} + build-stored: ${build_stored} ACL support: ${have_acl} Python support: ${support_python} ${PYTHON_LIBS} diff --git a/bacula/kes-1.37 b/bacula/kes-1.37 index fb4457aae4..1eee8477fa 100644 --- a/bacula/kes-1.37 +++ b/bacula/kes-1.37 @@ -4,6 +4,10 @@ General: Changes to 1.37.36: +17Aug05 +- Apply patch from Chris Lee for + adding --enable-build-dird --enable-build-stored. +- Tweak datadir definition in configure.in 16Aug05 - Fix bug that missed drive=nn specification. - Eliminate nonblocking kludge in heartbeat of FD as diff --git a/bacula/src/tools/Makefile.in b/bacula/src/tools/Makefile.in index 62bf472586..04bcb24aa1 100644 --- a/bacula/src/tools/Makefile.in +++ b/bacula/src/tools/Makefile.in @@ -35,6 +35,15 @@ EXTRAOBJS = @OBJLIST@ DIRCONFOBJS = ../dird/dird_conf.o ../dird/run_conf.o ../dird/inc_conf.o +NODIRTOOLS = bsmtp +DIRTOOLS = bsmtp dbcheck fstype testfind testls +TOOLS = $(@DIR_TOOLS@) + +INSNODIRTOOLS = bsmtp +INSDIRTOOLS = bsmtp dbcheck +INSTOOLS = $(INS@DIR_TOOLS@) + + .SUFFIXES: .c .o .PHONY: .DONTCARE: @@ -43,7 +52,7 @@ DIRCONFOBJS = ../dird/dird_conf.o ../dird/run_conf.o ../dird/inc_conf.o .c.o: $(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(PYTHON_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $< #------------------------------------------------------------------------- -all: Makefile bsmtp dbcheck fstype testfind testls +all: Makefile $(TOOLS) @echo "==== Make of tools is good ====" @echo " " @@ -84,10 +93,11 @@ devclean: realclean (cd $(srcdir); $(RMF) Makefile) # Allow non-root execution of bsmtp for non-root Directors -install: bsmtp - $(INSTALL_PROGRAM) bsmtp $(DESTDIR)$(sbindir)/bsmtp +install: $(INSTOOLS) + @for tool in ${INSTOOLS} ; do \ + $(INSTALL_PROGRAM) $$tool $(DESTDIR)$(sbindir)/$$tool ; \ + done chmod 755 $(DESTDIR)$(sbindir)/bsmtp - $(INSTALL_PROGRAM) dbcheck $(DESTDIR)$(sbindir)/dbcheck uninstall: (cd $(DESTDIR)$(sbindir); $(RMF) bsmtp)