Fix conio.h problem on Solaris

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

diff --git a/bacula/autoconf/configure.in b/bacula/autoconf/configure.in
index 35b024b28b9fa8e791fab00c78977f20ed23d3df..e72a34826b441b5a7aa0f630867256bfe549bd28 100644 (file)
--- a/bacula/autoconf/configure.in
+++ b/bacula/autoconf/configure.in
@@ -200,7 +200,7 @@ AC_SUBST(GNOME_DIR)
 # wx-console (default off)
 # -------------------------------------------
 AC_ARG_ENABLE(wx-console,
-  [  --enable-wx-console      enable build of wxWidgets console [disabled]],
+  [  --enable-wx-console     enable build of wxWidgets console [disabled]],
   [if test x$enableval = xyes; then
     support_wx_console=yes
   fi])
@@ -225,6 +225,28 @@ fi
 AC_SUBST(WX_DIR)
 
 
+# -------------------------------------------
+# tray-monitor (default off)
+# -------------------------------------------
+AC_ARG_ENABLE(tray-monitor,
+  [  --enable-tray-monitor   enable build of Gnome tray monitor (compatible with KDE) [disabled]],
+  [if test x$enableval = xyes; then
+    support_tray_monitor=yes
+  fi])
+
+TRAY_MONITOR_DIR=
+if test x$support_tray_monitor = xyes; then
+  abc=`$PKGCONFIG --exists gtk+-2.0`
+  pkg=$?
+  if test $pkg = 0; then
+     TRAY_MONITOR_CPPFLAGS=`$PKGCONFIG --cflags gtk+-2.0`
+     TRAY_MONITOR_LDFLAGS=`$PKGCONFIG --libs gtk+-2.0`
+     AC_SUBST(TRAY_MONITOR_CPPFLAGS)
+     AC_SUBST(TRAY_MONITOR_LDFLAGS)
+     TRAY_MONITOR_DIR=src/tray-monitor
+  fi
+fi
+AC_SUBST(TRAY_MONITOR_DIR)
 
 # -------------------------------------------
 # smartalloc (default off)
@@ -933,14 +955,9 @@ AC_DEFINE(PROTOTYPES)
 dnl# --------------------------------------------------------------------------
 dnl# Supply default CFLAGS, if not specified by `CFLAGS=flags ./configure'
 dnl#
-if test -z "$CFLAGS"; then
+if test -z "$CFLAGS" -o "$CFLAGS" = "-g -O2"; then
     if test -z "$CCOPTS"; then
-       CCOPTS='-g -O2'
-dnl>   if test "x$GCC" = xyes; then
-dnl>       if test x$system = xLinux; then
-dnl>           CCOPTS="$CCOPTS "'-O2 -fno-strength-reduce'
-dnl>       fi
-dnl>   fi
+       CCOPTS='-g -O2 -Wall'
     fi
     CFLAGS="$CCOPTS"
 fi
@@ -971,7 +988,9 @@ AC_CHECK_HEADERS( \
        stdint.h \
        string.h \
        termios.h \
+       termcap.h \
        unistd.h \
+       sys/bitypes.h \
        sys/byteorder.h \
        sys/ioctl.h \
        sys/select.h \
@@ -982,6 +1001,7 @@ AC_CHECK_HEADERS( \
        resolv.h \
        mtio.h \
        sys/mtio.h \
+       sys/tape.h \
        regex.h \
 )
 AC_HEADER_STDC
@@ -1228,6 +1248,38 @@ if test -z "$have_u_intxx_t" ; then
    fi
 fi
 
+if (test -z "$have_u_int64_t" || test -z "$have_int64_t" && \
+         test "x$ac_cv_header_sys_bitypes_h" = "xyes")
+then
+   AC_MSG_CHECKING([for int64_t and u_int64_t types in sys/bitypes.h])
+   AC_TRY_COMPILE(
+      [ #include <sys/bitypes.h>  ], 
+      [ int64_t a; u_int64_t b; 
+       a = b = 1;  ], 
+      [ AC_DEFINE(HAVE_U_INT64_T)
+       AC_DEFINE(HAVE_INT64_T)
+       AC_MSG_RESULT(yes) ],
+      [ AC_MSG_RESULT(no)]
+   ) 
+fi
+
+if (test -z "$have_uintxx_t" && \
+         test "x$ac_cv_header_sys_bitypes_h" = "xyes")
+then
+   AC_MSG_CHECKING([for uintXX_t types in sys/bitypes.h])
+   AC_TRY_COMPILE(
+      [ #include <sys/bitypes.h>  ], 
+       [ uint8_t a; uint16_t b; 
+         uint32_t c; a = b = c = 1; ], 
+      [ AC_DEFINE(HAVE_UINTXX_T)
+       AC_MSG_RESULT(yes) ],
+      [ AC_MSG_RESULT(no)]
+   ) 
+
+fi
+
+
+
 
 dnl# --------------------------------------------------------------------------
 dnl# CHECKING FOR REQUIRED LIBRARY FUNCTIONS
@@ -1277,6 +1329,34 @@ AC_CHECK_FUNC(socket,
     AC_CHECK_LIB(inet,socket))
 
 AC_CHECK_FUNCS(inet_pton, [AC_DEFINE(HAVE_INET_PTON)])
+AC_CHECK_FUNCS(inet_ntop, [AC_DEFINE(HAVE_INET_NTOP)])
+AC_CHECK_FUNCS(gethostbyname2, [AC_DEFINE(HAVE_GETHOSTBYNAME2)])
+
+dnl ----------------------------
+dnl check sa_len of sockaddr
+dnl ----------------------------
+AC_CACHE_CHECK(for struct sockaddr has a sa_len field, ac_cv_struct_sockaddr_sa_len,
+  [AC_TRY_COMPILE([#include <sys/socket.h>], [struct sockaddr s; s.sa_len;],
+  ac_cv_struct_sockaddr_sa_len=yes, ac_cv_struct_sockaddr_sa_len=no)])
+
+ if test $ac_cv_struct_sockaddr_sa_len = yes; then
+  AC_DEFINE(HAVE_SA_LEN, 1, [Define if sa_len field exists in struct sockaddr])
+ fi
+
+
+dnl Check for IPv6 support
+AC_CACHE_CHECK([for IPv6 support], ac_cv_ipv6_support,
+[AC_TRY_LINK([ #include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>], [struct sockaddr_in6 s; struct in6_addr t=in6addr_any; int i=AF_INET6; s; t.s6_addr[0] =
+ 0;],
+  [ac_cv_ipv6_support=yes], [ac_cv_ipv6_support=no])])
+
+if test "$ac_cv_ipv6_support" = yes; then
+  AC_DEFINE(HAVE_IPV6,1,[Whether to enable IPv6 support])
+fi
+
+
 
 AC_FUNC_STRFTIME
 AC_FUNC_VPRINTF
@@ -1625,7 +1705,6 @@ AC_OUTPUT([autoconf/Make.common \
           scripts/gconsole \
           scripts/bacula \
           scripts/devel_bacula \
-          scripts/fd \
           scripts/Makefile \
           scripts/logrotate \
           scripts/bacula.desktop.gnome1 \
@@ -1647,6 +1726,8 @@ AC_OUTPUT([autoconf/Make.common \
           src/gnome2-console/gnome-console.conf \
           src/wx-console/Makefile \
           src/wx-console/wx-console.conf \
+          src/tray-monitor/Makefile \
+          src/tray-monitor/tray-monitor.conf \
           src/dird/Makefile \
           src/dird/bacula-dir.conf \
           src/lib/Makefile \
@@ -1820,6 +1901,7 @@ Configuration on `date`:
   enable-smartalloc:         ${support_smartalloc} 
   enable-gnome:              ${support_gnome} ${gnome_version}
   enable-wx-console:         ${support_wx_console}
+  enable-tray-monitor:       ${support_tray_monitor}
   client-only:               ${build_client_only}
   ACL support:               ${have_acl}
 
@@ -1829,4 +1911,4 @@ cat config.out
 
 # old stuff
 # cweb support:              ${got_cweb} ${CWEB_SRC}
-# gmp support:               ${got_gmp} ${GMP_SRC}
+  # gmp support:                     ${got_gmp} ${GMP_SRC}