X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fconfigure;h=4536fa24b287a4822a020b7c9b2befca61f7e7f9;hb=a6c5b481d3b7f50f92d8c3fe9e770d3fc21b6cfb;hp=a7086065c4d21b0372940dd02627c46e39623cd6;hpb=72c4bef42c7de185b4114bdccf13f2da956d005c;p=bacula%2Fbacula diff --git a/bacula/configure b/bacula/configure index a7086065c4..4536fa24b2 100755 --- a/bacula/configure +++ b/bacula/configure @@ -6685,7 +6685,7 @@ fi; # ------------------------------------------ # Where to place working dir # ------------------------------------------ -working_dir=`eval echo ${sysconfdir}/working` +working_dir=`eval echo ${prefix}/var/bacula/working` # Check whether --with-working-dir or --without-working-dir was given. if test "${with_working_dir+set}" = set; then @@ -7042,6 +7042,10 @@ echo "$as_me: error: \"You can configure for only one database.\"" >&2;} POSTGRESQL_INCDIR=/usr/include POSTGRESQL_LIBDIR=/usr/lib POSTGRESQL_BINDIR=/usr/bin + elif test -f /usr/include/pgsql/libpq-fe.h; then + POSTGRESQL_INCDIR=/usr/include/pgsql + POSTGRESQL_LIBDIR=/usr/lib/pgsql + POSTGRESQL_BINDIR=/usr/bin else echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6 @@ -17792,7 +17796,7 @@ WLDFLAGS= PFILES="platforms/Makefile" PSCMD="ps -e" WIN32= -hostname=`uname -n` +hostname=`uname -n | cut -d '.' -f 1` case "$DISTNAME" in aix) DISTVER=`uname -r` @@ -17826,7 +17830,6 @@ bsdi) platforms/bsdi/bacula-fd \ platforms/bsdi/bacula-sd \ platforms/bsdi/bacula-dir" - hostname=`hostname -s` largefile_support="yes" ;; cygwin) @@ -17840,7 +17843,6 @@ darwin) DISTVER=`uname -r` TAPEDRIVE="/dev/nst0" PSCMD="ps -e -o pid,command" - hostname=`hostname -s` PFILES="${PFILES} \ platforms/darwin/Makefile" ;; @@ -17848,7 +17850,6 @@ debian) DISTVER=`cat /etc/debian_version` TAPEDRIVE="/dev/nrst0" PSCMD="ps -e -o pid,command" - hostname=`hostname -s` ;; freebsd) DISTVER=`uname -a |awk '{print $3}'` @@ -17866,7 +17867,6 @@ freebsd) platforms/freebsd/bacula-fd \ platforms/freebsd/bacula-sd \ platforms/freebsd/bacula-dir" - hostname=`hostname -s` largefile_support="yes" ;; hpux) @@ -17907,8 +17907,14 @@ openbsd) platforms/openbsd/bacula-dir" ;; redhat) - DISTVER=`cat /etc/redhat-release | grep release |\ - cut -f 5 -d ' '` + if test `cat /etc/redhat-release | grep release |\ + cut -f 3 -d ' '`x = "Enterprise"x ; then + DISTVER="Enterprise "`cat /etc/redhat-release | grep release |\ + cut -f 6 -d ' '` + else + DISTVER=`cat /etc/redhat-release | grep release |\ + cut -f 5 -d ' '` + fi TAPEDRIVE="/dev/nst0" PSCMD="ps -e -o pid,command" PFILES="${PFILES} \ @@ -17932,7 +17938,6 @@ mandrake) platforms/mandrake/bacula-dir \ platforms/mandrake/bacula.spec \ " - hostname=`hostname -s` ;; gentoo) DISTVER=`awk '/version / {print $5}' < /etc/gentoo-release` @@ -17943,14 +17948,12 @@ gentoo) platforms/gentoo/bacula-fd \ platforms/gentoo/bacula-sd \ platforms/gentoo/bacula-dir" - hostname=`hostname -s` ;; slackware) DISTVER=`cat /etc/slackware-version` TAPEDRIVE="/dev/nst0" PSCMD="ps -e -o pid,command" - hostname=`hostname -s` ;; solaris) DISTVER=`uname -r` @@ -17973,19 +17976,18 @@ suse) cut -f 3 -d ' '` TAPEDRIVE="/dev/nst0" PSCMD="ps -e -o pid,command" - hostname=`hostname -s` PFILES="${PFILES} \ platforms/suse/Makefile \ platforms/suse/bacula-fd \ platforms/suse/bacula-sd \ - platforms/suse/bacula-dir" + platforms/suse/bacula-dir \ + platforms/suse/bacula.spec" ;; suse5) DISTNAME=suse DISTVER=5.x TAPEDRIVE="/dev/nst0" PSCMD="ps -e -o pid,command" - hostname=`hostname -s` PFILES="${PFILES} \ platforms/suse/Makefile \ platforms/suse/bacula-fd \ @@ -18035,7 +18037,7 @@ if test "x${subsysdir}" = "x${sbindir}" ; then exit 1 fi - ac_config_files="$ac_config_files autoconf/Make.common Makefile rescue/Makefile rescue/linux/Makefile rescue/freebsd/Makefile rescue/solaris/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/fd scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/mtx-changer doc/Makefile src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome-console/Makefile src/gnome-console/gnome-console.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/tconsole/Makefile src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/filed/win32/Makefile src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile $PFILES" + ac_config_files="$ac_config_files autoconf/Make.common Makefile rescue/Makefile rescue/linux/Makefile rescue/freebsd/Makefile rescue/solaris/Makefile scripts/startmysql scripts/stopmysql scripts/btraceback scripts/startit scripts/stopit scripts/bconsole scripts/gconsole scripts/bacula scripts/devel_bacula scripts/fd scripts/Makefile scripts/logrotate scripts/bacula.desktop.gnome1 scripts/bacula.desktop.gnome2 scripts/mtx-changer doc/Makefile src/Makefile src/host.h src/console/Makefile src/console/bconsole.conf src/gnome-console/Makefile src/gnome-console/gnome-console.conf src/gnome2-console/Makefile src/gnome2-console/gnome-console.conf src/tconsole/Makefile src/dird/Makefile src/dird/bacula-dir.conf src/lib/Makefile src/stored/Makefile src/stored/bacula-sd.conf src/filed/Makefile src/filed/bacula-fd.conf src/filed/win32/Makefile src/cats/Makefile src/cats/make_catalog_backup src/cats/delete_catalog_backup src/cats/create_postgresql_database src/cats/update_postgresql_tables src/cats/make_postgresql_tables src/cats/grant_postgresql_privileges src/cats/drop_postgresql_tables src/cats/drop_postgresql_database src/cats/create_mysql_database src/cats/update_mysql_tables src/cats/make_mysql_tables src/cats/grant_mysql_privileges src/cats/drop_mysql_tables src/cats/drop_mysql_database src/cats/create_sqlite_database src/cats/update_sqlite_tables src/cats/make_sqlite_tables src/cats/grant_sqlite_privileges src/cats/drop_sqlite_tables src/cats/drop_sqlite_database src/cats/sqlite src/cats/mysql src/cats/create_bdb_database src/cats/update_bdb_tables src/cats/make_bdb_tables src/cats/grant_bdb_privileges src/cats/drop_bdb_tables src/cats/drop_bdb_database src/cats/create_bacula_database src/cats/update_bacula_tables src/cats/grant_bacula_privileges src/cats/make_bacula_tables src/cats/drop_bacula_tables src/cats/drop_bacula_database src/findlib/Makefile src/tools/Makefile $PFILES" ac_config_commands="$ac_config_commands default" cat >confcache <<\_ACEOF # This file is a shell script that caches the results of configure @@ -18578,6 +18580,7 @@ do "scripts/bconsole" ) CONFIG_FILES="$CONFIG_FILES scripts/bconsole" ;; "scripts/gconsole" ) CONFIG_FILES="$CONFIG_FILES scripts/gconsole" ;; "scripts/bacula" ) CONFIG_FILES="$CONFIG_FILES scripts/bacula" ;; + "scripts/devel_bacula" ) CONFIG_FILES="$CONFIG_FILES scripts/devel_bacula" ;; "scripts/fd" ) CONFIG_FILES="$CONFIG_FILES scripts/fd" ;; "scripts/Makefile" ) CONFIG_FILES="$CONFIG_FILES scripts/Makefile" ;; "scripts/logrotate" ) CONFIG_FILES="$CONFIG_FILES scripts/logrotate" ;; @@ -19409,7 +19412,7 @@ fi cd scripts chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer -chmod 755 bconsole gconsole mtx-changer +chmod 755 bconsole gconsole mtx-changer devel_bacula cd .. c=src/cats @@ -19497,10 +19500,10 @@ Configuration on `date`: Director User: ${dir_user} Director Group: ${dir_group} - Storage Daemon User: ${dir_user} - Storage DaemonGroup: ${dir_group} - File Daemon User: ${dir_user} - File Daemon Group: ${dir_group} + Storage Daemon User: ${sd_user} + Storage DaemonGroup: ${sd_group} + File Daemon User: ${fd_user} + File Daemon Group: ${fd_group} SQL binaries Directory ${SQL_BINDIR}