projects
/
tinc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Mention in the manual that multiple Address staments are allowed.
[tinc]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index
1cea02f
..
75456a0
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,12
+1,11
@@
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
dnl Process this file with autoconf to produce a configure script.
AC_PREREQ(2.61)
-AC_INIT([tinc], [1.1pre
7
])
+AC_INIT([tinc], [1.1pre
9
])
AC_CONFIG_SRCDIR([src/tincd.c])
AC_GNU_SOURCE
AC_CONFIG_SRCDIR([src/tincd.c])
AC_GNU_SOURCE
-AM_INIT_AUTOMAKE([check-news
dist-bzip2 std-options subdir-objects
])
+AM_INIT_AUTOMAKE([check-news
std-options subdir-objects -Wall
])
AC_CONFIG_HEADERS([config.h])
AC_CONFIG_HEADERS([config.h])
-AM_MAINTAINER_MODE
# Enable GNU extensions.
# Define this here, not in acconfig's @TOP@ section, since definitions
# Enable GNU extensions.
# Define this here, not in acconfig's @TOP@ section, since definitions
@@
-21,6
+20,8
@@
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_RANLIB
AC_PROG_LN_S
AC_PROG_RANLIB
+AM_PROG_CC_C_O
+
dnl Check and set OS
AC_CANONICAL_HOST
dnl Check and set OS
AC_CANONICAL_HOST
@@
-200,8
+201,8
@@
else
tinc_OPENSSL
fi
tinc_OPENSSL
fi
-AM_CONDITIONAL(OPENSSL, test
"$openssl" = true
)
-AM_CONDITIONAL(GCRYPT, test "$grypt" = true)
+AM_CONDITIONAL(OPENSSL, test
-n "$openssl"
)
+AM_CONDITIONAL(GCRYPT, test "$g
c
rypt" = true)
dnl Check if support for jumbograms is requested
AC_ARG_ENABLE(jumbograms,
dnl Check if support for jumbograms is requested
AC_ARG_ENABLE(jumbograms,
@@
-211,8
+212,6
@@
AC_ARG_ENABLE(jumbograms,
]
)
]
)
-AC_SUBST(INCLUDES)
-
-AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile m4/Makefile gui/Makefile])
+AC_CONFIG_FILES([Makefile src/Makefile doc/Makefile m4/Makefile gui/Makefile test/Makefile])
AC_OUTPUT
AC_OUTPUT