git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1422
91ce42f0-d328-0410-95d8-
f526ca767f89
+# --client-only directories
fd_subdirs = src scripts doc src/lib src/findlib src/filed \
fd_subdirs = src scripts doc src/lib src/findlib src/filed \
- @READLINE_SRC@ src/console rescue rescue/linux
+ @READLINE_SRC@ src/console rescue rescue/linux \
+ @GNOME_DIR@ @WX_DIR@
-
-subdirs = src/cats src/dird src/stored @GNOME_DIR@ @WX_DIR@ src/tools
+# Non-client-only directores
+subdirs = src/cats src/dird src/stored src/tools
all_subdirs = ${fd_subdirs} ${@ALL_DIRS@}
all_subdirs = ${fd_subdirs} ${@ALL_DIRS@}
RANLIB = @RANLIB@
INSTALL = @INSTALL@
# add the -s to the following in PRODUCTION mode
RANLIB = @RANLIB@
INSTALL = @INSTALL@
# add the -s to the following in PRODUCTION mode
-INSTALL_PROGRAM = @INSTALL@ -m 754
+INSTALL_PROGRAM = @INSTALL@ -m @SBINPERM@
INSTALL_DATA = @INSTALL@ -m 644
INSTALL_DATA = @INSTALL@ -m 644
-INSTALL_SCRIPT = @INSTALL@ -m 754
+INSTALL_SCRIPT = @INSTALL@ -m @SBINPERM@
INSTALL_CONFIG = @INSTALL@ -m 640
# Flags & libs
INSTALL_CONFIG = @INSTALL@ -m 640
# Flags & libs
AC_SUBST(fd_user)
AC_SUBST(fd_group)
AC_SUBST(fd_user)
AC_SUBST(fd_group)
+#
+# allow setting default executable permissions
+#
+SBINPERM=0754
+AC_ARG_WITH(sbin-perm,
+ [ --with-sbin-perm=MODE specify permissions for sbin binaries (0754)],
+ [
+ if test "x$withval" != "x" ; then
+ SBINPERM=$withval
+ fi
+ ]
+)
+
+AC_SUBST(SBINPERM)
+
# ------------------------------------------------
# Bacula check for various SQL database engines
# ------------------------------------------------
# ------------------------------------------------
# Bacula check for various SQL database engines
# ------------------------------------------------
# include <unistd.h>
#endif"
# include <unistd.h>
#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 AWK ECHO CMP TBL AR OPENSSL MTX PKGCONFIG WXCONFIG 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 INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE MSGFMT GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOMEGNORBA_LIBS GTKXMHTML_LIBS ZVT_LIBS GNOME_CONFIG ORBIT_CONFIG ORBIT_IDL HAVE_ORBIT_TRUE HAVE_ORBIT_FALSE ORBIT_CFLAGS ORBIT_LIBS HAVE_GNORBA_TRUE HAVE_GNORBA_FALSE GNORBA_CFLAGS GNORBA_LIBS GNOME_APPLETS_LIBS GNOME_DOCKLETS_LIBS GNOME_CAPPLET_LIBS GNOME_DIR WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_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 working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password sd_password dir_user dir_group sd_user sd_group fd_user fd_group 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 AWK ECHO CMP TBL AR OPENSSL MTX PKGCONFIG WXCONFIG 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 INSIDE_GNOME_COMMON_TRUE INSIDE_GNOME_COMMON_FALSE MSGFMT GNOME_INCLUDEDIR GNOMEUI_LIBS GNOME_LIBDIR GNOME_LIBS GNOMEGNORBA_LIBS GTKXMHTML_LIBS ZVT_LIBS GNOME_CONFIG ORBIT_CONFIG ORBIT_IDL HAVE_ORBIT_TRUE HAVE_ORBIT_FALSE ORBIT_CFLAGS ORBIT_LIBS HAVE_GNORBA_TRUE HAVE_GNORBA_FALSE GNORBA_CFLAGS GNORBA_LIBS GNOME_APPLETS_LIBS GNOME_DOCKLETS_LIBS GNOME_CAPPLET_LIBS GNOME_DIR WXCONS_CPPFLAGS WXCONS_LDFLAGS WX_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 working_dir scriptdir dump_email job_email smtp_host piddir subsysdir baseport dir_port fd_port sd_port dir_password fd_password 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.
ac_subst_files='MCOMMON'
# Initialize some variables set by options.
--with-sd-group=GROUP specify group for Storage daemon
--with-fd-user=USER specify user for File daemon
--with-fd-group=GROUP specify group for File daemon
--with-sd-group=GROUP specify group for Storage daemon
--with-fd-user=USER specify user for File daemon
--with-fd-group=GROUP specify group for File daemon
+ --with-sbin-perm=MODE specify permissions for sbin binaries (0754)
--with-postgresql=DIR Include PostgreSQL support. DIR is the PostgreSQL
base install directory, defaults to /usr/local/pgsql
--with-postgresql=DIR Include PostgreSQL support. DIR is the PostgreSQL
base install directory, defaults to /usr/local/pgsql
+#
+# allow setting default executable permissions
+#
+SBINPERM=0754
+
+# Check whether --with-sbin-perm or --without-sbin-perm was given.
+if test "${with_sbin_perm+set}" = set; then
+ withval="$with_sbin_perm"
+
+ if test "x$withval" != "x" ; then
+ SBINPERM=$withval
+ fi
+
+
+fi;
+
+
+
# ------------------------------------------------
# Bacula check for various SQL database engines
# ------------------------------------------------
# ------------------------------------------------
# Bacula check for various SQL database engines
# ------------------------------------------------
s,@sd_group@,$sd_group,;t t
s,@fd_user@,$fd_user,;t t
s,@fd_group@,$fd_group,;t t
s,@sd_group@,$sd_group,;t t
s,@fd_user@,$fd_user,;t t
s,@fd_group@,$fd_group,;t t
+s,@SBINPERM@,$SBINPERM,;t t
s,@SQL_LFLAGS@,$SQL_LFLAGS,;t t
s,@SQL_INCLUDE@,$SQL_INCLUDE,;t t
s,@SQL_BINDIR@,$SQL_BINDIR,;t t
s,@SQL_LFLAGS@,$SQL_LFLAGS,;t t
s,@SQL_INCLUDE@,$SQL_INCLUDE,;t t
s,@SQL_BINDIR@,$SQL_BINDIR,;t t
<child>
<widget class="GtkLabel" id="about_head">
<property name="visible">True</property>
<child>
<widget class="GtkLabel" id="about_head">
<property name="visible">True</property>
- <property name="label" translatable="yes">Bacula Console 1.34.0 (16 Mar 04)
+ <property name="label" translatable="yes">Bacula Console
</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
</property>
<property name="use_underline">False</property>
<property name="use_markup">False</property>
sed "s%parent = g_object_get_data%parent = \(GtkWidget \*\)g_object_get_data%" support.c.orig >support.c
$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
sed "s%parent = g_object_get_data%parent = \(GtkWidget \*\)g_object_get_data%" support.c.orig >support.c
$(CXX) $(DEFS) $(DEBUG) -c $(CPPFLAGS) $(CONS_INC) -I$(srcdir) -I$(basedir) $(DINCLUDE) $(CFLAGS) $<
-gnome-console: $(CONSOBJS) ../lib/libbac.a ../cats/libsql.a
- $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
- $(LIBS) $(DLIB) $(CONS_LIBS) -lbac -lsql -lm
+gnome-console: $(CONSOBJS) ../lib/libbac.a
+ $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -o $@ $(CONSOBJS) \
+ $(LIBS) $(DLIB) $(CONS_LIBS) -lbac -lm
static-console: static-gnome-console
static-console: static-gnome-console
-static-gnome-console: $(CONSOBJS) ../lib/libbac.a ../cats/libsql.a
- $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -L../cats -o $@ $(CONSOBJS) \
- $(LIBS) $(DLIB) $(CONS_LIBS) -lbac -lsql -lm
+static-gnome-console: $(CONSOBJS) ../lib/libbac.a
+ $(CXX) $(LDFLAGS) $(CONS_LDFLAGS) -L../lib -o $@ $(CONSOBJS) \
+ $(LIBS) $(DLIB) $(CONS_LIBS) -lbac -lm
strip $@
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
strip $@
Makefile: $(srcdir)/Makefile.in $(topdir)/config.status
clean:
@$(RMF) gnome-console core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
clean:
@$(RMF) gnome-console core core.* a.out *.o *.bak *~ *.intpro *.extpro 1 2 3
- @$(RMF) static-gnome-console gmon.out
+ @$(RMF) static-gnome-console gmon.out Makefile.am
realclean: clean
@$(RMF) tags
realclean: clean
@$(RMF) tags
gtk_widget_show (vbox9);
gtk_box_pack_start (GTK_BOX (vbox8), vbox9, TRUE, TRUE, 0);
gtk_widget_show (vbox9);
gtk_box_pack_start (GTK_BOX (vbox8), vbox9, TRUE, TRUE, 0);
- about_head = gtk_label_new (_("Bacula Console 1.34.0 (16 Mar 04)\n"));
+ about_head = gtk_label_new (_("Bacula Console\n"));
gtk_widget_show (about_head);
gtk_box_pack_start (GTK_BOX (vbox9), about_head, FALSE, FALSE, 0);
gtk_widget_show (about_head);
gtk_box_pack_start (GTK_BOX (vbox9), about_head, FALSE, FALSE, 0);