X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fconfigure;h=4536fa24b287a4822a020b7c9b2befca61f7e7f9;hb=a6c5b481d3b7f50f92d8c3fe9e770d3fc21b6cfb;hp=d8fd023fca0c170a3eb76525d2d92ec552e28227;hpb=5ba42ee1ede8edf9858ee58f945d7f4ed73bb897;p=bacula%2Fbacula

diff --git a/bacula/configure b/bacula/configure
index d8fd023fca..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)
@@ -17938,7 +17938,6 @@ mandrake)
 	    platforms/mandrake/bacula-dir \
 	    platforms/mandrake/bacula.spec \
 	    "
-	hostname=`hostname -s`
   ;;
 gentoo)
 	DISTVER=`awk '/version / {print $5}' < /etc/gentoo-release`
@@ -17949,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`
@@ -17979,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 \
@@ -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}