chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
exercise make_home()
[disorder]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index ece08f16f0981ff2d619584af3c3c611f2061910..7346b9c72485815363c22b262bbe16152be3b320 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,3
+1,4
@@
+
# Process this file with autoconf to produce a configure script.
#
# This file is part of DisOrder.
# Process this file with autoconf to produce a configure script.
#
# This file is part of DisOrder.
@@
-427,6
+428,10
@@
AC_CHECK_FUNCS([fdatasync],[:],[
if test ! -z "$missing_functions"; then
AC_MSG_ERROR([missing functions:$missing_functions])
fi
if test ! -z "$missing_functions"; then
AC_MSG_ERROR([missing functions:$missing_functions])
fi
+
+# Functions we can take or leave
+AC_CHECK_FUNCS([fls])
+
if test $want_server = yes; then
# <db.h> had better be version 3 or later
AC_CACHE_CHECK([db.h version],[rjk_cv_db_version],[
if test $want_server = yes; then
# <db.h> had better be version 3 or later
AC_CACHE_CHECK([db.h version],[rjk_cv_db_version],[
@@
-450,6
+455,11
@@
if test $want_server = yes; then
fi
fi
fi
fi
+AM_CONDITIONAL([SERVER], [test x$want_server = xyes])
+if test $want_gtk = yes; then
+ AC_DEFINE([WITH_GTK], [1], [define if using GTK+])
+fi
+
if test "x$GCC" = xyes; then
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29478
AC_CACHE_CHECK([checking for GCC bug 29478],[rjk_cv_pr29478],[
if test "x$GCC" = xyes; then
# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29478
AC_CACHE_CHECK([checking for GCC bug 29478],[rjk_cv_pr29478],[
@@
-488,7
+498,12
@@
if test "x$GCC" = xyes; then
rjk_cv_werror, [
save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} ${GTK_CFLAGS} -Werror"
rjk_cv_werror, [
save_CFLAGS="${CFLAGS}"
CFLAGS="${CFLAGS} ${GTK_CFLAGS} -Werror"
- AC_TRY_COMPILE([#include <gtk/gtk.h>],
+ AC_TRY_COMPILE([#if WITH_GTK
+ #include <gtk/gtk.h>
+#endif
+
+struct s { int a, b; };
+const struct s sv = { .a = 1 };],
[],
[rjk_cv_werror=yes],
[rjk_cv_werror=no])
[],
[rjk_cv_werror=yes],
[rjk_cv_werror=no])