Misc -- see ChangeLog

[bacula/bacula] / bacula / autoconf / configure.in

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index bdb404b9656e8cece1fdec9f8f1a8ce37abdf7d5..f00fbe38a9d59b36d972d9590356a651bc52454c 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -368,17 +368,7 @@ AC_HEADER_DIRENT
 AC_CHECK_FUNCS(strcasecmp select setenv putenv tcgetattr setlocale lstat lchown)
 AC_CHECK_FUNCS(nanosleep)
 
-#AC_CHECK_FUNC(getopt_long, AC_DEFINE(HAVE_GETOPT_LONG),
-#   [LIBEXTRAOBJ="$LIBEXTRAOBJ getopt.o getopt1.o"
-#    EXTRAOBJ="$EXTRAOBJ lib/getopt.o lib/getopt1.o"])
-
-AC_CHECK_FUNC(getopt_long, AC_DEFINE(HAVE_GETOPT_LONG))
-
-
-AC_FUNC_STRCOLL
-
-AC_CHECK_HEADERS(varargs.h \
-               sys/ptem.h sys/pte.h sys/stream.h)      
+AC_CHECK_HEADERS(varargs.h)
 
 # End of readline stuff
 # -----------------------------------------------------------------------
@@ -1237,8 +1227,11 @@ debian)
   ;;
 freebsd)
        DISTVER=`uname -a |awk '{print $3}'`
-       PTHREAD_LIB="-pthread"
-       CFLAGS="${CFLAGS} -pthread"
+       VER=`echo $DISTVER | cut -c 1`
+       if test x$VER = x4 ; then
+          PTHREAD_LIB="-pthread"
+          CFLAGS="${CFLAGS} -pthread"
+       fi
        lld="qd"
        llu="qu"
        TAPEDRIVE="/dev/nrsa0"