[ViewVC] Diff of: cvs/gvpe/configure.ac

Comparing gvpe/configure.ac (file contents):
Revision 1.38 by pcg, Fri Mar 18 02:32:20 2005 UTC vs.
Revision 1.58 by root, Tue Mar 8 17:33:30 2011 UTC

…		…
2		2
3	AC_PREREQ(2.59)	3	AC_PREREQ(2.59)
4	AC_INIT	4	AC_INIT
5	AC_CONFIG_SRCDIR([src/gvpe.C])	5	AC_CONFIG_SRCDIR([src/gvpe.C])
6	AC_CANONICAL_TARGET	6	AC_CANONICAL_TARGET
7	AM_INIT_AUTOMAKE(gvpe, 1.8)	7	AM_INIT_AUTOMAKE(gvpe, 2.24)
8	AC_CONFIG_HEADERS([config.h])	8	AC_CONFIG_HEADERS([config.h])
9	AM_MAINTAINER_MODE	9	AM_MAINTAINER_MODE
10		10
11	AH_TOP([	11	AH_TOP([
12	#ifndef CONFIG_H__	12	#ifndef CONFIG_H__
…		…
55	AM_GNU_GETTEXT_VERSION(0.11.5)	55	AM_GNU_GETTEXT_VERSION(0.11.5)
56		56
57	# Enable GNU extensions.	57	# Enable GNU extensions.
58	# Define this here, not in acconfig's @TOP@ section, since definitions	58	# Define this here, not in acconfig's @TOP@ section, since definitions
59	# in the latter don't make it into the configure-time tests.	59	# in the latter don't make it into the configure-time tests.
60	AC_DEFINE([_GNU_SOURCE], 1, [Enable GNU extenstions])	60	AC_DEFINE([_GNU_SOURCE], 1, [Enable GNU extensions])
61		61
62	# do NOT define POSIX_SOURCE, sicne this clashes with many BSDs	62	# do NOT define POSIX_SOURCE, sicne this clashes with many BSDs
63	dnl AC_DEFINE([_POSIX_SOURCE], 1, [Enable POSIX 1003.1 extensions])	63	dnl AC_DEFINE([_POSIX_SOURCE], 1, [Enable POSIX 1003.1 extensions])
64	dnl AC_DEFINE([_XOPEN_SOURCE], 500, [Enable XOPEN extensions])	64	dnl AC_DEFINE([_XOPEN_SOURCE], 500, [Enable XOPEN extensions])
65		65
66	ALL_LINGUAS=""	66	ALL_LINGUAS=""
67		67
68	dnl Checks for programs.	68	dnl Checks for programs.
69	AC_PROG_CC
70	AC_PROG_CPP	69	AC_PROG_CPP
71	AC_PROG_CXX	70	AC_PROG_CXX
72	AC_PROG_GCC_TRADITIONAL	71	AC_PROG_GCC_TRADITIONAL
73	AC_PROG_AWK	72	AC_PROG_AWK
74	AC_PROG_INSTALL	73	AC_PROG_INSTALL
…		…
77	AC_PROG_RANLIB	76	AC_PROG_RANLIB
78		77
79	AC_ARG_ENABLE(iftype,	78	AC_ARG_ENABLE(iftype,
80	[AS_HELP_STRING(--enable-iftype=TYPE/SUBTYPE,	79	[AS_HELP_STRING(--enable-iftype=TYPE/SUBTYPE,
81	Use kernel/net device interface TYPE/SUBTYPE.	80	Use kernel/net device interface TYPE/SUBTYPE.
82	Working combinations are:	81	Working combinations are (see doc/gvpe.osdep.5.pod):
83	"native/linux"	82	"native/linux"
84	"tincd/linux"	83	"tincd/linux"
		84	"tincd/netbsd"
85	"tincd/freebsd"	85	"tincd/freebsd"
86	"tincd/openbsd"	86	"tincd/openbsd"
		87	"native/darwin"
87	"tincd/darwin"	88	"tincd/darwin"
88	"native/cygwin";	89	"native/cygwin";
89	Untested combinations are:	90	Untested combinations are:
90	"tincd/netbsd"	91	"tincd/bsd"
91	"tincd/solaris"	92	"tincd/solaris"
92	"tincd/mingw"	93	"tincd/mingw"
93	"tincd/raw_socket"	94	"tincd/raw_socket"
94	"tincd/uml_socket";	95	"tincd/uml_socket";
95	Broken combinations are:	96	Broken combinations are:
…		…
116	IFTYPE=tincd	117	IFTYPE=tincd
117	IFSUBTYPE=freebsd	118	IFSUBTYPE=freebsd
118	AC_DEFINE(HAVE_FREEBSD, 1, [FreeBSD])	119	AC_DEFINE(HAVE_FREEBSD, 1, [FreeBSD])
119	;;	120	;;
120	darwin)	121	darwin)
121	IFTYPE=tincd	122	IFTYPE=native
122	IFSUBTYPE=darwin	123	IFSUBTYPE=darwin
123	AC_DEFINE(HAVE_DARWIN, 1, [Darwin (MacOS/X)])	124	AC_DEFINE(HAVE_DARWIN, 1, [Darwin (MacOS/X)])
124	;;	125	;;
125	solaris)	126	solaris)
126	IFTYPE=tincd	127	IFTYPE=tincd
…		…
156	AC_CACHE_SAVE	157	AC_CACHE_SAVE
157		158
158	dnl Checks for libraries.	159	dnl Checks for libraries.
159		160
160	AC_LANG(C++)	161	AC_LANG(C++)
161	AC_CHECK_HEADERS(ext/hash_map clocale)	162	AC_CHECK_HEADERS(tr1/unordered_map ext/hash_map clocale)
162		163
163	dnl Checks for header files.	164	dnl Checks for header files.
164	AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \	165	AC_CHECK_HEADERS([fcntl.h inttypes.h limits.h malloc.h stdint.h strings.h syslog.h unistd.h \
165	sys/file.h sys/ioctl.h sys/param.h sys/time.h netinet/in_systm.h sys/cygwin.h \	166	sys/file.h sys/ioctl.h sys/param.h sys/time.h netinet/in_systm.h sys/cygwin.h \
166	sys/mman.h netinet/in.h])	167	sys/mman.h netinet/in.h])
…		…
224	])	225	])
225	AC_CHECK_FUNC(gethostbyname, [], [	226	AC_CHECK_FUNC(gethostbyname, [], [
226	AC_CHECK_LIB(nsl, gethostbyname)	227	AC_CHECK_LIB(nsl, gethostbyname)
227	])	228	])
228		229
		230	dnl libev support
		231	m4_include([libev/libev.m4])
		232
229	AC_LANG_POP	233	AC_LANG_POP
230		234
231	dnl AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo])	235	dnl AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo])
232		236
233	AC_CACHE_SAVE	237	AC_CACHE_SAVE
…		…
239	if test "x$openssl_include" != x; then	243	if test "x$openssl_include" != x; then
240	CXXFLAGS="$CXXFLAGS -I$openssl_include"	244	CXXFLAGS="$CXXFLAGS -I$openssl_include"
241	fi	245	fi
242	dnl tinc_ZLIB	246	dnl tinc_ZLIB
243		247
		248	AC_ARG_ENABLE(threads,
		249	[AS_HELP_STRING(--enable-threads,try to use threads for long-running asynchronous operations (default enabled).)],
		250	[try_threads=$enableval],
		251	[try_threads=yes]
		252	)
		253
		254	if test "x$try_threads" = xyes; then
		255	AC_CHECK_HEADER(pthread.h,[
		256	LIBS="$LIBS -lpthread"
		257	AC_COMPILE_IFELSE(
		258	[AC_LANG_PROGRAM([#include <pthread.h>], [pthread_t id; pthread_create (&id, 0, 0, 0);])],
		259	[AC_DEFINE_UNQUOTED(ENABLE_PTHREADS, 1, [POSIX thread support.])]
		260	)
		261	])
		262	fi
		263
244	AC_ARG_ENABLE(static-daemon,	264	AC_ARG_ENABLE(static-daemon,
245	[AS_HELP_STRING(--enable-static-daemon,enable statically linked daemon.)],	265	[AS_HELP_STRING(--enable-static-daemon,enable statically linked daemon.)],
246	[LDFLAGS_DAEMON=-static]	266	[LDFLAGS_DAEMON=-static]
247	)	267	)
248	AC_SUBST(LDFLAGS_DAEMON)	268	AC_SUBST(LDFLAGS_DAEMON)
249		269
250	AC_ARG_ENABLE(rohc,	270	dnl AC_ARG_ENABLE(rohc,
251	[AS_HELP_STRING(--enable-rohc,enable robust header compression (rfc3095).)],	271	dnl [AS_HELP_STRING(--enable-rohc,enable robust header compression (rfc3095).)],
252	[	272	dnl [
253	echo	273	dnl echo
254	echo "**********************************************************************"	274	dnl echo "**********************************************************************"
255	echo "**********************************************************************"	275	dnl echo "**********************************************************************"
256	echo "** --enable-rohc is highly experimental, do not use **************"	276	dnl echo "** --enable-rohc is highly experimental, do not use **************"
257	echo "**********************************************************************"	277	dnl echo "**********************************************************************"
258	echo "**********************************************************************"	278	dnl echo "**********************************************************************"
259	echo	279	dnl echo
260	rohc=true	280	dnl rohc=true
261	AC_DEFINE_UNQUOTED(ENABLE_ROHC, 1, [ROHC support])	281	dnl AC_DEFINE_UNQUOTED(ENABLE_ROHC, 1, [ROHC support])
262	]	282	dnl ]
263	)	283	dnl )
264		284
265	AM_CONDITIONAL(ROHC, test x$rohc = xtrue)	285	AM_CONDITIONAL(ROHC, test x$rohc = xtrue)
266		286
		287	dnl AC_ARG_ENABLE(bridging,
		288	dnl [AS_HELP_STRING(--enable-bridging,enable bridging support (default disabled).)],
		289	dnl AC_DEFINE_UNQUOTED(ENABLE_BRIDGING, 1, [bridging support.])
		290	dnl )
		291
		292	ICMP=1
267	AC_ARG_ENABLE(icmp,	293	AC_ARG_ENABLE(icmp,
268	[AS_HELP_STRING(--enable-icmp,enable icmp protocol support (default disabled).)],	294	[AS_HELP_STRING(--disable-icmp,enable icmp protocol support (default enabled).)],
		295	if test "x$enableval" = xno; then
		296	ICMP=0
		297	fi
		298	)
		299	if test "x$ICMP" = x1; then
269	AC_DEFINE_UNQUOTED(ENABLE_ICMP, 1, [ICMP protocol support.])	300	AC_DEFINE_UNQUOTED(ENABLE_ICMP, 1, [ICMP protocol support.])
270	)	301	fi
271		302
		303	TCP=1
272	AC_ARG_ENABLE(tcp,	304	AC_ARG_ENABLE(tcp,
273	[AS_HELP_STRING(--enable-tcp,enable tcp protocol support (default disabled).)],	305	[AS_HELP_STRING(--disable-tcp,enable tcp protocol support (default enabled).)],
		306	if test "x$enableval" = xno; then
		307	TCP=0
		308	fi
		309	)
		310	if test "x$TCP" = x1; then
274	AC_DEFINE_UNQUOTED(ENABLE_TCP, 1, [TCP protocol support.])	311	AC_DEFINE_UNQUOTED(ENABLE_TCP, 1, [TCP protocol support.])
		312	fi
		313
		314	HTTP=1
		315	AC_ARG_ENABLE(http-proxy,
		316	[AS_HELP_STRING(--disable-http-proxy,enable http proxy connect support (default enabled).)],
		317	if test "x$enableval" = xno; then
		318	HTTP=0
		319	fi
275	)	320	)
		321	if test "x$HTTP" = x1; then
		322	AC_DEFINE_UNQUOTED(ENABLE_HTTP_PROXY, 1, [http proxy connect support.])
		323	fi
276		324
277	AC_ARG_ENABLE(dns,	325	AC_ARG_ENABLE(dns,
278	[AS_HELP_STRING(--enable-dns,enable dns tunnel protocol support (DOES NOT WORK).)],	326	[AS_HELP_STRING(--enable-dns,enable dns tunnel protocol support (default disabled).)],
279	[	327	[
280	AC_CHECK_HEADER(gmp.h,,[AC_MSG_ERROR([gmp.h not found, required for --enable-dns])])	328	AC_CHECK_HEADER(gmp.h,,[AC_MSG_ERROR([gmp.h not found, required for --enable-dns])])
281	AC_CHECK_LIB(gmp,main,,[AC_MSG_ERROR([libgmp not found, required for --enable-dns])])	329	AC_CHECK_LIB(gmp,main,,[AC_MSG_ERROR([libgmp not found, required for --enable-dns])])
282		330
283	AC_DEFINE_UNQUOTED(ENABLE_DNS, 1, [DNS tunnel protocol support.])	331	AC_DEFINE_UNQUOTED(ENABLE_DNS, 1, [DNS tunnel protocol support.])
284	]	332	]
285	)
286
287	AC_ARG_ENABLE(http-proxy,
288	[AS_HELP_STRING(--enable-http-proxy,enable http proxy connect support (default disabled).)],
289	AC_DEFINE_UNQUOTED(ENABLE_HTTP_PROXY, 1, [http proxy connect support.])
290	)	333	)
291		334
292	HMAC=12	335	HMAC=12
293	AC_ARG_ENABLE(hmac-length,	336	AC_ARG_ENABLE(hmac-length,
294	[AS_HELP_STRING(--enable-hmac-length=BYTES,[	337	[AS_HELP_STRING(--enable-hmac-length=BYTES,[
…		…
304	RAND=$enableval	347	RAND=$enableval
305	)	348	)
306	AC_DEFINE_UNQUOTED(RAND_SIZE, $RAND, [Add this many bytes of randomness to each packet.])	349	AC_DEFINE_UNQUOTED(RAND_SIZE, $RAND, [Add this many bytes of randomness to each packet.])
307		350
308	MTU=1500	351	MTU=1500
309	AC_ARG_ENABLE(mtu,	352	AC_ARG_ENABLE(max-mtu,
310	[AS_HELP_STRING(--enable-max-mtu=BYTES,enable mtu sizes upto BYTES bytes (default 1500). Use 9100 for jumbogram support.)],	353	[AS_HELP_STRING(--enable-max-mtu=BYTES,enable mtu sizes upto BYTES bytes (default 1500). Use 9100 for jumbogram support.)],
311	MTU=$enableval	354	MTU=$enableval
312	)	355	)
313	AC_DEFINE_UNQUOTED(MAX_MTU, $MTU + 14, [Maximum MTU supported.])	356	AC_DEFINE_UNQUOTED(MAX_MTU, $MTU + 14, [Maximum MTU supported.])
314		357
…		…
319	COMPRESS=0	362	COMPRESS=0
320	fi	363	fi
321	)	364	)
322	AC_DEFINE_UNQUOTED(ENABLE_COMPRESSION, $COMPRESS, [Enable compression support.])	365	AC_DEFINE_UNQUOTED(ENABLE_COMPRESSION, $COMPRESS, [Enable compression support.])
323		366
324	CIPHER=bf_cbc	367	CIPHER=aes_128_cbc
325	AC_ARG_ENABLE(cipher,	368	AC_ARG_ENABLE(cipher,
326	[AS_HELP_STRING(--enable-cipher,[	369	[AS_HELP_STRING(--enable-cipher=CIPHER,[
327	Select the symmetric cipher (default "bf").	370	Select the symmetric cipher (default "aes-128").
328	Must be one of "bf" (blowfish), "aes-128" (rijndael), "aes-192" or "aes-256".])],	371	Must be one of "bf" (blowfish), "aes-128" (rijndael), "aes-192" or "aes-256".])],
329	if test "x$enableval" = xbf ; then CIPHER=bf_cbc ; fi	372	if test "x$enableval" = xbf ; then CIPHER=bf_cbc ; fi
330	if test "x$enableval" = xaes-128; then CIPHER=aes_128_cbc; fi	373	if test "x$enableval" = xaes-128; then CIPHER=aes_128_cbc; fi
331	if test "x$enableval" = xaes-192; then CIPHER=aes_192_cbc; fi	374	if test "x$enableval" = xaes-192; then CIPHER=aes_192_cbc; fi
332	if test "x$enableval" = xaes-256; then CIPHER=aes_256_cbc; fi	375	if test "x$enableval" = xaes-256; then CIPHER=aes_256_cbc; fi
333	)	376	)
334	AC_DEFINE_UNQUOTED(ENABLE_CIPHER, EVP_${CIPHER}, [Select the symmetric cipher to use.])	377	AC_DEFINE_UNQUOTED(ENABLE_CIPHER, EVP_${CIPHER}, [Select the symmetric cipher to use.])
335		378
336	DIGEST=sha1	379	DIGEST=ripemd160
337	AC_ARG_ENABLE(digest,	380	AC_ARG_ENABLE(digest,
338	[AS_HELP_STRING(--enable-digest,[	381	[AS_HELP_STRING(--enable-digest=CIPHER,[
339	Select the digets algorithm to use (default "sha1"). Must be one of	382	Select the digest algorithm to use (default "ripemd160"). Must be one of
340	"sha1", "ripemd160", "md5" or "md4" (insecure).])],	383	"sha512", "sha256", "sha1" (somewhat insecure), "ripemd160", "md5" (insecure) or "md4" (insecure).])],
		384	if test "x$enableval" = xsha512 ; then DIGEST=sha512 ; fi
		385	if test "x$enableval" = xsha256 ; then DIGEST=sha256 ; fi
341	if test "x$enableval" = xsha1 ; then DIGEST=sha1 ; fi	386	if test "x$enableval" = xsha1 ; then DIGEST=sha1 ; fi
342	if test "x$enableval" = xripemd160; then DIGEST=ripemd160; fi	387	if test "x$enableval" = xripemd160; then DIGEST=ripemd160; fi
343	if test "x$enableval" = xmd5 ; then DIGEST=md5 ; fi	388	if test "x$enableval" = xmd5 ; then DIGEST=md5 ; fi
344	if test "x$enableval" = xmd4 ; then DIGEST=md4 ; fi	389	if test "x$enableval" = xmd4 ; then DIGEST=md4 ; fi
345	)	390	)
…		…
347		392
348	if $CXX -v --help 2>&1 \| grep -q fno-rtti; then	393	if $CXX -v --help 2>&1 \| grep -q fno-rtti; then
349	CXXFLAGS="$CXXFLAGS -fno-rtti"	394	CXXFLAGS="$CXXFLAGS -fno-rtti"
350	fi	395	fi
351		396
352	if $CXX -v --help 2>&1 \| grep -q fexceptions; then	397	#if $CXX -v --help 2>&1 \| grep -q fexceptions; then
353	CXXFLAGS="$CXXFLAGS -fno-exceptions"	398	# CXXFLAGS="$CXXFLAGS -fno-exceptions"
354	fi	399	#fi
		400
		401	LIBS="$EXTRA_LIBS $LIBS"
355		402
356	dnl if $CXX -v --help 2>&1 \| grep -q ffunction-sections; then	403	dnl if $CXX -v --help 2>&1 \| grep -q ffunction-sections; then
357	dnl CXXFLAGS="$CXXFLAGS -ffunction-sections"	404	dnl CXXFLAGS="$CXXFLAGS -ffunction-sections"
358	dnl fi	405	dnl fi
359	dnl	406	dnl
360	dnl if $LD -v --help 2>&1 \| grep -q gc-sections; then	407	dnl if $LD -v --help 2>&1 \| grep -q gc-sections; then
361	dnl LDFLAGS="$LDFLAGS -Wl,--gc-sections"	408	dnl LDFLAGS="$LDFLAGS -Wl,--gc-sections"
362	dnl fi	409	dnl fi
363		410
364	AC_CONFIG_COMMANDS_POST([	411	AC_SUBST(INCLUDES)
		412
		413	AC_CONFIG_FILES([Makefile po/Makefile.in
		414	src/Makefile
		415	doc/Makefile
		416	lib/Makefile
		417	m4/Makefile
		418	])
		419	AC_OUTPUT
365		420
366	echo	421	echo
367	echo "***"	422	echo "***"
368	echo "*** Configuration Summary"	423	echo "*** Configuration Summary"
369	echo "***"	424	echo "***"
…		…
371	echo "*** Cipher used: $CIPHER"	426	echo "*** Cipher used: $CIPHER"
372	echo "*** Digest used: $DIGEST"	427	echo "*** Digest used: $DIGEST"
373	echo "*** HMAC length: $HMAC"	428	echo "*** HMAC length: $HMAC"
374	echo "*** RAND used: $RAND"	429	echo "*** RAND used: $RAND"
375	echo "*** Max. MTU: $MTU"	430	echo "*** Max. MTU: $MTU"
376	echo "*** Compression: $COMPRESS"	431
		432	echo "***"
		433	echo "*** Enable options:"
		434	grep ENABLE_ config.h \| sed -e 's/^/*** /'
377		435
378	if test "x$DIGEST" = xmd4; then	436	if test "x$DIGEST" = xmd4; then
379	echo "***"	437	echo "***"
380	echo "*** WARNING: The digest you have chosen ($DIGEST) is known to be insecure"	438	echo "*** WARNING: The digest you have chosen ($DIGEST) is known to be insecure"
381	fi	439	fi
382		440
		441	if test "x$DIGEST" = xmd5; then
		442	echo "***"
		443	echo "*** WARNING: The digest you have chosen ($DIGEST) is probably insecure"
		444	fi
		445
383	if test "$HMAC" -lt 12; then	446	if test "$HMAC" -lt 12; then
384	echo "***"	447	echo "***"
385	echo "*** WARNING: The hmac length you have chosen ($HMAC) is probably insecure"	448	echo "*** WARNING: The hmac length you have chosen ($HMAC) is probably insecure"
386	fi	449	fi
387		450
…		…
389	echo "***"	452	echo "***"
390	echo "*** WARNING: The random prefix you have chosen ($RAND) is probably insecure"	453	echo "*** WARNING: The random prefix you have chosen ($RAND) is probably insecure"
391	fi	454	fi
392		455
393	echo "***"	456	echo "***"
394
395	echo	457	echo
396		458
397	])
398		459
399	AC_SUBST(INCLUDES)
400
401	AC_CONFIG_FILES([Makefile po/Makefile.in
402	src/Makefile
403	doc/Makefile
404	lib/Makefile
405	m4/Makefile
406	])
407	AC_OUTPUT

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing gvpe/configure.ac (file contents): Revision 1.38 by pcg, Fri Mar 18 02:32:20 2005 UTC vs. Revision 1.58 by root, Tue Mar 8 17:33:30 2011 UTC

Diff Legend

Comparing gvpe/configure.ac (file contents):
Revision 1.38 by pcg, Fri Mar 18 02:32:20 2005 UTC vs.
Revision 1.58 by root, Tue Mar 8 17:33:30 2011 UTC