chiark
/
gitweb
/
~mdw
/
tripe
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
server: Compare MAC tags in constant time.
[tripe]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 54caf9d1ae48c44a73f88fb9fff451234e67e2c6..a394bb591a2a5e29a9ce22373513e05e53233bb7 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-41,6
+41,11
@@
AM_PROG_LIBTOOL
AC_CHECK_PROGS([AUTOM4TE], [autom4te])
AC_CHECK_PROGS([AUTOM4TE], [autom4te])
+mdw_ORIG_CFLAGS=$CFLAGS
+mdw_ORIG_CPPFLAGS=$CPPFLAGS
+AC_SUBST(AM_CFLAGS)
+AC_SUBST(AM_CPPFLAGS)
+
dnl--------------------------------------------------------------------------
dnl C programming environment.
dnl--------------------------------------------------------------------------
dnl C programming environment.
@@
-51,17
+56,17
@@
AC_SEARCH_LIBS([socket], [socket])
case "$host_os" in
linux)
AC_ARG_WITH([linux-includes],
case "$host_os" in
linux)
AC_ARG_WITH([linux-includes],
- AS_HELP_STRING(
+ AS_HELP_STRING(
[--with-linux-includes=DIR],
[Linux kernel includes]),
[--with-linux-includes=DIR],
[Linux kernel includes]),
- [
CFLAGS="$C
FLAGS -I$withval"], [:])
+ [
AM_CPPFLAGS="AM_CPP
FLAGS -I$withval"], [:])
;;
esac
PKG_CHECK_MODULES([mLib], [mLib >= 2.1.0])
;;
esac
PKG_CHECK_MODULES([mLib], [mLib >= 2.1.0])
-PKG_CHECK_MODULES([catacomb], [catacomb >= 2.1.
1
])
+PKG_CHECK_MODULES([catacomb], [catacomb >= 2.1.
4
])
-
CFLAGS="$
CFLAGS $mLib_CFLAGS $catacomb_CFLAGS"
+
AM_CFLAGS="$AM_
CFLAGS $mLib_CFLAGS $catacomb_CFLAGS"
dnl--------------------------------------------------------------------------
dnl Directories to install things into.
dnl--------------------------------------------------------------------------
dnl Directories to install things into.
@@
-117,19
+122,6
@@
AC_ARG_WITH([tracing],
AC_DEFINE([NTRACE], [1], [Disable all tracing.])],
[:])
AC_DEFINE([NTRACE], [1], [Disable all tracing.])],
[:])
-dnl--------------------------------------------------------------------------
-dnl Path MTU discovery.
-
-case $host_os in
- linux*)
- pmtu=yes
- ;;
- *)
- pmtu=no
- ;;
-esac
-AM_CONDITIONAL([PATHMTU], [test $pmtu = yes])
-
dnl--------------------------------------------------------------------------
dnl Tunnel devices.
dnl--------------------------------------------------------------------------
dnl Tunnel devices.
@@
-296,7
+288,7
@@
case "$haveshark,$needshark" in
AC_MSG_ERROR([failed to configure Wireshark plugin])
;;
yes,*)
AC_MSG_ERROR([failed to configure Wireshark plugin])
;;
yes,*)
- WIRESHARK_CFLAGS="$
CFLAGS $
GLIB_CFLAGS $mdw_cv_wireshark_includes"
+ WIRESHARK_CFLAGS="$GLIB_CFLAGS $mdw_cv_wireshark_includes"
AC_SUBST(WIRESHARK_CFLAGS)
AC_SUBST(wireshark_plugindir)
;;
AC_SUBST(WIRESHARK_CFLAGS)
AC_SUBST(wireshark_plugindir)
;;
@@
-307,6
+299,9
@@
AM_CONDITIONAL([HAVE_WIRESHARK], [test "$haveshark" = yes])
dnl--------------------------------------------------------------------------
dnl Produce output.
dnl--------------------------------------------------------------------------
dnl Produce output.
+CFLAGS=$mdw_ORIG_CFLAGS
+CPPFLAGS=$mdw_ORIG_CPPFLAGS
+
AC_CONFIG_HEADER([config/config.h])
AC_CONFIG_TESTDIR([t])
AC_CONFIG_HEADER([config/config.h])
AC_CONFIG_TESTDIR([t])
@@
-327,6
+322,7
@@
AC_CONFIG_FILES(
[keys/Makefile]
[svc/Makefile]
[mon/Makefile]
[keys/Makefile]
[svc/Makefile]
[mon/Makefile]
+ [contrib/Makefile]
[t/Makefile t/atlocal])
AC_OUTPUT
[t/Makefile t/atlocal])
AC_OUTPUT