From: Kern Sibbald Date: Wed, 9 Mar 2005 17:34:31 +0000 (+0000) Subject: Hammer Solaris autoconf incompatibilities X-Git-Tag: Release-1.38.0~604 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7ca546771f06a99b9f56d9bd46430bc412b096a2;p=bacula%2Fbacula Hammer Solaris autoconf incompatibilities git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1878 91ce42f0-d328-0410-95d8-f526ca767f89 --- diff --git a/bacula/autoconf/config.h.in b/bacula/autoconf/config.h.in index 9629e4f89b..ee8c0df5c1 100644 --- a/bacula/autoconf/config.h.in +++ b/bacula/autoconf/config.h.in @@ -273,9 +273,6 @@ /* Define to 1 if you have the `getcwd' function. */ #undef HAVE_GETCWD -/* Define to 1 if you have the `getdomainname' function. */ -#undef HAVE_GETDOMAINNAME - /* Define to 1 if you have the `gethostbyname2' function. */ #undef HAVE_GETHOSTBYNAME2 diff --git a/bacula/autoconf/config.h.in.save b/bacula/autoconf/config.h.in.save index 9470a3e23a..ee8c0df5c1 100644 --- a/bacula/autoconf/config.h.in.save +++ b/bacula/autoconf/config.h.in.save @@ -217,6 +217,10 @@ /* Defined if Gtk+-2.4 or greater is present */ #undef HAVE_GTK_2_4 +/* Needed on HP-UX/g++ systems to support long long ints (int64) */ +#undef _INCLUDE_LONGLONG + + /* Define to 1 if the `closedir' function returns void instead of `int'. */ #undef CLOSEDIR_VOID @@ -269,9 +273,6 @@ /* Define to 1 if you have the `getcwd' function. */ #undef HAVE_GETCWD -/* Define to 1 if you have the `getdomainname' function. */ -#undef HAVE_GETDOMAINNAME - /* Define to 1 if you have the `gethostbyname2' function. */ #undef HAVE_GETHOSTBYNAME2 diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in index c0ef4202f0..3cabbaec34 100644 --- a/bacula/autoconf/configure.in +++ b/bacula/autoconf/configure.in @@ -604,126 +604,6 @@ fi AC_SUBST(CDSTL) -# --------------------------------------------------- -# Check for GMP support/directory -# --------------------------------------------------- -#GMP_SRC= -#local_gmp="no" -#AC_ARG_WITH(gmp, -# [ --with-gmp[=DIR] Specify gmp library directory], -# [ -# case "$with_gmp" in -# no) : ;; -# yes|*) -# if test "$with_gmp" != "yes"; then -# GMP_INC="-I$with_gmp" -# GMP_LIBS="-lgmp" -# GMP_LDFLAGS="-L$with_gmp" -# else -# with_gmp="/usr/include" -# fi -# AC_CHECK_HEADER($with_gmp/gmp.h, -# [ AC_MSG_RESULT(yes) -# AC_DEFINE(HAVE_GMP) -# GMP_LIBS="-lgmp" -# got_gmp="yes" -# ], -# [ AC_MSG_ERROR([*** gmp library missing]) -# ] -# ) -# ;; -# esac -# ],[ -# # check for standard gmp library -# AC_CHECK_HEADER(/usr/include/gmp.h, -# [ AC_MSG_RESULT(yes) -# AC_DEFINE(HAVE_GMP) -# got_gmp="yes" -# GMP_INC= -# GMP_LIBS="-lgmp" -# ], [ -# # Did not find standard library, so use our own -# AC_MSG_RESULT(yes) -# AC_DEFINE(HAVE_GMP) -# got_gmp="yes" -# local_gmp="yes" -# GMP_INC="-I${TOP_DIR}/depkgs/gmp" -# GMP_LIBS="-lgmp" -# GMP_LDFLAGS="-L${TOP_DIR}/depkgs/gmp" -# GMP_SRC="${TOP_DIR}/depkgs/gmp" -# ]) -# ] -#) -#AC_SUBST(GMP_INC) -#AC_SUBST(GMP_LIBS) -#AC_SUBST(GMP_LDFLAGS) -#AC_SUBST(GMP_SRC) - -# End of GMP stuff -# ----------------------------------------------------------------------- - - -# --------------------------------------------------- -# Check for CWEB support/directory -# --------------------------------------------------- -#CWEB_SRC= -#CWEB=/bin -#local_cweb="no" -#AC_ARG_WITH(cweb, -# [ --with-cweb[=DIR] Specify cweb library directory], -# [ -# case "$with_cweb" in -# no) : ;; -# yes|*) -# if test "$with_cweb" != "yes"; then -# CWEB_INC="-I$with_cweb" -# CWEB_LIBS="-lcweb" -# CWEB_LDFLAGS="-L$with_cweb" -# else -# with_cweb="/usr/include" -# fi -# AC_CHECK_HEADER($with_cweb/cweb.h, -# [ AC_MSG_RESULT(yes) -# AC_DEFINE(HAVE_CWEB) -# CWEB_LIBS="-lcweb" -# got_cweb="yes" -# ], -# [ AC_MSG_ERROR([*** cweb library missing]) -# ] -# ) -# ;; -# esac -# ],[ -# # check for standard cweb library -# AC_CHECK_HEADER(/usr/include/cweb.h, -# [ AC_MSG_RESULT(yes) -# AC_DEFINE(HAVE_CWEB) -# got_cweb="yes" -# CWEB_INC= -# CWEB_LIBS="-lcweb" -# ], [ -# # Did not find starndard library, so use our own -# AC_MSG_RESULT(yes) -# AC_DEFINE(HAVE_CWEB) -# got_cweb="yes" -# local_cweb="yes" -# CWEB=${TOP_DIR}/depkgs/cweb -# CWEB_INC="-I${TOP_DIR}/depkgs/cweb" -# CWEB_LIBS="-lcweb" -# CWEB_LDFLAGS="-L${TOP_DIR}/depkgs/cweb" -# CWEB_SRC="${TOP_DIR}/depkgs/cweb" -# ]) -# ] -#) -#AC_SUBST(CWEB) -#AC_SUBST(CWEB_INC) -#AC_SUBST(CWEB_LIBS) -#AC_SUBST(CWEB_LDFLAGS) -#AC_SUBST(CWEB_SRC) - -# End of CWEB stuff -# ----------------------------------------------------------------------- - # # Find where sockets are (especially for Solaris) # Do this before the TCP Wrappers test since tcp wrappers @@ -1573,11 +1453,6 @@ AC_CHECK_FUNCS(strtoll, [AC_DEFINE(HAVE_STRTOLL)]) AC_CHECK_FUNCS(chflags) AC_CHECK_FUNCS(snprintf vsnprintf gethostid) -if test "$DISTNAME" = "hpux" ; then - echo "*** getdomainname check is disabled for hpux" -else - AC_CHECK_FUNCS(getdomainname) -fi dnl# -------------------------------------------------------------------------- dnl# CHECKING FOR THREAD SAFE FUNCTIONS @@ -1892,6 +1767,7 @@ solaris) if test x$DISTVER = x5.6 ; then AC_DEFINE(HAVE_OLD_SOCKOPT) fi + LIBS="$LIBS -lresolv" ;; suse) DISTVER=`cat /etc/SuSE-release |grep VERSION|\ diff --git a/bacula/configure b/bacula/configure index c4239612c2..b04bb191b4 100755 --- a/bacula/configure +++ b/bacula/configure @@ -7558,126 +7558,6 @@ fi -# --------------------------------------------------- -# Check for GMP support/directory -# --------------------------------------------------- -#GMP_SRC= -#local_gmp="no" -#AC_ARG_WITH(gmp, -# [ --with-gmp[=DIR] Specify gmp library directory], -# [ -# case "$with_gmp" in -# no) : ;; -# yes|*) -# if test "$with_gmp" != "yes"; then -# GMP_INC="-I$with_gmp" -# GMP_LIBS="-lgmp" -# GMP_LDFLAGS="-L$with_gmp" -# else -# with_gmp="/usr/include" -# fi -# AC_CHECK_HEADER($with_gmp/gmp.h, -# [ AC_MSG_RESULT(yes) -# AC_DEFINE(HAVE_GMP) -# GMP_LIBS="-lgmp" -# got_gmp="yes" -# ], -# [ AC_MSG_ERROR([*** gmp library missing]) -# ] -# ) -# ;; -# esac -# ],[ -# # check for standard gmp library -# AC_CHECK_HEADER(/usr/include/gmp.h, -# [ AC_MSG_RESULT(yes) -# AC_DEFINE(HAVE_GMP) -# got_gmp="yes" -# GMP_INC= -# GMP_LIBS="-lgmp" -# ], [ -# # Did not find standard library, so use our own -# AC_MSG_RESULT(yes) -# AC_DEFINE(HAVE_GMP) -# got_gmp="yes" -# local_gmp="yes" -# GMP_INC="-I${TOP_DIR}/depkgs/gmp" -# GMP_LIBS="-lgmp" -# GMP_LDFLAGS="-L${TOP_DIR}/depkgs/gmp" -# GMP_SRC="${TOP_DIR}/depkgs/gmp" -# ]) -# ] -#) -#AC_SUBST(GMP_INC) -#AC_SUBST(GMP_LIBS) -#AC_SUBST(GMP_LDFLAGS) -#AC_SUBST(GMP_SRC) - -# End of GMP stuff -# ----------------------------------------------------------------------- - - -# --------------------------------------------------- -# Check for CWEB support/directory -# --------------------------------------------------- -#CWEB_SRC= -#CWEB=/bin -#local_cweb="no" -#AC_ARG_WITH(cweb, -# [ --with-cweb[=DIR] Specify cweb library directory], -# [ -# case "$with_cweb" in -# no) : ;; -# yes|*) -# if test "$with_cweb" != "yes"; then -# CWEB_INC="-I$with_cweb" -# CWEB_LIBS="-lcweb" -# CWEB_LDFLAGS="-L$with_cweb" -# else -# with_cweb="/usr/include" -# fi -# AC_CHECK_HEADER($with_cweb/cweb.h, -# [ AC_MSG_RESULT(yes) -# AC_DEFINE(HAVE_CWEB) -# CWEB_LIBS="-lcweb" -# got_cweb="yes" -# ], -# [ AC_MSG_ERROR([*** cweb library missing]) -# ] -# ) -# ;; -# esac -# ],[ -# # check for standard cweb library -# AC_CHECK_HEADER(/usr/include/cweb.h, -# [ AC_MSG_RESULT(yes) -# AC_DEFINE(HAVE_CWEB) -# got_cweb="yes" -# CWEB_INC= -# CWEB_LIBS="-lcweb" -# ], [ -# # Did not find starndard library, so use our own -# AC_MSG_RESULT(yes) -# AC_DEFINE(HAVE_CWEB) -# got_cweb="yes" -# local_cweb="yes" -# CWEB=${TOP_DIR}/depkgs/cweb -# CWEB_INC="-I${TOP_DIR}/depkgs/cweb" -# CWEB_LIBS="-lcweb" -# CWEB_LDFLAGS="-L${TOP_DIR}/depkgs/cweb" -# CWEB_SRC="${TOP_DIR}/depkgs/cweb" -# ]) -# ] -#) -#AC_SUBST(CWEB) -#AC_SUBST(CWEB_INC) -#AC_SUBST(CWEB_LIBS) -#AC_SUBST(CWEB_LDFLAGS) -#AC_SUBST(CWEB_SRC) - -# End of CWEB stuff -# ----------------------------------------------------------------------- - # # Find where sockets are (especially for Solaris) # Do this before the TCP Wrappers test since tcp wrappers @@ -18390,112 +18270,6 @@ _ACEOF fi done -if test "$DISTNAME" = "hpux" ; then - echo "*** getdomainname check is disabled for hpux" -else - -for ac_func in getdomainname -do -as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` -echo "$as_me:$LINENO: checking for $ac_func" >&5 -echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 -if eval "test \"\${$as_ac_var+set}\" = set"; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -/* Define $ac_func to an innocuous variant, in case declares $ac_func. - For example, HP-UX 11i declares gettimeofday. */ -#define $ac_func innocuous_$ac_func - -/* System header to define __stub macros and hopefully few prototypes, - which can conflict with char $ac_func (); below. - Prefer to if __STDC__ is defined, since - exists even on freestanding compilers. */ - -#ifdef __STDC__ -# include -#else -# include -#endif - -#undef $ac_func - -/* Override any gcc2 internal prototype to avoid an error. */ -#ifdef __cplusplus -extern "C" -{ -#endif -/* We use char because int might match the return type of a gcc2 - builtin and then its argument prototype would still apply. */ -char $ac_func (); -/* The GNU C library defines this for functions which it implements - to always fail with ENOSYS. Some functions are actually named - something starting with __ and the normal name is an alias. */ -#if defined (__stub_$ac_func) || defined (__stub___$ac_func) -choke me -#else -char (*f) () = $ac_func; -#endif -#ifdef __cplusplus -} -#endif - -int -main () -{ -return f != $ac_func; - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext conftest$ac_exeext -if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 - (eval $ac_link) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest$ac_exeext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - eval "$as_ac_var=yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -eval "$as_ac_var=no" -fi -rm -f conftest.err conftest.$ac_objext \ - conftest$ac_exeext conftest.$ac_ext -fi -echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 -echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 -if test `eval echo '${'$as_ac_var'}'` = yes; then - cat >>confdefs.h <<_ACEOF -#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 -_ACEOF - -fi -done - -fi @@ -21599,6 +21373,7 @@ solaris) _ACEOF fi + LIBS="$LIBS -lresolv" ;; suse) DISTVER=`cat /etc/SuSE-release |grep VERSION|\ diff --git a/bacula/src/lib/util.c b/bacula/src/lib/util.c index ed15119ab3..b592a21a6f 100644 --- a/bacula/src/lib/util.c +++ b/bacula/src/lib/util.c @@ -468,9 +468,6 @@ void make_session_key(char *key, char *seed, int mode) #endif #ifdef HAVE_GETHOSTID sprintf(s + strlen(s), "%lu", (unsigned long) gethostid()); -#endif -#ifdef HAVE_GETDOMAINNAME - getdomainname(s + strlen(s), 256); #endif gethostname(s + strlen(s), 256); sprintf(s + strlen(s), "%u", (unsigned)getuid());