add --with-hostname to ./configure

git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@8968 91ce42f0-d328-0410-95d8-f526ca767f89

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index b7dbe2a58d932181c1eab1895795352ced3bcc9f..e8c1e2b95295099e17dcb0dbedea48bce6e9fb2f 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -1210,6 +1210,24 @@ AC_ARG_WITH(basename,
 
 AC_SUBST(basename)
 
+dnl ------------------------------------------------------------------
+dnl Allow the user to override the hostname (default = machine hostname)
+dnl ------------------------------------------------------------------
+hostname=`uname -n | cut -d '.' -f 1`
+if test x${hostname} = x ; then
+  hostname="localhost"
+fi
+AC_ARG_WITH(hostname,
+   AC_HELP_STRING([--with-hostname=RESNAME], [specify host name for daemons]),
+   [
+       if test "x$withval" != "xno" ; then
+        hostname=$withval
+       fi
+   ]
+)
+
+AC_SUBST(hostname)
+
 
 dnl ------------------------------------------
 dnl Where to place scriptdir (script files)

diff --git a/bacula/configure b/bacula/configure
index 50dc22d01402196d30dc77b07e524a0b32690cbf..94645ad240fd49d806c58ae25d52d8617d2abe07 100755 (executable)
--- a/bacula/configure
+++ b/bacula/configure
@@ -986,6 +986,7 @@ OPENSSL_INC
 working_dir
 archivedir
 basename
+hostname
 scriptdir
 bsrdir
 logdir
@@ -1041,7 +1042,6 @@ WCFLAGS
 WLDFLAGS
 WRAPLIBS
 OBJLIST
-hostname
 TAPEDRIVE
 PSCMD
 WIN32
@@ -1698,6 +1698,7 @@ Optional Packages:
   --with-working-dir=PATH specify path of Bacula working directory
   --with-archivedir=PATH  specify path of SD archive directory
   --with-basename=RESNAME specify base resource name for daemons
+  --with-hostname=RESNAME specify host name for daemons
   --with-scriptdir=PATH   specify path of Bacula scripts directory
   --with-bsrdir=PATH      specify path of Bacula bsrs directory
   --with-logdir=PATH      specify path of Bacula logs directory
@@ -5994,13 +5995,13 @@ if test "${lt_cv_nm_interface+set}" = set; then
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5997: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:5998: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6000: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:6001: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:6003: output\"" >&5)
+  (eval echo "\"\$as_me:6004: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -7221,7 +7222,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7224 "configure"' > conftest.$ac_ext
+  echo '#line 7225 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -9436,11 +9437,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9439: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9440: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9443: \$? = $ac_status" >&5
+   echo "$as_me:9444: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9775,11 +9776,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9778: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9779: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:9782: \$? = $ac_status" >&5
+   echo "$as_me:9783: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -9880,11 +9881,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9883: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9884: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9887: \$? = $ac_status" >&5
+   echo "$as_me:9888: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -9935,11 +9936,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9938: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:9939: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9942: \$? = $ac_status" >&5
+   echo "$as_me:9943: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -12691,7 +12692,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12694 "configure"
+#line 12695 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -12787,7 +12788,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 12790 "configure"
+#line 12791 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -14799,11 +14800,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14802: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14803: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:14806: \$? = $ac_status" >&5
+   echo "$as_me:14807: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -14898,11 +14899,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14901: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14902: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14905: \$? = $ac_status" >&5
+   echo "$as_me:14906: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -14950,11 +14951,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:14953: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:14954: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:14957: \$? = $ac_status" >&5
+   echo "$as_me:14958: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -27383,6 +27384,24 @@ fi
 
 
 
+hostname=`uname -n | cut -d '.' -f 1`
+if test x${hostname} = x ; then
+  hostname="localhost"
+fi
+
+# Check whether --with-hostname was given.
+if test "${with_hostname+set}" = set; then
+  withval=$with_hostname;
+       if test "x$withval" != "xno" ; then
+        hostname=$withval
+       fi
+
+
+fi
+
+
+
+
 
 scriptdir=`eval echo ${sysconfdir}`
 
@@ -44277,6 +44296,7 @@ OPENSSL_INC!$OPENSSL_INC$ac_delim
 working_dir!$working_dir$ac_delim
 archivedir!$archivedir$ac_delim
 basename!$basename$ac_delim
+hostname!$hostname$ac_delim
 scriptdir!$scriptdir$ac_delim
 bsrdir!$bsrdir$ac_delim
 logdir!$logdir$ac_delim
@@ -44332,7 +44352,6 @@ WCFLAGS!$WCFLAGS$ac_delim
 WLDFLAGS!$WLDFLAGS$ac_delim
 WRAPLIBS!$WRAPLIBS$ac_delim
 OBJLIST!$OBJLIST$ac_delim
-hostname!$hostname$ac_delim
 TAPEDRIVE!$TAPEDRIVE$ac_delim
 PSCMD!$PSCMD$ac_delim
 WIN32!$WIN32$ac_delim

diff --git a/bacula/technotes b/bacula/technotes
index 81ad3bc6e7fe205e228e79ed6768bdc25c0709c1..a4ded2e0677a1026e43675c9d0836685f8eb1c2e 100644 (file)
--- a/bacula/technotes
+++ b/bacula/technotes
@@ -3,8 +3,12 @@
 General:
 
 09Jul09
+<<<<<<< HEAD:bacula/technotes
 mvw  Changed ACL_OTHER into ACL_OTHER_OBJ as IRIX doesn't seem to have
      ACL_OTHER. Fixes bug #1333
+=======
+kes  Add --with-hostname to ./configure
+>>>>>>> Add --with-hostname to ./configure:bacula/technotes
 04Jul09
 mvw  Change checking for acl and xattr support from first file to
      job level.