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

Comparing gvpe/configure.ac (file contents):
Revision 1.40 by pcg, Wed Mar 23 20:22:01 2005 UTC vs.
Revision 1.53 by pcg, Sun Jan 18 03:45:28 2009 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.9)	7	AM_INIT_AUTOMAKE(gvpe, 2.22)
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
…		…
87	"tincd/openbsd"	86	"tincd/openbsd"
88	"native/darwin"	87	"native/darwin"
89	"tincd/darwin"	88	"tincd/darwin"
90	"native/cygwin";	89	"native/cygwin";
91	Untested combinations are:	90	Untested combinations are:
		91	"tincd/bsd"
92	"tincd/solaris"	92	"tincd/solaris"
93	"tincd/mingw"	93	"tincd/mingw"
94	"tincd/raw_socket"	94	"tincd/raw_socket"
95	"tincd/uml_socket";	95	"tincd/uml_socket";
96	Broken combinations are:	96	Broken combinations are:
…		…
157	AC_CACHE_SAVE	157	AC_CACHE_SAVE
158		158
159	dnl Checks for libraries.	159	dnl Checks for libraries.
160		160
161	AC_LANG(C++)	161	AC_LANG(C++)
162	AC_CHECK_HEADERS(ext/hash_map clocale)	162	AC_CHECK_HEADERS(tr1/unordered_map ext/hash_map clocale)
163		163
164	dnl Checks for header files.	164	dnl Checks for header files.
165	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 \
166	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 \
167	sys/mman.h netinet/in.h])	167	sys/mman.h netinet/in.h])
…		…
225	])	225	])
226	AC_CHECK_FUNC(gethostbyname, [], [	226	AC_CHECK_FUNC(gethostbyname, [], [
227	AC_CHECK_LIB(nsl, gethostbyname)	227	AC_CHECK_LIB(nsl, gethostbyname)
228	])	228	])
229		229
		230	dnl libev support
		231	m4_include([libev/libev.m4])
		232
230	AC_LANG_POP	233	AC_LANG_POP
231		234
232	dnl AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo])	235	dnl AC_CHECK_FUNCS([freeaddrinfo gai_strerror getaddrinfo getnameinfo])
233		236
234	AC_CACHE_SAVE	237	AC_CACHE_SAVE
…		…
246	[AS_HELP_STRING(--enable-static-daemon,enable statically linked daemon.)],	249	[AS_HELP_STRING(--enable-static-daemon,enable statically linked daemon.)],
247	[LDFLAGS_DAEMON=-static]	250	[LDFLAGS_DAEMON=-static]
248	)	251	)
249	AC_SUBST(LDFLAGS_DAEMON)	252	AC_SUBST(LDFLAGS_DAEMON)
250		253
251	AC_ARG_ENABLE(rohc,	254	dnl AC_ARG_ENABLE(rohc,
252	[AS_HELP_STRING(--enable-rohc,enable robust header compression (rfc3095).)],	255	dnl [AS_HELP_STRING(--enable-rohc,enable robust header compression (rfc3095).)],
253	[	256	dnl [
254	echo	257	dnl echo
255	echo "**********************************************************************"	258	dnl echo "**********************************************************************"
256	echo "**********************************************************************"	259	dnl echo "**********************************************************************"
257	echo "** --enable-rohc is highly experimental, do not use **************"	260	dnl echo "** --enable-rohc is highly experimental, do not use **************"
258	echo "**********************************************************************"	261	dnl echo "**********************************************************************"
259	echo "**********************************************************************"	262	dnl echo "**********************************************************************"
260	echo	263	dnl echo
261	rohc=true	264	dnl rohc=true
262	AC_DEFINE_UNQUOTED(ENABLE_ROHC, 1, [ROHC support])	265	dnl AC_DEFINE_UNQUOTED(ENABLE_ROHC, 1, [ROHC support])
263	]	266	dnl ]
264	)	267	dnl )
265		268
266	AM_CONDITIONAL(ROHC, test x$rohc = xtrue)	269	AM_CONDITIONAL(ROHC, test x$rohc = xtrue)
267		270
		271	dnl AC_ARG_ENABLE(bridging,
		272	dnl [AS_HELP_STRING(--enable-bridging,enable bridging support (default disabled).)],
		273	dnl AC_DEFINE_UNQUOTED(ENABLE_BRIDGING, 1, [bridging support.])
		274	dnl )
		275
		276	ICMP=1
268	AC_ARG_ENABLE(icmp,	277	AC_ARG_ENABLE(icmp,
269	[AS_HELP_STRING(--enable-icmp,enable icmp protocol support (default disabled).)],	278	[AS_HELP_STRING(--disable-icmp,enable icmp protocol support (default enabled).)],
		279	if test "x$enableval" = xno; then
		280	ICMP=0
		281	fi
		282	)
		283	if test "x$ICMP" = x1; then
270	AC_DEFINE_UNQUOTED(ENABLE_ICMP, 1, [ICMP protocol support.])	284	AC_DEFINE_UNQUOTED(ENABLE_ICMP, 1, [ICMP protocol support.])
271	)	285	fi
272		286
		287	TCP=1
273	AC_ARG_ENABLE(tcp,	288	AC_ARG_ENABLE(tcp,
274	[AS_HELP_STRING(--enable-tcp,enable tcp protocol support (default disabled).)],	289	[AS_HELP_STRING(--disable-tcp,enable tcp protocol support (default enabled).)],
		290	if test "x$enableval" = xno; then
		291	TCP=0
		292	fi
		293	)
		294	if test "x$TCP" = x1; then
275	AC_DEFINE_UNQUOTED(ENABLE_TCP, 1, [TCP protocol support.])	295	AC_DEFINE_UNQUOTED(ENABLE_TCP, 1, [TCP protocol support.])
		296	fi
		297
		298	HTTP=1
		299	AC_ARG_ENABLE(http-proxy,
		300	[AS_HELP_STRING(--disable-http-proxy,enable http proxy connect support (default enabled).)],
		301	if test "x$enableval" = xno; then
		302	HTTP=0
		303	fi
276	)	304	)
		305	if test "x$HTTP" = x1; then
		306	AC_DEFINE_UNQUOTED(ENABLE_HTTP_PROXY, 1, [http proxy connect support.])
		307	fi
277		308
278	AC_ARG_ENABLE(dns,	309	AC_ARG_ENABLE(dns,
279	[AS_HELP_STRING(--enable-dns,enable dns tunnel protocol support (DOES NOT WORK).)],	310	[AS_HELP_STRING(--enable-dns,enable dns tunnel protocol support (default disabled).)],
280	[	311	[
281	AC_CHECK_HEADER(gmp.h,,[AC_MSG_ERROR([gmp.h not found, required for --enable-dns])])	312	AC_CHECK_HEADER(gmp.h,,[AC_MSG_ERROR([gmp.h not found, required for --enable-dns])])
282	AC_CHECK_LIB(gmp,main,,[AC_MSG_ERROR([libgmp not found, required for --enable-dns])])	313	AC_CHECK_LIB(gmp,main,,[AC_MSG_ERROR([libgmp not found, required for --enable-dns])])
283		314
284	AC_DEFINE_UNQUOTED(ENABLE_DNS, 1, [DNS tunnel protocol support.])	315	AC_DEFINE_UNQUOTED(ENABLE_DNS, 1, [DNS tunnel protocol support.])
285	]	316	]
286	)
287
288	AC_ARG_ENABLE(http-proxy,
289	[AS_HELP_STRING(--enable-http-proxy,enable http proxy connect support (default disabled).)],
290	AC_DEFINE_UNQUOTED(ENABLE_HTTP_PROXY, 1, [http proxy connect support.])
291	)	317	)
292		318
293	HMAC=12	319	HMAC=12
294	AC_ARG_ENABLE(hmac-length,	320	AC_ARG_ENABLE(hmac-length,
295	[AS_HELP_STRING(--enable-hmac-length=BYTES,[	321	[AS_HELP_STRING(--enable-hmac-length=BYTES,[
…		…
320	COMPRESS=0	346	COMPRESS=0
321	fi	347	fi
322	)	348	)
323	AC_DEFINE_UNQUOTED(ENABLE_COMPRESSION, $COMPRESS, [Enable compression support.])	349	AC_DEFINE_UNQUOTED(ENABLE_COMPRESSION, $COMPRESS, [Enable compression support.])
324		350
325	CIPHER=bf_cbc	351	CIPHER=aes_128_cbc
326	AC_ARG_ENABLE(cipher,	352	AC_ARG_ENABLE(cipher,
327	[AS_HELP_STRING(--enable-cipher,[	353	[AS_HELP_STRING(--enable-cipher=CIPHER,[
328	Select the symmetric cipher (default "bf").	354	Select the symmetric cipher (default "aes-128").
329	Must be one of "bf" (blowfish), "aes-128" (rijndael), "aes-192" or "aes-256".])],	355	Must be one of "bf" (blowfish), "aes-128" (rijndael), "aes-192" or "aes-256".])],
330	if test "x$enableval" = xbf ; then CIPHER=bf_cbc ; fi	356	if test "x$enableval" = xbf ; then CIPHER=bf_cbc ; fi
331	if test "x$enableval" = xaes-128; then CIPHER=aes_128_cbc; fi	357	if test "x$enableval" = xaes-128; then CIPHER=aes_128_cbc; fi
332	if test "x$enableval" = xaes-192; then CIPHER=aes_192_cbc; fi	358	if test "x$enableval" = xaes-192; then CIPHER=aes_192_cbc; fi
333	if test "x$enableval" = xaes-256; then CIPHER=aes_256_cbc; fi	359	if test "x$enableval" = xaes-256; then CIPHER=aes_256_cbc; fi
334	)	360	)
335	AC_DEFINE_UNQUOTED(ENABLE_CIPHER, EVP_${CIPHER}, [Select the symmetric cipher to use.])	361	AC_DEFINE_UNQUOTED(ENABLE_CIPHER, EVP_${CIPHER}, [Select the symmetric cipher to use.])
336		362
337	DIGEST=sha1	363	DIGEST=ripemd160
338	AC_ARG_ENABLE(digest,	364	AC_ARG_ENABLE(digest,
339	[AS_HELP_STRING(--enable-digest,[	365	[AS_HELP_STRING(--enable-digest=CIPHER,[
340	Select the digets algorithm to use (default "sha1"). Must be one of	366	Select the digest algorithm to use (default "ripemd160"). Must be one of
341	"sha1", "ripemd160", "md5" or "md4" (insecure).])],	367	"sha512", "sha256", "sha1", "ripemd160", "md5" or "md4" (insecure).])],
		368	if test "x$enableval" = xsha512 ; then DIGEST=sha512 ; fi
		369	if test "x$enableval" = xsha256 ; then DIGEST=sha256 ; fi
342	if test "x$enableval" = xsha1 ; then DIGEST=sha1 ; fi	370	if test "x$enableval" = xsha1 ; then DIGEST=sha1 ; fi
343	if test "x$enableval" = xripemd160; then DIGEST=ripemd160; fi	371	if test "x$enableval" = xripemd160; then DIGEST=ripemd160; fi
344	if test "x$enableval" = xmd5 ; then DIGEST=md5 ; fi	372	if test "x$enableval" = xmd5 ; then DIGEST=md5 ; fi
345	if test "x$enableval" = xmd4 ; then DIGEST=md4 ; fi	373	if test "x$enableval" = xmd4 ; then DIGEST=md4 ; fi
346	)	374	)
…		…
348		376
349	if $CXX -v --help 2>&1 \| grep -q fno-rtti; then	377	if $CXX -v --help 2>&1 \| grep -q fno-rtti; then
350	CXXFLAGS="$CXXFLAGS -fno-rtti"	378	CXXFLAGS="$CXXFLAGS -fno-rtti"
351	fi	379	fi
352		380
353	if $CXX -v --help 2>&1 \| grep -q fexceptions; then	381	#if $CXX -v --help 2>&1 \| grep -q fexceptions; then
354	CXXFLAGS="$CXXFLAGS -fno-exceptions"	382	# CXXFLAGS="$CXXFLAGS -fno-exceptions"
355	fi	383	#fi
		384
		385	LIBS="$EXTRA_LIBS $LIBS"
356		386
357	dnl if $CXX -v --help 2>&1 \| grep -q ffunction-sections; then	387	dnl if $CXX -v --help 2>&1 \| grep -q ffunction-sections; then
358	dnl CXXFLAGS="$CXXFLAGS -ffunction-sections"	388	dnl CXXFLAGS="$CXXFLAGS -ffunction-sections"
359	dnl fi	389	dnl fi
360	dnl	390	dnl
361	dnl if $LD -v --help 2>&1 \| grep -q gc-sections; then	391	dnl if $LD -v --help 2>&1 \| grep -q gc-sections; then
362	dnl LDFLAGS="$LDFLAGS -Wl,--gc-sections"	392	dnl LDFLAGS="$LDFLAGS -Wl,--gc-sections"
363	dnl fi	393	dnl fi
364		394
365	AC_CONFIG_COMMANDS_POST([	395	AC_SUBST(INCLUDES)
		396
		397	AC_CONFIG_FILES([Makefile po/Makefile.in
		398	src/Makefile
		399	doc/Makefile
		400	lib/Makefile
		401	m4/Makefile
		402	])
		403	AC_OUTPUT
366		404
367	echo	405	echo
368	echo "***"	406	echo "***"
369	echo "*** Configuration Summary"	407	echo "*** Configuration Summary"
370	echo "***"	408	echo "***"
…		…
372	echo "*** Cipher used: $CIPHER"	410	echo "*** Cipher used: $CIPHER"
373	echo "*** Digest used: $DIGEST"	411	echo "*** Digest used: $DIGEST"
374	echo "*** HMAC length: $HMAC"	412	echo "*** HMAC length: $HMAC"
375	echo "*** RAND used: $RAND"	413	echo "*** RAND used: $RAND"
376	echo "*** Max. MTU: $MTU"	414	echo "*** Max. MTU: $MTU"
377	echo "*** Compression: $COMPRESS"	415
		416	echo "***"
		417	echo "*** Enable options:"
		418	grep ENABLE_ config.h \| sed -e 's/^/*** /'
378		419
379	if test "x$DIGEST" = xmd4; then	420	if test "x$DIGEST" = xmd4; then
380	echo "***"	421	echo "***"
381	echo "*** WARNING: The digest you have chosen ($DIGEST) is known to be insecure"	422	echo "*** WARNING: The digest you have chosen ($DIGEST) is known to be insecure"
382	fi	423	fi
…		…
390	echo "***"	431	echo "***"
391	echo "*** WARNING: The random prefix you have chosen ($RAND) is probably insecure"	432	echo "*** WARNING: The random prefix you have chosen ($RAND) is probably insecure"
392	fi	433	fi
393		434
394	echo "***"	435	echo "***"
395
396	echo	436	echo
397		437
398	])
399		438
400	AC_SUBST(INCLUDES)
401
402	AC_CONFIG_FILES([Makefile po/Makefile.in
403	src/Makefile
404	doc/Makefile
405	lib/Makefile
406	m4/Makefile
407	])
408	AC_OUTPUT

Diff Legend

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

Comparing gvpe/configure.ac (file contents): Revision 1.40 by pcg, Wed Mar 23 20:22:01 2005 UTC vs. Revision 1.53 by pcg, Sun Jan 18 03:45:28 2009 UTC

Diff Legend

Comparing gvpe/configure.ac (file contents):
Revision 1.40 by pcg, Wed Mar 23 20:22:01 2005 UTC vs.
Revision 1.53 by pcg, Sun Jan 18 03:45:28 2009 UTC