Recognize FreeBSD and adjust LDFLAGS/CPPFLAGS to cope with

[disorder] / configure.ac

diff --git a/configure.ac b/configure.ac
index 1bdd1e8eef98b2d29a74f65afb0dfb1ff0b6e8b9..c167d8deb0cc3463f7175dbc8d5ac77f67e6b77d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -20,9 +20,9 @@
 # USA
 #
 
-AC_INIT([disorder], [2.0], [richard+disorder@sfere.greenend.org.uk])
+AC_INIT([disorder], [2.0+], [richard+disorder@sfere.greenend.org.uk])
 AC_CONFIG_AUX_DIR([config.aux])
-AM_INIT_AUTOMAKE(disorder, [2.0])
+AM_INIT_AUTOMAKE(disorder, [2.0+])
 AC_CONFIG_SRCDIR([server/disorderd.c])
 AM_CONFIG_HEADER([config.h])
 
@@ -82,6 +82,12 @@ case "$host" in
   fi
   browser=open
   ;;
+*-freebsd* )
+  AC_MSG_RESULT([FreeBSD])
+  want_server=yes
+  LDFLAGS="${LDFLAGS} -L/usr/local/lib"
+  CPPFLAGS="${CPPFLAGS} -I/usr/local/include"
+  ;;
 * )
   AC_MSG_RESULT([unknown, winging it])
   want_server=no
@@ -233,9 +239,6 @@ if test ! -z "$missing_libraries"; then
   AC_MSG_ERROR([missing libraries:$missing_libraries])
 fi
 
-# We require that libpcre support UTF-8
-RJK_REQUIRE_PCRE_UTF8([-lpcre])
-
 # Checks for header files.
 RJK_FIND_GC_H
 if test $want_oss = yes; then
@@ -268,6 +271,9 @@ if test ! -z "$missing_headers"; then
   AC_MSG_ERROR([missing headers:$missing_headers])
 fi
 
+# We require that libpcre support UTF-8
+RJK_REQUIRE_PCRE_UTF8([-lpcre])
+
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_TYPE_SIZE_T