From 89ccc0d2bbe63ed6ac3565cdef1459ef919368da Mon Sep 17 00:00:00 2001 From: Kern Sibbald Date: Sun, 19 Jun 2005 08:31:54 +0000 Subject: [PATCH] Update configure for bimagemgr git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@2142 91ce42f0-d328-0410-95d8-f526ca767f89 --- gui/Makefile | 10 ++-- gui/autoconf/configure.in | 73 +++++++++++++++++++++++++- gui/configure | 105 +++++++++++++++++++++++++++++++++++++- 3 files changed, 182 insertions(+), 6 deletions(-) diff --git a/gui/Makefile b/gui/Makefile index cd1c5ef9cb..ef81315d92 100644 --- a/gui/Makefile +++ b/gui/Makefile @@ -4,11 +4,11 @@ # Version $Id$ # -# autoconf/Make.common.in -*- Makefile -*- +# autoconf/Make.common.in -*- Makefile -*- # release date (man), LSM date, version number/name, current maintainer -DATE="19 May 2005" +DATE="@DATE@" LSMDATE=@LSMDATE@ -VERSION=1.7.0 +VERSION=@VERSION@ VERNAME=bacula-$(VERSION)# MAINT=Kern Sibbald# MAINTEMAIL=# @@ -81,6 +81,10 @@ configure: autoconf/configure.in autoconf/aclocal.m4 autoconf/acconfig.h autocon autoconf/configure.in > configure chmod 755 configure +Makefile: Makefile.in + cd $(topdir) \ + && CONFIG_FILES=$(thisdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status + Makefiles: $(SHELL) config.status diff --git a/gui/autoconf/configure.in b/gui/autoconf/configure.in index 1fb827068a..0bc4b18513 100644 --- a/gui/autoconf/configure.in +++ b/gui/autoconf/configure.in @@ -86,8 +86,78 @@ AC_ARG_WITH(bacula, ] ) -AC_SUBST(bacula) +# ------------------------------------------------------------------------- +# Set variables for bimagemgr installation +# ------------------------------------------------------------------------- +bimagemgr_cgidir=/var/www/cgi-bin +AC_ARG_WITH(bimagemgr-cgidir, + [ --with-bimagemgr-cgidir=DIR specify bimagemgr cgi-bin dir], + [ + if test "x$withval" != "xno" ; then + bimagemgr_cgidir=$withval + fi + ] +) +bimagemgr_docdir=/var/www/html +AC_ARG_WITH(bimagemgr-docdir, + [ --with-bimagemgr-docdir=DIR specify bimagemgr doc root dir], + [ + if test "x$withval" != "xno" ; then + bimagemgr_docdir=$withval + fi + ] +) + +bimagemgr_binowner=root +AC_ARG_WITH(bimagemgr-binowner, + [ --with-bimagemgr-binowner=USER specify bimagemgr binary file owner], + [ + if test "x$withval" != "xno" ; then + bimagemgr_binowner=$withval + fi + ] +) + +bimagemgr_bingroup=root +AC_ARG_WITH(bimagemgr-bingroup, + [ --with-bimagemgr-bingroup=USER specify bimagemgr binary file group], + [ + if test "x$withval" != "xno" ; then + bimagemgr_bingroup=$withval + fi + ] +) + +bimagemgr_dataowner=apache +AC_ARG_WITH(bimagemgr-dataowner, + [ --with-bimagemgr-dataowner=USER specify bimagemgr data file owner], + [ + if test "x$withval" != "xno" ; then + bimagemgr_dataowner=$withval + fi + ] +) + +bimagemgr_datagroup=apache +AC_ARG_WITH(bimagemgr-datagroup, + [ --with-bimagemgr-datagroup=USER specify bimagemgr data file group], + [ + if test "x$withval" != "xno" ; then + bimagemgr_datagroup=$withval + fi + ] +) + +AC_SUBST(bimagemgr_cgidir) +AC_SUBST(bimagemgr_docdir) +AC_SUBST(bimagemgr_binowner) +AC_SUBST(bimagemgr_bingroup) +AC_SUBST(bimagemgr_dataowner) +AC_SUBST(bimagemgr_datagroup) + + +AC_SUBST(bacula) # # Finally we set appropriate distribution specific @@ -192,6 +262,7 @@ AC_OUTPUT([ \ autoconf/Make.common \ Makefile \ bimagemgr/Makefile \ + bimagemgr/bacula-bimagemgr.spec \ $PFILES ], [ ] ) diff --git a/gui/configure b/gui/configure index 61fef7971e..2537a9d58f 100755 --- a/gui/configure +++ b/gui/configure @@ -272,7 +272,7 @@ PACKAGE_STRING= PACKAGE_BUGREPORT= ac_unique_file="autoconf/configure.in" -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 AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MV RM CP ECHO AR 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 bacula hostname DISTNAME DISTVER LIBOBJS 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 AWK INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA MV RM CP ECHO AR 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 bimagemgr_cgidir bimagemgr_docdir bimagemgr_binowner bimagemgr_bingroup bimagemgr_dataowner bimagemgr_datagroup bacula hostname DISTNAME DISTVER LIBOBJS LTLIBOBJS' ac_subst_files='MCOMMON' # Initialize some variables set by options. @@ -788,6 +788,12 @@ Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] --without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no) --with-bacula=PATH specify path to Bacula source + --with-bimagemgr-cgidir=DIR specify bimagemgr cgi-bin dir + --with-bimagemgr-docdir=DIR specify bimagemgr doc root dir + --with-bimagemgr-binowner=USER specify bimagemgr binary file owner + --with-bimagemgr-bingroup=USER specify bimagemgr binary file group + --with-bimagemgr-dataowner=USER specify bimagemgr data file owner + --with-bimagemgr-datagroup=USER specify bimagemgr data file group _ACEOF fi @@ -2222,6 +2228,94 @@ if test "${with_bacula+set}" = set; then fi; +# ------------------------------------------------------------------------- +# Set variables for bimagemgr installation +# ------------------------------------------------------------------------- +bimagemgr_cgidir=/var/www/cgi-bin + +# Check whether --with-bimagemgr-cgidir or --without-bimagemgr-cgidir was given. +if test "${with_bimagemgr_cgidir+set}" = set; then + withval="$with_bimagemgr_cgidir" + + if test "x$withval" != "xno" ; then + bimagemgr_cgidir=$withval + fi + + +fi; + +bimagemgr_docdir=/var/www/html + +# Check whether --with-bimagemgr-docdir or --without-bimagemgr-docdir was given. +if test "${with_bimagemgr_docdir+set}" = set; then + withval="$with_bimagemgr_docdir" + + if test "x$withval" != "xno" ; then + bimagemgr_docdir=$withval + fi + + +fi; + +bimagemgr_binowner=root + +# Check whether --with-bimagemgr-binowner or --without-bimagemgr-binowner was given. +if test "${with_bimagemgr_binowner+set}" = set; then + withval="$with_bimagemgr_binowner" + + if test "x$withval" != "xno" ; then + bimagemgr_binowner=$withval + fi + + +fi; + +bimagemgr_bingroup=root + +# Check whether --with-bimagemgr-bingroup or --without-bimagemgr-bingroup was given. +if test "${with_bimagemgr_bingroup+set}" = set; then + withval="$with_bimagemgr_bingroup" + + if test "x$withval" != "xno" ; then + bimagemgr_bingroup=$withval + fi + + +fi; + +bimagemgr_dataowner=apache + +# Check whether --with-bimagemgr-dataowner or --without-bimagemgr-dataowner was given. +if test "${with_bimagemgr_dataowner+set}" = set; then + withval="$with_bimagemgr_dataowner" + + if test "x$withval" != "xno" ; then + bimagemgr_dataowner=$withval + fi + + +fi; + +bimagemgr_datagroup=apache + +# Check whether --with-bimagemgr-datagroup or --without-bimagemgr-datagroup was given. +if test "${with_bimagemgr_datagroup+set}" = set; then + withval="$with_bimagemgr_datagroup" + + if test "x$withval" != "xno" ; then + bimagemgr_datagroup=$withval + fi + + +fi; + + + + + + + + @@ -2323,7 +2417,7 @@ MCOMMON=./autoconf/Make.common - ac_config_files="$ac_config_files autoconf/Make.common Makefile bimagemgr/Makefile $PFILES" + ac_config_files="$ac_config_files autoconf/Make.common Makefile bimagemgr/Makefile bimagemgr/bacula-bimagemgr.spec $PFILES" ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -2882,6 +2976,7 @@ do "autoconf/Make.common" ) CONFIG_FILES="$CONFIG_FILES autoconf/Make.common" ;; "Makefile" ) CONFIG_FILES="$CONFIG_FILES Makefile" ;; "bimagemgr/Makefile" ) CONFIG_FILES="$CONFIG_FILES bimagemgr/Makefile" ;; + "bimagemgr/bacula-bimagemgr.spec" ) CONFIG_FILES="$CONFIG_FILES bimagemgr/bacula-bimagemgr.spec" ;; "$PFILES" ) CONFIG_FILES="$CONFIG_FILES $PFILES" ;; "default" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 @@ -3012,6 +3107,12 @@ s,@HAVE_IRIX_OS_TRUE@,$HAVE_IRIX_OS_TRUE,;t t s,@HAVE_IRIX_OS_FALSE@,$HAVE_IRIX_OS_FALSE,;t t s,@HAVE_DARWIN_OS_TRUE@,$HAVE_DARWIN_OS_TRUE,;t t s,@HAVE_DARWIN_OS_FALSE@,$HAVE_DARWIN_OS_FALSE,;t t +s,@bimagemgr_cgidir@,$bimagemgr_cgidir,;t t +s,@bimagemgr_docdir@,$bimagemgr_docdir,;t t +s,@bimagemgr_binowner@,$bimagemgr_binowner,;t t +s,@bimagemgr_bingroup@,$bimagemgr_bingroup,;t t +s,@bimagemgr_dataowner@,$bimagemgr_dataowner,;t t +s,@bimagemgr_datagroup@,$bimagemgr_datagroup,;t t s,@bacula@,$bacula,;t t s,@hostname@,$hostname,;t t s,@DISTNAME@,$DISTNAME,;t t -- 2.39.5