Warning tidy-up for FreeBSD.

[disorder] / configure.ac

diff --git a/configure.ac b/configure.ac
index dd4604546b9cac1e90f17f4a44d980a93efadfb9..1491c67cd36dbcc765c5de078ac0cb8608e6d199 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 # Process this file with autoconf to produce a configure script.
 #
 # This file is part of DisOrder.
-# Copyright (C) 2004-2013 Richard Kettlewell
+# Copyright (C) 2004-2014 Richard Kettlewell
 # Portions copyright (C) 2007 Ross Younger
 #
 # This program is free software: you can redistribute it and/or modify
@@ -164,7 +164,7 @@ case "$host" in
   # Look for a suitable version of libdb among the versions found in FreeBSD 7.0
   AC_CACHE_CHECK([looking for a libdb install],[rjk_cv_libdb],[
     rjk_cv_libdb="none"
-    for db in db43 db44 db45 db47; do
+    for db in db43 db44 db45 db47 db48; do
       if test -e /usr/local/lib/$db; then
         rjk_cv_libdb=$db
         break
@@ -175,6 +175,8 @@ case "$host" in
     LDFLAGS="${LDFLAGS} -L/usr/local/lib/$rjk_cv_libdb"
     CPPFLAGS="${CPPFLAGS} -isystem /usr/local/include/$rjk_cv_libdb"
   fi
+  # iconv needs bodging
+  AC_SUBST(LIBICONV,[-liconv])
   ;;
 * )
   AC_MSG_RESULT([unknown, winging it])
@@ -278,7 +280,7 @@ fi
 if test $want_cgi = yes; then
   if test -z "$httpdir"; then
     AC_CACHE_CHECK([for httpd document root],[rjk_cv_httpdir],[
-      rjk_cv_httpdir="not found"
+      rjk_cv_httpdir="/usr/local/apache/htdocs"
       for dir in /var/www/html \
                  /var/www/htdocs \
                  /var/www/localhost/htdocs \
@@ -294,9 +296,6 @@ if test $want_cgi = yes; then
         fi
       done
     ])
-    if test "$rjk_cv_httpdir" = "not found"; then
-      AC_MSG_ERROR([cannot identify httpd documentroot.  Set httpdir on configure command line])
-    fi
     httpdir="$rjk_cv_httpdir"
   fi
   if test ! -z "$cgidir"; then
@@ -305,7 +304,7 @@ if test $want_cgi = yes; then
   fi
   if test -z "$cgiexecdir"; then
     AC_CACHE_CHECK([for CGI directory],[rjk_cv_cgiexecdir],[
-      rjk_cv_cgiexecdir="not found"
+      rjk_cv_cgiexecdir="/usr/lib/cgi-bin"
       for dir in /usr/lib/cgi-bin \
                  /Library/WebServer/CGI-Executables \
                  /srv/www/cgi-bin \
@@ -321,9 +320,6 @@ if test $want_cgi = yes; then
         fi
       done
     ])
-    if test "$rjk_cv_cgiexecdir" = "not found"; then
-      AC_MSG_ERROR([cannot identify CGI install directory.  Set cgiexecdir on configure command line])
-    fi
     cgiexecdir="$rjk_cv_cgiexecdir"
   fi
 fi
@@ -576,24 +572,6 @@ fi
 old_CFLAGS="${CFLAGS}"
 CFLAGS="${CFLAGS} $gcc_werror"
 AC_CHECK_TYPES([long long,uint32_t,uint16_t,uint8_t,intmax_t,uintmax_t])
-
-# Some GCC invocations warn for converting function pointers to void *.
-# This is fair enough, as it's technically forbidden, but we use dlsym()
-# which can pretty much only exist if object and function pointers are
-# interconvertable.  So we disable -Werror if need be.
-if test ! -z "$gcc_werror"; then
-  AC_CACHE_CHECK([whether function pointers can be converted to void * without a warning],
-                [rjk_cv_function_pointer_cast],[
-    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
-  void somefunction(void);],
-                     [(void *)somefunction])],
-                     [rjk_cv_function_pointer_cast=yes],
-                     [rjk_cv_function_pointer_cast=no])])
-  if test $rjk_cv_function_pointer_cast = no; then
-    gcc_werror=""
-  fi
-fi
-
 CFLAGS="${old_CFLAGS}"
 
 # gcrypt maintainers keep changing everything.  Design your interface
@@ -661,6 +639,13 @@ AC_CHECK_FUNCS([fdatasync],[:],[
 if test ! -z "$missing_functions"; then
   AC_MSG_ERROR([missing functions:$missing_functions])
 fi
+# dlsym will do if dlfunc not available
+AC_CHECK_FUNCS([dlfunc],[:],[
+  AC_DEFINE([dlfunc],[dlsym],[define dlfunc to dlsym if not available])
+])
+if test ! -z "$missing_functions"; then
+  AC_MSG_ERROR([missing functions:$missing_functions])
+fi
 
 # Functions we can take or leave
 AC_CHECK_FUNCS([fls getfsstat closesocket])
@@ -711,6 +696,25 @@ if test $want_gtk = yes; then
 fi
 AM_CONDITIONAL([GTK], [test x$want_gtk = xyes])
 
+# Some GCC invocations warn for converting function pointers to void *.
+# This is fair enough, as it's technically forbidden, but we use dlsym()
+# which can pretty much only exist if object and function pointers are
+# interconvertable.  So we disable -Werror if need be.
+if test ! -z "$gcc_werror" && test "$ac_cv_func_dlfunc" != yes; then
+  CFLAGS="${CFLAGS} $gcc_werror"
+  AC_CACHE_CHECK([whether function pointers can be converted to void * without a warning],
+                [rjk_cv_function_pointer_cast],[
+    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT
+  void somefunction(void);],
+                     [(void *)somefunction])],
+                     [rjk_cv_function_pointer_cast=yes],
+                     [rjk_cv_function_pointer_cast=no])])
+  if test $rjk_cv_function_pointer_cast = no; then
+    gcc_werror=""
+  fi
+  CFLAGS="${old_CFLAGS}"
+fi
+
 if test "x$GCC" = xyes; then
   # We need LLONG_MAX and annoyingly GCC doesn't always give it to us
   # by default.