X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=bacula%2Fconfigure;h=b3b697b29afbe82d0fe5c90510805b57a61450cf;hb=977a779389e122f3c226bfff4eb86416cf8cdfbd;hp=06d1318fe876c0dd0d9aebeb231c7e17bd0b8d39;hpb=48b8146529d3a41c8d47ecd92d54d3398a4ca127;p=bacula%2Fbacula diff --git a/bacula/configure b/bacula/configure index 06d1318fe8..b3b697b29a 100755 --- 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 @@ -16407,6 +16408,9 @@ then elif test -f /etc/slackware-version then DISTNAME=slackware +elif test x$host_vendor = xapple +then + DISTNAME=osx elif test $HAVE_UNAME=yes -a x`uname -s` = xDarwin then DISTNAME=darwin @@ -24274,8 +24278,11 @@ if test "${enable_static_tools+set}" = set; then enableval=$enable_static_tools; if test x$enableval = xyes; then if test x$use_libtool = xyes; then - echo "Libtool is enabled, not compatible with static tools, please rerun configure with --disable-libtool" - exit 1 + { { echo "$as_me:$LINENO: error: Libtool is enabled, not compatible with static tools, + please rerun configure with --disable-libtool" >&5 +echo "$as_me: error: Libtool is enabled, not compatible with static tools, + please rerun configure with --disable-libtool" >&2;} + { (exit 1); exit 1; }; } fi support_static_tools=yes fi @@ -24295,8 +24302,11 @@ if test "${enable_static_fd+set}" = set; then enableval=$enable_static_fd; if test x$enableval = xyes; then if test x$use_libtool = xyes; then - echo "Libtool is enabled, not compatible with static tools, please rerun configure with --disable-libtool" - exit 1 + { { echo "$as_me:$LINENO: error: Libtool is enabled, not compatible with static tools, + please rerun configure with --disable-libtool" >&5 +echo "$as_me: error: Libtool is enabled, not compatible with static tools, + please rerun configure with --disable-libtool" >&2;} + { (exit 1); exit 1; }; } fi support_static_fd=yes fi @@ -24316,8 +24326,11 @@ if test "${enable_static_sd+set}" = set; then enableval=$enable_static_sd; if test x$enableval = xyes; then if test x$use_libtool = xyes; then - echo "Libtool is enabled, not compatible with static tools, please rerun configure with --disable-libtool" - exit 1 + { { echo "$as_me:$LINENO: error: Libtool is enabled, not compatible with static tools, + please rerun configure with --disable-libtool" >&5 +echo "$as_me: error: Libtool is enabled, not compatible with static tools, + please rerun configure with --disable-libtool" >&2;} + { (exit 1); exit 1; }; } fi support_static_sd=yes fi @@ -24337,8 +24350,11 @@ if test "${enable_static_dir+set}" = set; then enableval=$enable_static_dir; if test x$enableval = xyes; then if test x$use_libtool = xyes; then - echo "Libtool is enabled, not compatible with static tools, please rerun configure with --disable-libtool" - exit 1 + { { echo "$as_me:$LINENO: error: Libtool is enabled, not compatible with static tools, + please rerun configure with --disable-libtool" >&5 +echo "$as_me: error: Libtool is enabled, not compatible with static tools, + please rerun configure with --disable-libtool" >&2;} + { (exit 1); exit 1; }; } fi support_static_dir=yes fi @@ -24358,8 +24374,11 @@ if test "${enable_static_cons+set}" = set; then enableval=$enable_static_cons; if test x$enableval = xyes; then if test x$use_libtool = xyes; then - echo "Libtool is enabled, not compatible with static tools, please rerun configure with --disable-libtool" - exit 1 + { { echo "$as_me:$LINENO: error: Libtool is enabled, not compatible with static tools, + please rerun configure with --disable-libtool" >&5 +echo "$as_me: error: Libtool is enabled, not compatible with static tools, + please rerun configure with --disable-libtool" >&2;} + { (exit 1); exit 1; }; } fi support_static_cons=yes fi @@ -26227,38 +26246,46 @@ if test "${with_python+set}" = set; then PYTHON_LIBS= if test "$withval" != "no"; then if test "$withval" = "yes"; then - for python_root in /usr /usr/local /usr/sfw; do - for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python3; do - if test -f $python_root/include/${ver}/Python.h; then - PYTHON_INCDIR=-I$python_root/include/${ver} - if test -d $python_root/lib64/${ver}/config; then - PYTHON_LIBS="-L$python_root/lib64/${ver}/config -l${ver}" - else - PYTHON_LIBS="-L$python_root/lib/${ver}/config -l${ver}" + if test -e /usr/bin/python-config ; then + PYTHON_INCDIR=`/usr/bin/python-config --includes` + PYTHON_LIBS=`/usr/bin/python-config --libs` + else + for python_root in /usr /usr/local /usr/sfw; do + for ver in python2.2 python2.3 python2.4 python2.5 python2.6 python3; do + if test -f $python_root/include/${ver}/Python.h; then + PYTHON_INCDIR=-I$python_root/include/${ver} + if test -d $python_root/lib64/${ver}/config; then + PYTHON_LIBS="-L$python_root/lib64/${ver}/config -l${ver}" + else + PYTHON_LIBS="-L$python_root/lib/${ver}/config -l${ver}" + fi + break fi - break - fi + done done - done - if test x$PYTHON_INCDIR = x; then - if test -f $prefix/include/Python.h; then - PYTHON_INCDIR=-I$prefix/include - if test -d $prefix/lib64/config; then - PYTHON_LIBS="-L$prefix/lib64/config -lpython" + if test x$PYTHON_INCDIR = x; then + if test -f $prefix/include/Python.h; then + PYTHON_INCDIR=-I$prefix/include + if test -d $prefix/lib64/config; then + PYTHON_LIBS="-L$prefix/lib64/config -lpython" + else + PYTHON_LIBS="-L$prefix/lib/config -lpython" + fi else - PYTHON_LIBS="-L$prefix/lib/config -lpython" - fi - else - { echo "$as_me:$LINENO: result: no" >&5 + { echo "$as_me:$LINENO: result: no" >&5 echo "${ECHO_T}no" >&6; } - { { echo "$as_me:$LINENO: error: Unable to find Python.h in standard locations" >&5 + { { echo "$as_me:$LINENO: error: Unable to find Python.h in standard locations" >&5 echo "$as_me: error: Unable to find Python.h in standard locations" >&2;} { (exit 1); exit 1; }; } + fi fi fi else - if test -f $withval/Python.h; then + if test -e $withval/bin/python-config ; then + PYTHON_INCDIR=`$withval/bin/python-config --includes` + PYTHON_LIBS=`$withval/bin/python-config --libs` + elif test -f $withval/Python.h; then PYTHON_INCDIR=-I$withval PYTHON_LIBS="-L$withval/config -lpython" elif test -f $withval/include/Python.h; then @@ -27234,6 +27261,11 @@ else OPENSSL_INC="" fi +if test "$support_tls" = "no"; then + OPENSSL_LIBS="" + OPENSSL_INC="" +fi + { echo "$as_me:$LINENO: result: $support_tls" >&5 echo "${ECHO_T}$support_tls" >&6; } @@ -27368,6 +27400,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}` @@ -32428,75 +32478,6 @@ test $ba_cv_header_socklen_t = yes && cat >>confdefs.h <<\_ACEOF _ACEOF -{ echo "$as_me:$LINENO: checking for bigendian" >&5 -echo $ECHO_N "checking for bigendian... $ECHO_C" >&6; } -if test "${ba_cv_bigendian+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - if test "$cross_compiling" = yes; then - - ba_cv_bigendian=no - - -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ - - main(){long a=1L; char *p=(char *)&a; exit(*p);} - -_ACEOF -rm -f conftest$ac_exeext -if { (ac_try="$ac_link" -case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_link") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && { ac_try='./conftest$ac_exeext' - { (case "(($ac_try" in - *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;; - *) ac_try_echo=$ac_try;; -esac -eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5 - (eval "$ac_try") 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - - ba_cv_bigendian=yes - -else - echo "$as_me: program exited with status $ac_status" >&5 -echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -( exit $ac_status ) - - ba_cv_bigendian=no - -fi -rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext -fi - - - - -fi -{ echo "$as_me:$LINENO: result: $ba_cv_bigendian" >&5 -echo "${ECHO_T}$ba_cv_bigendian" >&6; } -test $ba_cv_bigendian = yes && cat >>confdefs.h <<\_ACEOF -#define HAVE_BIGENDIAN 1 -_ACEOF - - ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS' ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' @@ -40623,11 +40604,13 @@ _ACEOF have_zlib=yes fi -support_acl=yes +support_acl=auto # Check whether --enable-acl was given. if test "${enable_acl+set}" = set; then enableval=$enable_acl; - if test x$enableval = xno; then + if test x$enableval = xyes; then + support_acl=yes + elif test x$enableval = xno; then support_acl=no fi @@ -40637,7 +40620,7 @@ fi have_acl=no have_extended_acl=no -if test x$support_acl = xyes; then +if test x$support_acl = xyes -o x$support_acl = xauto; then if test "${ac_cv_header_sys_acl_h+set}" = set; then { echo "$as_me:$LINENO: checking for sys/acl.h" >&5 echo $ECHO_N "checking for sys/acl.h... $ECHO_C" >&6; } @@ -41145,28 +41128,39 @@ fi fi - if test $have_acl = yes; then + + if test x$support_acl = xyes -a $have_acl != yes; then + { { echo "$as_me:$LINENO: error: acl support explicitly enabled but no supported acl implementation found, + please either load the acl libraries or rerun configure without --enable-acl" >&5 +echo "$as_me: error: acl support explicitly enabled but no supported acl implementation found, + please either load the acl libraries or rerun configure without --enable-acl" >&2;} + { (exit 1); exit 1; }; } + else + if test $have_acl = yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_ACL _ACEOF - fi + fi - if test $have_extended_acl = yes; then + if test $have_extended_acl = yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_EXTENDED_ACL _ACEOF + fi fi fi -support_xattr=yes +support_xattr=auto # Check whether --enable-xattr was given. if test "${enable_xattr+set}" = set; then enableval=$enable_xattr; - if test x$enableval = xno; then + if test x$enableval = xyes; then + support_xattr=yes + elif test x$enableval = xno; then support_xattr=no fi @@ -41175,7 +41169,7 @@ fi have_xattr=no -if test x$support_xattr = xyes; then +if test x$support_xattr = xyes -o x$support_xattr = xauto; then if test "${ac_cv_header_sys_xattr_h+set}" = set; then { echo "$as_me:$LINENO: checking for sys/xattr.h" >&5 echo $ECHO_N "checking for sys/xattr.h... $ECHO_C" >&6; } @@ -42151,12 +42145,20 @@ fi fi fi - if test $have_xattr = yes; then + if test x$support_xattr = xyes -a $have_xattr != yes; then + { { echo "$as_me:$LINENO: error: xattr support explicitly enabled but no supported xattr implementation found, + please either load the xattr libraries or rerun configure without --enable-xatt" >&5 +echo "$as_me: error: xattr support explicitly enabled but no supported xattr implementation found, + please either load the xattr libraries or rerun configure without --enable-xatt" >&2;} + { (exit 1); exit 1; }; } + else + if test $have_xattr = yes; then cat >>confdefs.h <<\_ACEOF #define HAVE_XATTR _ACEOF + fi fi fi @@ -42496,10 +42498,16 @@ PFILES="platforms/Makefile" PSCMD="ps -e" WIN32= MACOSX= + hostname=`uname -n | cut -d '.' -f 1` if test x${hostname} = x ; then hostname="localhost" fi +ping -c 1 $hostname 2>/dev/null 1>/dev/null +if test ! $? = 0; then + hostname="localhost" +fi + case "$DISTNAME" in aix) DISTVER=`uname -r` @@ -42550,11 +42558,15 @@ darwin) PFILES="${PFILES} \ platforms/darwin/Makefile" ;; +osx) + DISTVER=`uname -r` + TAPEDRIVE="/dev/nst0" + PSCMD="ps -e -o pid,command" + MACOSX=macosx + PFILES="${PFILES} \ + platforms/osx/Makefile" + ;; debian) - ping -c 1 $hostname 2>&1 1>/dev/null - if test ! $? = 0; then - hostname="localhost" - fi if `test -f /etc/apt/sources.list && grep -q ubuntu /etc/apt/sources.list`; then DISTNAME="ubuntu" fi @@ -42588,10 +42600,6 @@ debian) fi ;; freebsd) - ping -c 1 $hostname 2>&1 1>/dev/null - if test ! $? = 0; then - hostname="localhost" - fi DISTVER=`uname -a |awk '{print $3}'` VER=`echo $DISTVER | cut -c 1` if test x$VER = x4 ; then @@ -42654,10 +42662,6 @@ openbsd) platforms/openbsd/bacula-dir" ;; redhat) - ping -c 1 $hostname 2>&1 1>/dev/null - if test ! $? = 0; then - hostname="localhost" - fi if test -f /etc/whitebox-release ; then f=/etc/whitebox-release else @@ -42677,15 +42681,10 @@ redhat) platforms/redhat/Makefile \ platforms/redhat/bacula-fd \ platforms/redhat/bacula-sd \ - platforms/redhat/bacula-dir \ - platforms/redhat/bacula.spec \ + platforms/redhat/bacula-dir " ;; mandrake) - ping -c 1 $hostname 2>&1 1>/dev/null - if test ! $? = 0; then - hostname="localhost" - fi DISTVER=`cat /etc/mandrake-release | grep release |\ cut -f 5 -d ' '` TAPEDRIVE="/dev/nst0" @@ -42699,10 +42698,6 @@ mandrake) " ;; gentoo) - ping -c 1 $hostname 2>&1 1>/dev/null - if test ! $? = 0; then - hostname="localhost" - fi DISTVER=`awk '/version / {print $5}' < /etc/gentoo-release` TAPEDRIVE="/dev/nst0" PSCMD="ps -e -o pid,command" @@ -42714,10 +42709,6 @@ gentoo) platforms/gentoo/bacula-dir" ;; slackware) - ping -c 1 $hostname 2>&1 1>/dev/null - if test ! $? = 0; then - hostname="localhost" - fi DISTVER=`cat /etc/slackware-version` TAPEDRIVE="/dev/nst0" PSCMD="ps -e -o pid,command" @@ -42746,10 +42737,6 @@ _ACEOF LIBS="$LIBS -lresolv" ;; suse) - ping -c 1 $hostname 2>&1 1>/dev/null - if test ! $? = 0; then - hostname="localhost" - fi DISTVER=`cat /etc/SuSE-release |grep VERSION|\ cut -f 3 -d ' '` TAPEDRIVE="/dev/nst0" @@ -42763,10 +42750,6 @@ suse) platforms/suse/bacula.spec" ;; suse5) - ping -c 1 $hostname 2>&1 1>/dev/null - if test ! $? = 0; then - hostname="localhost" - fi DISTNAME=suse DISTVER=5.x TAPEDRIVE="/dev/nst0" @@ -44241,6 +44224,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 @@ -44296,7 +44280,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 @@ -45658,8 +45641,9 @@ fi if test "${support_bat}" = "yes" ; then if test "x$QMAKE" = "xnone" && test "x$QMAKEQT4" = "xnone"; then - echo "Could not find qmake or qmake-qt4 in $PATH. Check your Qt installation" - exit 1 + { { echo "$as_me:$LINENO: error: Could not find qmake or qmake-qt4 in $PATH. Check your Qt installation" >&5 +echo "$as_me: error: Could not find qmake or qmake-qt4 in $PATH. Check your Qt installation" >&2;} + { (exit 1); exit 1; }; } fi QMAKEBIN="qmake" @@ -45671,6 +45655,7 @@ if test "${support_bat}" = "yes" ; then cd src/qt-console echo "Creating bat Makefile" touch bat + chmod 755 bat $QMAKEBIN make clean cd ${BUILD_DIR}