Fix editing of PostgreSQL port

[bacula/bacula] / bacula / configure

diff --git a/bacula/configure b/bacula/configure
index d8fd023fca0c170a3eb76525d2d92ec552e28227..d1513edbf22cf191719c0f1514e9feeeca3b348d 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -897,17 +897,14 @@ Optional Packages:
   --with-postgresql=DIR      Include PostgreSQL support.  DIR is the PostgreSQL
                           base install directory, defaults to /usr/local/pgsql
 
-Which DBMS do you want to use (please select only one):
   --with-mysql=DIR      Include MySQL support.  DIR is the MySQL base
                           install directory, default is to search through
                           a number of common places for the MySQL files.
 
-Which DBMS do you want to use (please select only one):
   --with-embedded-mysql=DIR Include MySQL support.  DIR is the MySQL base
                           install directory, default is to search through
                           a number of common places for the MySQL files.
 
-Which DBMS do you want to use (please select only one):
   --with-sqlite=DIR     Include SQLite support.  DIR is the SQLite base
                           install directory, default is to search through
                           a number of common places for the SQLite files.
@@ -6685,7 +6682,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 +7039,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 +17793,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 +17827,6 @@ bsdi)
            platforms/bsdi/bacula-fd \
            platforms/bsdi/bacula-sd \
            platforms/bsdi/bacula-dir"
-       hostname=`hostname -s`
        largefile_support="yes"
   ;;
 cygwin)
@@ -17840,7 +17840,6 @@ darwin)
        DISTVER=`uname -r`
        TAPEDRIVE="/dev/nst0"
        PSCMD="ps -e -o pid,command"
-       hostname=`hostname -s`
        PFILES="${PFILES} \
           platforms/darwin/Makefile"
   ;;
@@ -17848,7 +17847,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,10 +17864,11 @@ freebsd)
            platforms/freebsd/bacula-fd \
            platforms/freebsd/bacula-sd \
            platforms/freebsd/bacula-dir"
-       hostname=`hostname -s`
        largefile_support="yes"
   ;;
 hpux)
+       PSCMD="UNIX95=1 ps -e -o pid,comm"
+       CFLAGS="$(CFLAGS) -D_XOPEN_SOURCE_EXTENDED=1"
        DISTVER=`uname -r`
        TAPEDRIVE="/dev/rmt/0hnb"
   ;;
@@ -17938,7 +17937,6 @@ mandrake)
            platforms/mandrake/bacula-dir \
            platforms/mandrake/bacula.spec \
            "
-       hostname=`hostname -s`
   ;;
 gentoo)
        DISTVER=`awk '/version / {print $5}' < /etc/gentoo-release`
@@ -17949,14 +17947,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`
@@ -17979,19 +17975,19 @@ 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 \
+           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 \
@@ -19416,7 +19412,7 @@ fi
 
 cd scripts
 chmod 755 startmysql stopmysql bacula startit stopit btraceback mtx-changer
-chmod 755 bconsole gconsole mtx-changer devel_bacula
+chmod 755 bconsole gconsole mtx-changer devel_bacula logrotate
 cd ..
 
 c=src/cats
@@ -19504,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}