rename packages/ to recipes/ per earlier agreement

See links below for more details:
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21326
http://thread.gmane.org/gmane.comp.handhelds.openembedded/21816

Signed-off-by: Denys Dmytriyenko <denis@denix.org>
Acked-by: Mike Westerhof <mwester@dls.net>
Acked-by: Philip Balister <philip@balister.org>
Acked-by: Khem Raj <raj.khem@gmail.com>
Acked-by: Marcin Juszkiewicz <hrw@openembedded.org>
Acked-by: Koen Kooi <koen@openembedded.org>
Acked-by: Frans Meulenbroeks <fransmeulenbroeks@gmail.com>

23 files changed, 0 insertions, 51198 deletions

diff --git a/packages/openssh/files/init b/packages/openssh/files/init
deleted file mode 100644
index b16cbd61a6..0000000000
--- a/packages/openssh/files/init
+++ /dev/null
@@ -1,88 +0,0 @@
-#! /bin/sh
-set -e
-
-# /etc/init.d/ssh: start and stop the OpenBSD "secure shell" daemon
-
-test -x /usr/sbin/sshd || exit 0
-( /usr/sbin/sshd -\? 2>&1 | grep -q OpenSSH ) 2>/dev/null || exit 0
-
-if test -f /etc/default/ssh; then
-    . /etc/default/ssh
-fi
-
-check_for_no_start() {
-    # forget it if we're trying to start, and /etc/ssh/sshd_not_to_be_run exists
-    if [ -e /etc/ssh/sshd_not_to_be_run ]; then 
-	echo "OpenBSD Secure Shell server not in use (/etc/ssh/sshd_not_to_be_run)"
-	exit 0
-    fi
-}
-
-check_privsep_dir() {
-    # Create the PrivSep empty dir if necessary
-    if [ ! -d /var/run/sshd ]; then
-	mkdir /var/run/sshd
-	chmod 0755 /var/run/sshd
-    fi
-}
-
-check_config() {
-	/usr/sbin/sshd -t || exit 1
-}
-
-check_keys() {
-	# create keys if necessary
-	if [ ! -f /etc/ssh/ssh_host_rsa_key ]; then
-		echo "  generating ssh RSA key..."
-		ssh-keygen -q -f /etc/ssh/ssh_host_rsa_key -N '' -t rsa
-	fi
-	if [ ! -f /etc/ssh/ssh_host_dsa_key ]; then
-		echo "  generating ssh DSA key..."
-		ssh-keygen -q -f /etc/ssh/ssh_host_dsa_key -N '' -t dsa
-	fi
-}
-
-export PATH="${PATH:+$PATH:}/usr/sbin:/sbin"
-
-case "$1" in
-  start)
-	check_for_no_start
-	echo "Starting OpenBSD Secure Shell server: sshd"
-	check_keys
-	check_privsep_dir
-	start-stop-daemon -S -x /usr/sbin/sshd -- $SSHD_OPTS
-        echo "done."
-	;;
-  stop)
-        echo -n "Stopping OpenBSD Secure Shell server: sshd"
-	start-stop-daemon -K -x /usr/sbin/sshd
-        echo "."
-	;;
-
-  reload|force-reload)
-	check_for_no_start
-	check_keys
-	check_config
-        echo -n "Reloading OpenBSD Secure Shell server's configuration"
-	start-stop-daemon -K -s 1 -x /usr/sbin/sshd
-	echo "."
-	;;
-
-  restart)
-  	check_keys
-	check_config
-        echo -n "Restarting OpenBSD Secure Shell server: sshd"
-	start-stop-daemon -K -x /usr/sbin/sshd
-	check_for_no_start
-	check_privsep_dir
-	sleep 2
-	start-stop-daemon -S -x /usr/sbin/sshd -- $SSHD_OPTS
-	echo "."
-	;;
-
-  *)
-	echo "Usage: /etc/init.d/ssh {start|stop|reload|force-reload|restart}"
-	exit 1
-esac
-
-exit 0
diff --git a/packages/openssh/files/scp-nossl.patch b/packages/openssh/files/scp-nossl.patch
deleted file mode 100644
index 222a52ff8a..0000000000
--- a/packages/openssh/files/scp-nossl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-
-#
-# Made by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- openssh-3.6.1p2/Makefile.in~scp-nossl
-+++ openssh-3.6.1p2/Makefile.in
-@@ -43,6 +43,7 @@
- CFLAGS=@CFLAGS@
- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
- LIBS=@LIBS@
-+SCP_LIBS=
- LIBPAM=@LIBPAM@
- LIBWRAP=@LIBWRAP@
- AR=@AR@
-@@ -134,7 +135,7 @@
- 	$(LD) -o $@ $(SSHDOBJS) $(LDFLAGS) -lssh -lopenbsd-compat $(LIBWRAP) $(LIBPAM) $(LIBS)
- 
- scp$(EXEEXT): $(LIBCOMPAT) libssh.a scp.o progressmeter.o
--	$(LD) -o $@ scp.o progressmeter.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
-+	$(LD) -o $@ scp.o progressmeter.o $(LDFLAGS) -lssh -lopenbsd-compat $(SCP_LIBS)
- 
- ssh-add$(EXEEXT): $(LIBCOMPAT) libssh.a ssh-add.o
- 	$(LD) -o $@ ssh-add.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) 
diff --git a/packages/openssh/files/sftp-server-nolibcrypto.patch b/packages/openssh/files/sftp-server-nolibcrypto.patch
deleted file mode 100644
index 1b00bff663..0000000000
--- a/packages/openssh/files/sftp-server-nolibcrypto.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: openssh-4.6p1/Makefile.in
-===================================================================
---- openssh-4.6p1.orig/Makefile.in	2007-10-16 11:27:24.000000000 +0100
-+++ openssh-4.6p1/Makefile.in	2007-10-16 11:27:46.000000000 +0100
-@@ -160,7 +160,7 @@
- 	$(LD) -o $@ ssh-keyscan.o $(LDFLAGS) -lssh -lopenbsd-compat -lssh $(LIBS)
- 
- sftp-server$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-common.o sftp-server.o
--	$(LD) -o $@ sftp-server.o sftp-common.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS)
-+	$(LD) -o $@ sftp-server.o sftp-common.o $(LDFLAGS) -lssh -lopenbsd-compat
- 
- sftp$(EXEEXT): $(LIBCOMPAT) libssh.a sftp.o sftp-client.o sftp-common.o sftp-glob.o progressmeter.o
- 	$(LD) -o $@ progressmeter.o sftp.o sftp-client.o sftp-common.o sftp-glob.o $(LDFLAGS) -lssh -lopenbsd-compat $(LIBS) $(LIBEDIT)
diff --git a/packages/openssh/openssh-3.7.1p1/configure.patch b/packages/openssh/openssh-3.7.1p1/configure.patch
deleted file mode 100644
index 35629028cc..0000000000
--- a/packages/openssh/openssh-3.7.1p1/configure.patch
+++ /dev/null
@@ -1,23706 +0,0 @@
-
-#
-# Patch managed by http://www.mn-logistik.de/unsupported/pxa250/patcher
-#
-
---- openssh-3.7.1p1/configure.ac~configure
-+++ openssh-3.7.1p1/configure.ac
-@@ -65,7 +65,7 @@
- 	for tryflags in -blibpath: -Wl,-blibpath: -Wl,-rpath, ;do
- 		if (test -z "$blibflags"); then
- 			LDFLAGS="$saved_LDFLAGS $tryflags$blibpath"
--			AC_TRY_LINK([], [], [blibflags=$tryflags])
-+			AC_LINK_IFELSE([AC_LANG_PROGRAM([[]], [[]])],[blibflags=$tryflags],[])
- 		fi
- 	done
- 	if (test -z "$blibflags"); then
-@@ -85,13 +85,9 @@
- 	dnl Check if loginfailed is declared and takes 4 arguments (AIX >= 5.2)
- 	AC_CHECK_DECL(loginfailed,
- 		 [AC_MSG_CHECKING(if loginfailed takes 4 arguments)
--		  AC_TRY_COMPILE(
--			[#include <usersec.h>],
--			[(void)loginfailed("user","host","tty",0);],
--			[AC_MSG_RESULT(yes)
--			 AC_DEFINE(AIX_LOGINFAILED_4ARG)],
--			[AC_MSG_RESULT(no)]
--		)],
-+		  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <usersec.h>]], [[(void)loginfailed("user","host","tty",0);]])],[AC_MSG_RESULT(yes)
-+			 AC_DEFINE(AIX_LOGINFAILED_4ARG)],[AC_MSG_RESULT(no)
-+		])],
- 		[],
- 		[#include <usersec.h>]
- 	)
-@@ -123,15 +119,13 @@
- 	;;
- *-*-darwin*)
- 	AC_MSG_CHECKING(if we have working getaddrinfo)
--	AC_TRY_RUN([#include <mach-o/dyld.h>
-+	AC_RUN_IFELSE([AC_LANG_SOURCE([[#include <mach-o/dyld.h>
- main() { if (NSVersionOfRunTimeLibrary("System") >= (60 << 16))
- 		exit(0);
- 	else
- 		exit(1);
--}], [AC_MSG_RESULT(working)],
--	[AC_MSG_RESULT(buggy)
--	AC_DEFINE(BROKEN_GETADDRINFO)],
--	[AC_MSG_RESULT(assume it is working)])
-+}]])],[AC_MSG_RESULT(working)],[AC_MSG_RESULT(buggy)
-+	AC_DEFINE(BROKEN_GETADDRINFO)],[AC_MSG_RESULT(assume it is working)])
- 	;;
- *-*-hpux10.26)
- 	if test -z "$GCC"; then
-@@ -442,16 +436,14 @@
- )
- 
- AC_MSG_CHECKING(compiler and flags for sanity)
--AC_TRY_RUN([
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <stdio.h>
- int main(){exit(0);}
--	],
--	[	AC_MSG_RESULT(yes) ],
--	[
-+	]])],[	AC_MSG_RESULT(yes) ],[
- 		AC_MSG_RESULT(no)
- 		AC_MSG_ERROR([*** compiler cannot create working executables, check config.log ***])
--	]
--)
-+	],[	AC_MSG_RESULT(yes) 
-+])
- 
- # Checks for header files.
- AC_CHECK_HEADERS(bstring.h crypt.h endian.h features.h floatingpoint.h \
-@@ -483,8 +475,7 @@
- 			ac_cv_have_broken_dirname, [
- 			save_LIBS="$LIBS"
- 			LIBS="$LIBS -lgen"
--			AC_TRY_RUN(
--				[
-+			AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <libgen.h>
- #include <string.h>
- 
-@@ -499,10 +490,8 @@
- 	exit(0);
-     }
- }
--				],
--				[ ac_cv_have_broken_dirname="no" ],
--				[ ac_cv_have_broken_dirname="yes" ]
--			)
-+				]])],[ ac_cv_have_broken_dirname="no" ],[ ac_cv_have_broken_dirname="yes" 
-+			],[])
- 			LIBS="$save_LIBS"
- 		])
- 		if test "x$ac_cv_have_broken_dirname" = "xno" ; then
-@@ -609,19 +598,18 @@
-         ]
- )
- 
--AC_MSG_CHECKING([whether struct dirent allocates space for d_name])
--AC_TRY_RUN(
--	[
--#include <sys/types.h>
--#include <dirent.h>
--int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));}
--	],
--	[AC_MSG_RESULT(yes)], 
--	[
--		AC_MSG_RESULT(no)
--		AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME)
--	]
--)
-+AC_CACHE_CHECK([whether struct dirent allocates space for d_name], ac_cv_have_space_d_name_in_struct_dirent, [
-+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+			#include <sys/types.h>
-+			#include <dirent.h>
-+			int main(void){struct dirent d;exit(sizeof(d.d_name)<=sizeof(char));}
-+		]])],[ac_cv_have_space_d_name_in_struct_dirent="yes"],[ac_cv_have_space_d_name_in_struct_dirent="no"
-+	],[])
-+])
-+
-+if test "x$ac_cv_dirent_have_space_d_name" = "xyes" ; then
-+	AC_DEFINE(BROKEN_ONE_BYTE_DIRENT_D_NAME)
-+fi
- 
- # Check whether user wants S/Key support
- SKEY_MSG="no" 
-@@ -641,17 +629,14 @@
- 			SKEY_MSG="yes" 
- 	
- 			AC_MSG_CHECKING([for s/key support])
--			AC_TRY_RUN(
--				[
-+			AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <stdio.h>
- #include <skey.h>
- int main() { char *ff = skey_keyinfo(""); ff=""; exit(0); }
--				],
--				[AC_MSG_RESULT(yes)],
--				[
-+				]])],[AC_MSG_RESULT(yes)],[
- 					AC_MSG_RESULT(no)
- 					AC_MSG_ERROR([** Incomplete or missing s/key libraries.])
--				])
-+				],[])
- 		fi
- 	]
- )
-@@ -689,22 +674,18 @@
- 			LIBWRAP="-lwrap"
- 			LIBS="$LIBWRAP $LIBS"
- 			AC_MSG_CHECKING(for libwrap)
--			AC_TRY_LINK(
--				[
-+			AC_LINK_IFELSE([AC_LANG_PROGRAM([[
- #include <tcpd.h>
- 					int deny_severity = 0, allow_severity = 0;
--				],
--				[hosts_access(0);],
--				[
-+				]], [[hosts_access(0);]])],[
- 					AC_MSG_RESULT(yes)
- 					AC_DEFINE(LIBWRAP)
- 					AC_SUBST(LIBWRAP)
- 					TCPW_MSG="yes"
--				],
--				[
-+				],[
- 					AC_MSG_ERROR([*** libwrap missing])
--				]
--			)
-+				
-+			])
- 			LIBS="$saved_LIBS"
- 		fi
- 	]
-@@ -760,52 +741,47 @@
- 
- # Check for broken snprintf
- if test "x$ac_cv_func_snprintf" = "xyes" ; then
--	AC_MSG_CHECKING([whether snprintf correctly terminates long strings])
--	AC_TRY_RUN(
--		[
-+AC_CACHE_CHECK([whether snprintf correctly terminates long strings],
-+	ac_cv_have_broken_snprintf, [
-+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <stdio.h>
- int main(void){char b[5];snprintf(b,5,"123456789");exit(b[4]!='\0');}
--		],
--		[AC_MSG_RESULT(yes)], 
--		[
--			AC_MSG_RESULT(no)
--			AC_DEFINE(BROKEN_SNPRINTF)
--			AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor])
--		]
--	)
-+		]])],[ ac_cv_have_broken_snprintf="no" ],[ ac_cv_have_broken_snprintf="yes" 
-+	],[])
-+])
-+if test "x$ac_cv_have_broken_snprintf" = "xyes" ; then
-+	AC_DEFINE(BROKEN_SNPRINTF)
-+	AC_MSG_WARN([****** Your snprintf() function is broken, complain to your vendor])
-+fi
- fi
- 
- dnl see whether mkstemp() requires XXXXXX
- if test "x$ac_cv_func_mkdtemp" = "xyes" ; then
- AC_MSG_CHECKING([for (overly) strict mkstemp])
--AC_TRY_RUN(
--	[
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <stdlib.h>
- main() { char template[]="conftest.mkstemp-test";
- if (mkstemp(template) == -1)
- 	exit(1);
- unlink(template); exit(0);
- }
--	],
--	[
-+	]])],[
- 		AC_MSG_RESULT(no)
--	],
--	[ 
-+	],[ 
- 		AC_MSG_RESULT(yes)
- 		AC_DEFINE(HAVE_STRICT_MKSTEMP)
--	],
--	[
-+	],[
- 		AC_MSG_RESULT(yes)
- 		AC_DEFINE(HAVE_STRICT_MKSTEMP)
--	] 
--)
-+	 
-+])
- fi
- 
- dnl make sure that openpty does not reacquire controlling terminal
- if test ! -z "$check_for_openpty_ctty_bug"; then
--	AC_MSG_CHECKING(if openpty correctly handles controlling tty)
--	AC_TRY_RUN(
--		[
-+AC_CACHE_CHECK([if openpty acquires controlling terminal],
-+	ac_cv_have_openpty_ctty_bug, [
-+	AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <stdio.h>
- #include <sys/fcntl.h>
- #include <sys/types.h>
-@@ -837,15 +813,12 @@
- 			exit(0);	/* Did not acquire ctty: OK */
- 	}
- }
--		],
--		[
--			AC_MSG_RESULT(yes)
--		],
--		[
--			AC_MSG_RESULT(no)
--			AC_DEFINE(SSHD_ACQUIRES_CTTY)
--		]
--	)
-+		]])],[ ac_cv_have_openpty_ctty_bug="no" ],[ ac_cv_have_openpty_ctty_bug="yes" 
-+	],[])
-+])
-+if test "x$ac_cv_have_openpty_ctty_bug" = "xyes" ; then
-+	AC_DEFINE(SSHD_ACQUIRES_CTTY)
-+fi
- fi
- 
- AC_FUNC_GETPGRP
-@@ -883,19 +856,15 @@
- if test "x$PAM_MSG" = "xyes" ; then
- 	# Check PAM strerror arguments (old PAM)
- 	AC_MSG_CHECKING([whether pam_strerror takes only one argument])
--	AC_TRY_COMPILE(
--		[
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <stdlib.h>
- #include <security/pam_appl.h>
--		], 
--		[(void)pam_strerror((pam_handle_t *)NULL, -1);], 
--		[AC_MSG_RESULT(no)],
--		[
-+		]], [[(void)pam_strerror((pam_handle_t *)NULL, -1);]])],[AC_MSG_RESULT(no)],[
- 			AC_DEFINE(HAVE_OLD_PAM)
- 			AC_MSG_RESULT(yes)
- 			PAM_MSG="yes (old library)"
--		]
--	)
-+		
-+	])
- fi
- 
- # Some systems want crypt() from libcrypt, *not* the version in OpenSSL,
-@@ -952,8 +921,7 @@
- 
- # Determine OpenSSL header version
- AC_MSG_CHECKING([OpenSSL header version])
--AC_TRY_RUN(
--	[
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <stdio.h>
- #include <string.h>
- #include <openssl/opensslv.h>
-@@ -971,21 +939,21 @@
- 
- 	exit(0);
- }
--	],
--	[
-+	]])],[
- 		ssl_header_ver=`cat conftest.sslincver`
- 		AC_MSG_RESULT($ssl_header_ver)
--	],
--	[
-+	],[
- 		AC_MSG_RESULT(not found)
- 		AC_MSG_ERROR(OpenSSL version header not found.)
--	]
--)
-+	],[
-+		AC_MSG_RESULT(unknown)
-+		AC_MSG_WARN(Skipping OpenSSL header version check due to crosscompilation.)
-+	
-+])
- 
- # Determine OpenSSL library version
- AC_MSG_CHECKING([OpenSSL library version])
--AC_TRY_RUN(
--	[
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <stdio.h>
- #include <string.h>
- #include <openssl/opensslv.h>
-@@ -1004,35 +972,36 @@
- 
- 	exit(0);
- }
--	],
--	[
-+	]])],[
- 		ssl_library_ver=`cat conftest.ssllibver`
- 		AC_MSG_RESULT($ssl_library_ver)
--	],
--	[
-+	],[
- 		AC_MSG_RESULT(not found)
- 		AC_MSG_ERROR(OpenSSL library not found.)
--	]
--)
-+	],[
-+		AC_MSG_RESULT(unknown)
-+		AC_MSG_WARN(Skipping OpenSSL library version check due to crosscompilation.)
-+	
-+])
- 
- # Sanity check OpenSSL headers
- AC_MSG_CHECKING([whether OpenSSL's headers match the library])
--AC_TRY_RUN(
--	[
-+AC_RUN_IFELSE([AC_LANG_SOURCE([[
- #include <string.h>
- #include <openssl/opensslv.h>
- int main(void) { exit(SSLeay() == OPENSSL_VERSION_NUMBER ? 0 : 1); }
--	],
--	[
-+	]])],[
- 		AC_MSG_RESULT(yes)
--	],
--	[
-+	],[
- 		AC_MSG_RESULT(no)
- 		AC_MSG_ERROR([Your OpenSSL headers do not match your library.
- Check config.log for details.
- Also see contrib/findssl.sh for help identifying header/library mismatches.])
--	]
--)
-+	],[
-+		AC_MSG_RESULT(unknown)
-+		AC_MSG_WARN(Skipping OpenSSL version comparison due to crosscompilation.)
-+	
-+])
- 
- # Some Linux systems (Slackware) need crypt() from libcrypt, *not* the 
- # version in OpenSSL. Skip this for PAM
-@@ -1040,30 +1009,8 @@
- 	AC_CHECK_LIB(crypt, crypt, LIBS="$LIBS -lcrypt")
- fi
- 
--
- ### Configure cryptographic random number support
- 
--# Check wheter OpenSSL seeds itself
--AC_MSG_CHECKING([whether OpenSSL's PRNG is internally seeded])
--AC_TRY_RUN(
--	[
--#include <string.h>
--#include <openssl/rand.h>
--int main(void) { exit(RAND_status() == 1 ? 0 : 1); }
--	],
--	[
--		OPENSSL_SEEDS_ITSELF=yes
--		AC_MSG_RESULT(yes)
--	],
--	[
--		AC_MSG_RESULT(no)
--		# Default to use of the rand helper if OpenSSL doesn't
--		# seed itself
--		USE_RAND_HELPER=yes
--	]
--)
--
--
- # Do we want to force the use of the rand helper?
- AC_ARG_WITH(rand-helper,
- 	[  --with-rand-helper      Use subprocess to gather strong randomness ],
-@@ -1080,6 +1027,24 @@
- 			USE_RAND_HELPER=yes
- 		fi
- 	],
-+	# Check whether OpenSSL seeds itself
-+	[
-+		AC_MSG_CHECKING([whether OpenSSL's PRNG is internally seeded])
-+		AC_RUN_IFELSE([AC_LANG_SOURCE([[
-+		#include <string.h>
-+		#include <openssl/rand.h>
-+		int main(void) { exit(RAND_status() == 1 ? 0 : 1); }
-+			]])],[
-+				OPENSSL_SEEDS_ITSELF=yes
-+				AC_MSG_RESULT(yes)
-+			],[
-+				AC_MSG_RESULT(no)
-+				# Default to use of the rand helper if OpenSSL doesn't
-+				# seed itself
-+				USE_RAND_HELPER=yes
-+			
-+		],[])
-+	]
- )	
- 
- # Which randomness source do we use?
-@@ -1261,12 +1226,8 @@
- 
- # More checks for data types
- AC_CACHE_CHECK([for u_int type], ac_cv_have_u_int, [
--	AC_TRY_COMPILE(
--		[ #include <sys/types.h> ], 
--		[ u_int a; a = 1;], 
--		[ ac_cv_have_u_int="yes" ],
--		[ ac_cv_have_u_int="no" ]
--	)
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/types.h> ]], [[ u_int a; a = 1;]])],[ ac_cv_have_u_int="yes" ],[ ac_cv_have_u_int="no" 
-+	])
- ])
- if test "x$ac_cv_have_u_int" = "xyes" ; then
- 	AC_DEFINE(HAVE_U_INT)
-@@ -1274,12 +1235,8 @@
- fi
- 
- AC_CACHE_CHECK([for intXX_t types], ac_cv_have_intxx_t, [
--	AC_TRY_COMPILE(
--		[ #include <sys/types.h> ], 
--		[ int8_t a; int16_t b; int32_t c; a = b = c = 1;], 
--		[ ac_cv_have_intxx_t="yes" ],
--		[ ac_cv_have_intxx_t="no" ]
--	)
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/types.h> ]], [[ int8_t a; int16_t b; int32_t c; a = b = c = 1;]])],[ ac_cv_have_intxx_t="yes" ],[ ac_cv_have_intxx_t="no" 
-+	])
- ])
- if test "x$ac_cv_have_intxx_t" = "xyes" ; then
- 	AC_DEFINE(HAVE_INTXX_T)
-@@ -1290,20 +1247,15 @@
-            test "x$ac_cv_header_stdint_h" = "xyes")
- then
-     AC_MSG_CHECKING([for intXX_t types in stdint.h])
--	AC_TRY_COMPILE(
--		[ #include <stdint.h> ], 
--		[ int8_t a; int16_t b; int32_t c; a = b = c = 1;], 
--		[
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <stdint.h> ]], [[ int8_t a; int16_t b; int32_t c; a = b = c = 1;]])],[
- 			AC_DEFINE(HAVE_INTXX_T)
- 			AC_MSG_RESULT(yes)
--		],
--		[ AC_MSG_RESULT(no) ]
--	)
-+		],[ AC_MSG_RESULT(no) 
-+	])
- fi
- 
- AC_CACHE_CHECK([for int64_t type], ac_cv_have_int64_t, [
--	AC_TRY_COMPILE(
--		[
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <sys/types.h>
- #ifdef HAVE_STDINT_H
- # include <stdint.h>
-@@ -1312,23 +1264,16 @@
- #ifdef HAVE_SYS_BITYPES_H
- # include <sys/bitypes.h>
- #endif
--		], 
--		[ int64_t a; a = 1;], 
--		[ ac_cv_have_int64_t="yes" ],
--		[ ac_cv_have_int64_t="no" ]
--	)
-+		]], [[ int64_t a; a = 1;]])],[ ac_cv_have_int64_t="yes" ],[ ac_cv_have_int64_t="no" 
-+	])
- ])
- if test "x$ac_cv_have_int64_t" = "xyes" ; then
- 	AC_DEFINE(HAVE_INT64_T)
- fi
- 
- AC_CACHE_CHECK([for u_intXX_t types], ac_cv_have_u_intxx_t, [
--	AC_TRY_COMPILE(
--		[ #include <sys/types.h> ], 
--		[ u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1;], 
--		[ ac_cv_have_u_intxx_t="yes" ],
--		[ ac_cv_have_u_intxx_t="no" ]
--	)
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/types.h> ]], [[ u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1;]])],[ ac_cv_have_u_intxx_t="yes" ],[ ac_cv_have_u_intxx_t="no" 
-+	])
- ])
- if test "x$ac_cv_have_u_intxx_t" = "xyes" ; then
- 	AC_DEFINE(HAVE_U_INTXX_T)
-@@ -1337,24 +1282,16 @@
- 
- if test -z "$have_u_intxx_t" ; then
-     AC_MSG_CHECKING([for u_intXX_t types in sys/socket.h])
--	AC_TRY_COMPILE(
--		[ #include <sys/socket.h> ], 
--		[ u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1;], 
--		[
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/socket.h> ]], [[ u_int8_t a; u_int16_t b; u_int32_t c; a = b = c = 1;]])],[
- 			AC_DEFINE(HAVE_U_INTXX_T)
- 			AC_MSG_RESULT(yes)
--		],
--		[ AC_MSG_RESULT(no) ]
--	)
-+		],[ AC_MSG_RESULT(no) 
-+	])
- fi
- 
- AC_CACHE_CHECK([for u_int64_t types], ac_cv_have_u_int64_t, [
--	AC_TRY_COMPILE(
--		[ #include <sys/types.h> ], 
--		[ u_int64_t a; a = 1;], 
--		[ ac_cv_have_u_int64_t="yes" ],
--		[ ac_cv_have_u_int64_t="no" ]
--	)
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/types.h> ]], [[ u_int64_t a; a = 1;]])],[ ac_cv_have_u_int64_t="yes" ],[ ac_cv_have_u_int64_t="no" 
-+	])
- ])
- if test "x$ac_cv_have_u_int64_t" = "xyes" ; then
- 	AC_DEFINE(HAVE_U_INT64_T)
-@@ -1363,27 +1300,19 @@
- 
- if test -z "$have_u_int64_t" ; then
-     AC_MSG_CHECKING([for u_int64_t type in sys/bitypes.h])
--	AC_TRY_COMPILE(
--		[ #include <sys/bitypes.h> ], 
--		[ u_int64_t a; a = 1],
--		[
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <sys/bitypes.h> ]], [[ u_int64_t a; a = 1]])],[
- 			AC_DEFINE(HAVE_U_INT64_T)
- 			AC_MSG_RESULT(yes)
--		],
--		[ AC_MSG_RESULT(no) ]
--	)
-+		],[ AC_MSG_RESULT(no) 
-+	])
- fi
- 
- if test -z "$have_u_intxx_t" ; then
- 	AC_CACHE_CHECK([for uintXX_t types], ac_cv_have_uintxx_t, [
--		AC_TRY_COMPILE(
--			[
-+		AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <sys/types.h>
--			], 
--			[ uint8_t a; uint16_t b; uint32_t c; a = b = c = 1; ], 
--			[ ac_cv_have_uintxx_t="yes" ],
--			[ ac_cv_have_uintxx_t="no" ]
--		)
-+			]], [[ uint8_t a; uint16_t b; uint32_t c; a = b = c = 1; ]])],[ ac_cv_have_uintxx_t="yes" ],[ ac_cv_have_uintxx_t="no" 
-+		])
- 	])
- 	if test "x$ac_cv_have_uintxx_t" = "xyes" ; then
- 		AC_DEFINE(HAVE_UINTXX_T)
-@@ -1392,49 +1321,37 @@
- 
- if test -z "$have_uintxx_t" ; then
-     AC_MSG_CHECKING([for uintXX_t types in stdint.h])
--	AC_TRY_COMPILE(
--		[ #include <stdint.h> ], 
--		[ uint8_t a; uint16_t b; uint32_t c; a = b = c = 1;], 
--		[
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #include <stdint.h> ]], [[ uint8_t a; uint16_t b; uint32_t c; a = b = c = 1;]])],[
- 			AC_DEFINE(HAVE_UINTXX_T)
- 			AC_MSG_RESULT(yes)
--		],
--		[ AC_MSG_RESULT(no) ]
--	)
-+		],[ AC_MSG_RESULT(no) 
-+	])
- fi
- 
- if (test -z "$have_u_intxx_t" || test -z "$have_intxx_t" && \
-            test "x$ac_cv_header_sys_bitypes_h" = "xyes")
- then
- 	AC_MSG_CHECKING([for intXX_t and u_intXX_t types in sys/bitypes.h])
--	AC_TRY_COMPILE(
--		[
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <sys/bitypes.h>
--		], 
--		[
-+		]], [[
- 			int8_t a; int16_t b; int32_t c;
- 			u_int8_t e; u_int16_t f; u_int32_t g;
- 			a = b = c = e = f = g = 1;
--		], 
--		[
-+		]])],[
- 			AC_DEFINE(HAVE_U_INTXX_T)
- 			AC_DEFINE(HAVE_INTXX_T)
- 			AC_MSG_RESULT(yes)
--		],
--		[AC_MSG_RESULT(no)]
--	) 
-+		],[AC_MSG_RESULT(no)
-+	]) 
- fi
- 
- 
- AC_CACHE_CHECK([for u_char], ac_cv_have_u_char, [
--	AC_TRY_COMPILE(
--		[
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <sys/types.h>
--		],
--		[ u_char foo; foo = 125; ],
--		[ ac_cv_have_u_char="yes" ],
--		[ ac_cv_have_u_char="no" ]
--	)
-+		]], [[ u_char foo; foo = 125; ]])],[ ac_cv_have_u_char="yes" ],[ ac_cv_have_u_char="no" 
-+	])
- ])
- if test "x$ac_cv_have_u_char" = "xyes" ; then
- 	AC_DEFINE(HAVE_U_CHAR)
-@@ -1445,56 +1362,40 @@
- AC_CHECK_TYPES(sig_atomic_t,,,[#include <signal.h>])
- 
- AC_CACHE_CHECK([for size_t], ac_cv_have_size_t, [
--	AC_TRY_COMPILE(
--		[
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <sys/types.h>
--		],
--		[ size_t foo; foo = 1235; ],
--		[ ac_cv_have_size_t="yes" ],
--		[ ac_cv_have_size_t="no" ]
--	)
-+		]], [[ size_t foo; foo = 1235; ]])],[ ac_cv_have_size_t="yes" ],[ ac_cv_have_size_t="no" 
-+	])
- ])
- if test "x$ac_cv_have_size_t" = "xyes" ; then
- 	AC_DEFINE(HAVE_SIZE_T)
- fi
- 
- AC_CACHE_CHECK([for ssize_t], ac_cv_have_ssize_t, [
--	AC_TRY_COMPILE(
--		[
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <sys/types.h>
--		],
--		[ ssize_t foo; foo = 1235; ],
--		[ ac_cv_have_ssize_t="yes" ],
--		[ ac_cv_have_ssize_t="no" ]
--	)
-+		]], [[ ssize_t foo; foo = 1235; ]])],[ ac_cv_have_ssize_t="yes" ],[ ac_cv_have_ssize_t="no" 
-+	])
- ])
- if test "x$ac_cv_have_ssize_t" = "xyes" ; then
- 	AC_DEFINE(HAVE_SSIZE_T)
- fi
- 
- AC_CACHE_CHECK([for clock_t], ac_cv_have_clock_t, [
--	AC_TRY_COMPILE(
--		[
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <time.h>
--		],
--		[ clock_t foo; foo = 1235; ],
--		[ ac_cv_have_clock_t="yes" ],
--		[ ac_cv_have_clock_t="no" ]
--	)
-+		]], [[ clock_t foo; foo = 1235; ]])],[ ac_cv_have_clock_t="yes" ],[ ac_cv_have_clock_t="no" 
-+	])
- ])
- if test "x$ac_cv_have_clock_t" = "xyes" ; then
- 	AC_DEFINE(HAVE_CLOCK_T)
- fi
- 
- AC_CACHE_CHECK([for sa_family_t], ac_cv_have_sa_family_t, [
--	AC_TRY_COMPILE(
--		[
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <sys/types.h>
- #include <sys/socket.h>
--		],
--		[ sa_family_t foo; foo = 1235; ],
--		[ ac_cv_have_sa_family_t="yes" ],
--		[ AC_TRY_COMPILE(
-+		]], [[ sa_family_t foo; foo = 1235; ]])],[ ac_cv_have_sa_family_t="yes" ],[ AC_TRY_COMPILE(
- 		  [
- #include <sys/types.h>
- #include <sys/socket.h>
-@@ -1504,36 +1405,28 @@
- 		[ ac_cv_have_sa_family_t="yes" ],
- 
- 		[ ac_cv_have_sa_family_t="no" ]
--	)]
- 	)
-+	])
- ])
- if test "x$ac_cv_have_sa_family_t" = "xyes" ; then
- 	AC_DEFINE(HAVE_SA_FAMILY_T)
- fi
- 
- AC_CACHE_CHECK([for pid_t], ac_cv_have_pid_t, [
--	AC_TRY_COMPILE(
--		[
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <sys/types.h>
--		],
--		[ pid_t foo; foo = 1235; ],
--		[ ac_cv_have_pid_t="yes" ],
--		[ ac_cv_have_pid_t="no" ]
--	)
-+		]], [[ pid_t foo; foo = 1235; ]])],[ ac_cv_have_pid_t="yes" ],[ ac_cv_have_pid_t="no" 
-+	])
- ])
- if test "x$ac_cv_have_pid_t" = "xyes" ; then
- 	AC_DEFINE(HAVE_PID_T)
- fi
- 
- AC_CACHE_CHECK([for mode_t], ac_cv_have_mode_t, [
--	AC_TRY_COMPILE(
--		[
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <sys/types.h>
--		],
--		[ mode_t foo; foo = 1235; ],
--		[ ac_cv_have_mode_t="yes" ],
--		[ ac_cv_have_mode_t="no" ]
--	)
-+		]], [[ mode_t foo; foo = 1235; ]])],[ ac_cv_have_mode_t="yes" ],[ ac_cv_have_mode_t="no" 
-+	])
- ])
- if test "x$ac_cv_have_mode_t" = "xyes" ; then
- 	AC_DEFINE(HAVE_MODE_T)
-@@ -1541,73 +1434,53 @@
- 
- 
- AC_CACHE_CHECK([for struct sockaddr_storage], ac_cv_have_struct_sockaddr_storage, [
--	AC_TRY_COMPILE(
--		[
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <sys/types.h>
- #include <sys/socket.h>
--		],
--		[ struct sockaddr_storage s; ],
--		[ ac_cv_have_struct_sockaddr_storage="yes" ],
--		[ ac_cv_have_struct_sockaddr_storage="no" ]
--	)
-+		]], [[ struct sockaddr_storage s; ]])],[ ac_cv_have_struct_sockaddr_storage="yes" ],[ ac_cv_have_struct_sockaddr_storage="no" 
-+	])
- ])
- if test "x$ac_cv_have_struct_sockaddr_storage" = "xyes" ; then
- 	AC_DEFINE(HAVE_STRUCT_SOCKADDR_STORAGE)
- fi
- 
- AC_CACHE_CHECK([for struct sockaddr_in6], ac_cv_have_struct_sockaddr_in6, [
--	AC_TRY_COMPILE(
--		[
-+	AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
- #include <sys/types.h>
- #include <netinet/in.h>
--		],
--		[ struct sockaddr_in6 s; s.sin6_family = 0; ],
--		[ ac_cv_have_struct_sockaddr_in6="yes" ],
--		[ ac_cv_have_struct_sockaddr_in6="no" ]
--	)
-+		]], [[ struct sockaddr_in6 s; s.sin6_family = 0; ]])],[ ac_cv_have_struct_sockaddr_in6="yes" ],[ ac_cv_have_struct_sockaddr_in6="no" 
-+	])
- ])
- if test "x$ac_cv_have_struct_sockaddr_in6" = "xyes" ; then
- 	AC_DEFINE(HAVE_STRUCT_SOCKADDR_IN6)
- fi
- 
- AC_CACHE_CHECK([for str