~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Recognize FreeBSD and adjust LDFLAGS/CPPFLAGS to cope with
[disorder]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
99b2e97
..
c167d8d
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-2,6
+2,7
@@
#
# This file is part of DisOrder.
# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
#
# This file is part of DisOrder.
# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
+# Portions copyright (C) 2007 Ross Younger
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-19,9
+20,9
@@
# USA
#
# USA
#
-AC_INIT([disorder], [
1.5.99
+], [richard+disorder@sfere.greenend.org.uk])
+AC_INIT([disorder], [
2.0
+], [richard+disorder@sfere.greenend.org.uk])
AC_CONFIG_AUX_DIR([config.aux])
AC_CONFIG_AUX_DIR([config.aux])
-AM_INIT_AUTOMAKE(disorder, [
1.5.99
+])
+AM_INIT_AUTOMAKE(disorder, [
2.0
+])
AC_CONFIG_SRCDIR([server/disorderd.c])
AM_CONFIG_HEADER([config.h])
AC_CONFIG_SRCDIR([server/disorderd.c])
AM_CONFIG_HEADER([config.h])
@@
-81,6
+82,12
@@
case "$host" in
fi
browser=open
;;
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
* )
AC_MSG_RESULT([unknown, winging it])
want_server=no
@@
-232,9
+239,6
@@
if test ! -z "$missing_libraries"; then
AC_MSG_ERROR([missing libraries:$missing_libraries])
fi
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
# Checks for header files.
RJK_FIND_GC_H
if test $want_oss = yes; then
@@
-267,6
+271,9
@@
if test ! -z "$missing_headers"; then
AC_MSG_ERROR([missing headers:$missing_headers])
fi
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
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
AC_TYPE_SIZE_T
@@
-466,10
+473,10
@@
if test "x$GCC" = xyes; then
if test $rjk_cv_shadow = yes; then
CC="${CC} -Wshadow"
fi
if test $rjk_cv_shadow = yes; then
CC="${CC} -Wshadow"
fi
-
-
fi
fi
+RJK_GCOV
+
AH_BOTTOM([#ifdef __GNUC__
# define attribute(x) __attribute__(x)
#else
AH_BOTTOM([#ifdef __GNUC__
# define attribute(x) __attribute__(x)
#else