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>

2 files changed, 0 insertions, 24199 deletions

diff --git a/packages/squeak/files/configure-fixes.patch b/packages/squeak/files/configure-fixes.patch
deleted file mode 100644
index 9ed78472d4..0000000000
--- a/packages/squeak/files/configure-fixes.patch
+++ /dev/null
@@ -1,24113 +0,0 @@
-diff --git a/platforms/unix/config/Makefile.in b/platforms/unix/config/Makefile.in
-index e911837..45881bc 100644
---- a/platforms/unix/config/Makefile.in
-+++ b/platforms/unix/config/Makefile.in
-@@ -43,12 +43,7 @@ all : $(squeak) plugins squeak.1 $(npsqueak)
- # VM
- 
- $(squeak) : config.sh $(SQLIBS) version.o
--	$(LINK) $(squeak) $(SQLIBS) version.o $(LIBS) [plibs] vm/vm.a
--	@echo
--	@size $(squeak)
--	@echo
--	@./$(squeak) -version
--	@echo
-+	$(LINK) $(squeak) vm/vm.a $(SQLIBS) version.o $(LIBS) [plibs]
- 
- version.o : version.c
- 	$(COMPILE) version.o version.c
-diff --git a/platforms/unix/config/Makefile.install b/platforms/unix/config/Makefile.install
-index 447a5f9..ca44bbf 100644
---- a/platforms/unix/config/Makefile.install
-+++ b/platforms/unix/config/Makefile.install
-@@ -16,102 +16,102 @@ uninstall : uninstall-squeak uninstall-plugins uninstall-doc $(uninstall_nps)
- # squeak
- 
- install-squeak : $(squeak)
--	$(MKINSTALLDIRS) $(ROOT)$(plgdir)
--	$(INSTALL_PROG) $(squeak) $(ROOT)$(plgdir)
--	$(MKINSTALLDIRS) $(ROOT)$(bindir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(plgdir)
-+	$(INSTALL_PROG) $(squeak) $(DESTDIR)$(ROOT)$(plgdir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(bindir)
- 	if test -n "$(VM_APP_ICONS)"; then \
--	  $(INSTALL_DATA) $(ICONS) $(ROOT)$(VM_APP_ICONS); \
-+	  $(INSTALL_DATA) $(ICONS) $(DESTDIR)$(ROOT)$(VM_APP_ICONS); \
- 	fi
- 	( path=`$(cfgdir)/relpath $(bindir) $(plgdir)`; \
--	  cd $(ROOT)$(bindir); \
-+	  cd $(DESTDIR)$(ROOT)$(bindir); \
- 	  rm -f $(squeak); \
- 	  $(LN_S) $$path/$(squeak) .; )
- 
- uninstall-squeak : .force
- 	if test -n "$(VM_APP_ICONS)"; then \
--	  $(UNINSTALL) $(ROOT)$(VM_APP_ICONS); \
-+	  $(UNINSTALL) $(DESTDIR)$(ROOT)$(VM_APP_ICONS); \
- 	fi
--	@$(UNINSTALL) $(ROOT)$(plgdir) $(squeak)
--	@$(UNINSTALL) $(ROOT)$(bindir) $(squeak)
-+	@$(UNINSTALL) $(DESTDIR)$(ROOT)$(plgdir) $(squeak)
-+	@$(UNINSTALL) $(DESTDIR)$(ROOT)$(bindir) $(squeak)
- 
- # plugins
- 
- install-plugins : plugins
--	$(MKINSTALLDIRS) $(ROOT)$(plgdir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(plgdir)
- 	@list='$(PLUGINS_LA)'; for p in $$list; do \
- 	  if test -f */$$p; then \
--	    echo "$(LIBTOOL) --mode=install $(INSTALL_PROG) $$p $(ROOT)$(plgdir)/$$p"; \
--	    $(LIBTOOL) --mode=install $(INSTALL_PROG) */$$p $(ROOT)$(plgdir)/$$p; \
-+	    echo "$(LIBTOOL) --mode=install $(INSTALL_PROG) $$p $(DESTDIR)$(ROOT)$(plgdir)/$$p"; \
-+	    $(LIBTOOL) --mode=install $(INSTALL_PROG) */$$p $(DESTDIR)$(ROOT)$(plgdir)/$$p; \
- 	  else :; fi; \
- 	done
--	-rm $(ROOT)$(plgdir)/*.la
-+	-rm $(DESTDIR)$(ROOT)$(plgdir)/*.la
- 
- uninstall-plugins : .force
- 	@list='$(PLUGINS_LA)'; for p in $$list; do \
--	  filename=$(ROOT)/$(plgdir)/`basename $$p .la`;\
-+	  filename=$(DESTDIR)$(ROOT)/$(plgdir)/`basename $$p .la`;\
- 	  if test -f $$filename; then \
- 	    echo "$(LIBTOOL) --mode=uninstall rm -f $$filename"; \
- 	    $(LIBTOOL) --mode=uninstall rm -f $$filename; \
- 	  else
- 	    echo "$$filename does not exist"; fi; \
- 	done
--	@$(UNINSTALL) $(ROOT)$(plgdir)
-+	@$(UNINSTALL) $(DESTDIR)$(ROOT)$(plgdir)
- 
- # doc
- 
- install-doc : squeak.1
--	$(MKINSTALLDIRS) $(ROOT)$(docdir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(docdir)
- 	@list='$(DOCFILES)'; for f in $$list; do \
--	  echo $(INSTALL_DATA) $(topdir)/platforms/unix/doc/$$f $(ROOT)$(docdir); \
--	  $(INSTALL_DATA) $(topdir)/platforms/unix/doc/$$f $(ROOT)$(docdir); \
-+	  echo $(INSTALL_DATA) $(topdir)/platforms/unix/doc/$$f $(DESTDIR)$(ROOT)$(docdir); \
-+	  $(INSTALL_DATA) $(topdir)/platforms/unix/doc/$$f $(DESTDIR)$(ROOT)$(docdir); \
- 	done
--	-gzip -f9 $(ROOT)$(docdir)/*
--	$(MKINSTALLDIRS) $(ROOT)$(mandir)/man1
--	$(INSTALL_DATA) squeak.1 $(ROOT)$(mandir)/man1
--	rm -f $(ROOT)$(mandir)/man1/inisqueak.1 $(ROOT)$(mandir)/man1/inisqueak.1.gz
--	if test -f $(ROOT)$(mandir)/man1/squeak.1; then $(LN) $(ROOT)$(mandir)/man1/squeak.1 $(ROOT)$(mandir)/man1/inisqueak.1; fi
--	if test -f $(ROOT)$(mandir)/man1/squeak.1.gz; then $(LN) $(ROOT)$(mandir)/man1/squeak.1.gz $(ROOT)$(mandir)/man1/inisqueak.1.gz; fi
-+	-gzip -f9 $(DESTDIR)$(ROOT)$(docdir)/*
-+	$(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(mandir)/man1
-+	$(INSTALL_DATA) squeak.1 $(DESTDIR)$(ROOT)$(mandir)/man1
-+	rm -f $(DESTDIR)$(ROOT)$(mandir)/man1/inisqueak.1 $(DESTDIR)$(ROOT)$(mandir)/man1/inisqueak.1.gz
-+	if test -f $(DESTDIR)$(ROOT)$(mandir)/man1/squeak.1; then $(LN) $(DESTDIR)$(ROOT)$(mandir)/man1/squeak.1 $(DESTDIR)$(ROOT)$(mandir)/man1/inisqueak.1; fi
-+	if test -f $(DESTDIR)$(ROOT)$(mandir)/man1/squeak.1.gz; then $(LN) $(DESTDIR)$(ROOT)$(mandir)/man1/squeak.1.gz $(DESTDIR)$(ROOT)$(mandir)/man1/inisqueak.1.gz; fi
- 
- uninstall-doc :
- 	@list='$(DOCFILES)'; for f in $$list; do \
--	  rm -fv $(ROOT)$(docdir)/$$f.gz; \
-+	  rm -fv $(DESTDIR)$(ROOT)$(docdir)/$$f.gz; \
- 	done
--	@$(UNINSTALL) $(ROOT)$(docdir) $(DOCFILES)
--	@$(UNINSTALL) $(ROOT)$(mandir)/man1 squeak.1 inisqueak.1
-+	@$(UNINSTALL) $(DESTDIR)$(ROOT)$(docdir) $(DOCFILES)
-+	@$(UNINSTALL) $(DESTDIR)$(ROOT)$(mandir)/man1 squeak.1 inisqueak.1
- 
- # image
- 
- install-image : inisqueak $(topdir)/Squeak$(SQ_VERSION).image.gz $(topdir)/Squeak$(SQ_VERSION).changes.gz
--	$(MKINSTALLDIRS) $(ROOT)$(imgdir)
--	$(INSTALL_PROG) inisqueak $(ROOT)$(imgdir)
--	$(INSTALL_DATA) $(topdir)/Squeak$(SQ_VERSION).image.gz $(ROOT)$(imgdir)
--	$(INSTALL_DATA) $(topdir)/Squeak$(SQ_VERSION).changes.gz $(ROOT)$(imgdir)
--	$(LN_S) Squeak$(SQ_VERSION).image.gz $(ROOT)$(imgdir)/squeak.image.gz
--	$(LN_S) Squeak$(SQ_VERSION).changes.gz $(ROOT)$(imgdir)/squeak.changes.gz
--	$(MKINSTALLDIRS) $(ROOT)$(bindir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(imgdir)
-+	$(INSTALL_PROG) inisqueak $(DESTDIR)$(ROOT)$(imgdir)
-+	$(INSTALL_DATA) $(topdir)/Squeak$(SQ_VERSION).image.gz $(DESTDIR)$(ROOT)$(imgdir)
-+	$(INSTALL_DATA) $(topdir)/Squeak$(SQ_VERSION).changes.gz $(DESTDIR)$(ROOT)$(imgdir)
-+	$(LN_S) Squeak$(SQ_VERSION).image.gz $(DESTDIR)$(ROOT)$(imgdir)/squeak.image.gz
-+	$(LN_S) Squeak$(SQ_VERSION).changes.gz $(DESTDIR)$(ROOT)$(imgdir)/squeak.changes.gz
-+	$(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(bindir)
- 	( path=`$(cfgdir)/relpath $(bindir) $(imgdir)`; \
--	  cd $(ROOT)$(bindir); \
-+	  cd $(DESTDIR)$(ROOT)$(bindir); \
- 	  rm -f inisqueak; \
- 	  $(LN_S) $$path/inisqueak .; )
- 
- uninstall-image :
--	@$(UNINSTALL) $(ROOT)$(plgdir) Squeak$(SQ_VERSION).image.gz
--	@$(UNINSTALL) $(ROOT)$(plgdir) Squeak$(SQ_VERSION).changes.gz
--	@$(UNINSTALL) $(ROOT)$(plgdir) inisqueak
-+	@$(UNINSTALL) $(DESTDIR)$(ROOT)$(plgdir) Squeak$(SQ_VERSION).image.gz
-+	@$(UNINSTALL) $(DESTDIR)$(ROOT)$(plgdir) Squeak$(SQ_VERSION).changes.gz
-+	@$(UNINSTALL) $(DESTDIR)$(ROOT)$(plgdir) inisqueak
- 
- # sources
- 
- install-sources :
--	$(MKINSTALLDIRS) $(ROOT)$(imgdir)
--	$(INSTALL_DATA) $(topdir)/SqueakV$(SQ_MAJOR).sources $(ROOT)$(imgdir)
-+	$(MKINSTALLDIRS) $(DESTDIR)$(ROOT)$(imgdir)
-+	$(INSTALL_DATA) $(topdir)/SqueakV$(SQ_MAJOR).sources $(DESTDIR)$(ROOT)$(imgdir)
- 
- uninstall-sources :
--	@$(UNINSTALL) $(ROOT)$(imgdir) SqueakV$(SQ_MAJOR).sources
-+	@$(UNINSTALL) $(DESTDIR)$(ROOT)$(imgdir) SqueakV$(SQ_MAJOR).sources
- 
- # npsqueak
- 
- install-npsqueak : npsqueak .force
--	$(SHELL) -ec 'cd nps; $(MAKE) install ROOT=$(ROOT) VM_VERSION=$(VM_VERSION) plgdir=$(plgdir) bindir=$(bindir) imgdir=$(imgdir)'
-+	$(SHELL) -ec 'cd nps; $(MAKE) install ROOT=$(DESTDIR)$(ROOT) VM_VERSION=$(VM_VERSION) plgdir=$(plgdir) bindir=$(bindir) imgdir=$(imgdir)'
- 
- uninstall-npsqueak : npsqueak .force
--	$(SHELL) -ec 'cd nps; $(MAKE) uninstall ROOT=$(ROOT) VM_VERSION=$(VM_VERSION) plgdir=$(plgdir) bindir=$(bindir) imgdir=$(imgdir)'
-+	$(SHELL) -ec 'cd nps; $(MAKE) uninstall ROOT=$(DESTDIR)$(ROOT) VM_VERSION=$(VM_VERSION) plgdir=$(plgdir) bindir=$(bindir) imgdir=$(imgdir)'
-diff --git a/platforms/unix/config/acinclude.m4 b/platforms/unix/config/acinclude.m4
-index acaf3c5..a712864 100644
---- a/platforms/unix/config/acinclude.m4
-+++ b/platforms/unix/config/acinclude.m4
-@@ -92,12 +92,12 @@ AC_DEFUN([AC_CHECK_INT64_T],[
-     AC_MSG_ERROR([could not find a 64-bit integer type])
-   fi
-   SQUEAK_INT64_T="$ac_cv_int64_t"
--  AC_DEFINE_UNQUOTED(squeakInt64, $ac_cv_int64_t)])
-+  AC_DEFINE_UNQUOTED(squeakInt64, $ac_cv_int64_t, "64bit type")])
-   
- 
- AC_DEFUN([AC_NEED_SUNOS_H],
- [case "$host" in
--  *-sunos*)	AC_DEFINE(NEED_SUNOS_H, 1)
-+  *-sunos*)	AC_DEFINE(NEED_SUNOS_H, 1, "sunos")
- esac])
- 
- 
-@@ -118,7 +118,7 @@ if test "$GCC" = yes; then
-     ac_optflags="-O3 -funroll-loops -mcpu=750 -mno-fused-madd"
-     ;;
-   esac
--  AC_DEFINE(VM_BUILD_STRING, ["Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__])
-+  AC_DEFINE(VM_BUILD_STRING, ["Unix built on "__DATE__ " "__TIME__" Compiler: "__VERSION__], "Build string")
- else
-   ac_optflags="-O"
-   ac_vm_build_date="`date`"
-@@ -177,38 +177,38 @@ AC_DEFUN([AC_CHECK_ATEXIT],
-   AC_TRY_COMPILE([#include <stdlib.h>],[on_exit(0);], ac_cv_atexit="on_exit",
-   ac_cv_atexit="no")))
- if test "$ac_cv_atexit" != "no"; then
--  AC_DEFINE_UNQUOTED(AT_EXIT, $ac_cv_atexit)
-+  AC_DEFINE_UNQUOTED(AT_EXIT, $ac_cv_atexit, "atexit or on_exit")
- fi])
- 
- AC_DEFUN([AC_CHECK_SOCKLEN_T],
- [AC_CACHE_CHECK([for socklen_t in sys/socket.h], ac_cv_socklen_t,
-   AC_TRY_COMPILE([#include <sys/socket.h>],[sizeof(socklen_t);],
-     ac_cv_socklen_t="yes", ac_cv_socklen_t="no"))
--test "$ac_cv_socklen_t" != "yes" && AC_DEFINE(socklen_t, int)])
-+test "$ac_cv_socklen_t" != "yes" && AC_DEFINE(socklen_t, int, "socklen type")])
- 
- AC_DEFUN([AC_CHECK_TZSET],
- [AC_CACHE_CHECK([for tzset], ac_cv_tzset,
-   AC_TRY_COMPILE([#include <time.h>],[tzet();],
-     ac_cv_tzset="yes", ac_cv_tzset="no"))
--test "$ac_cv_tzset" != "no" && AC_DEFINE(HAVE_TZSET)])
-+test "$ac_cv_tzset" != "no" && AC_DEFINE(HAVE_TZSET, [1], "tzset")])
- 
- AC_DEFUN([AC_CHECK_GMTOFF],
- [AC_CACHE_CHECK([for gmtoff in struct tm], ac_cv_tm_gmtoff,
-   AC_TRY_COMPILE([#include <time.h>],[struct tm tm; tm.tm_gmtoff;],
-     ac_cv_tm_gmtoff="yes", ac_cv_tm_gmtoff="no"))
--test "$ac_cv_tm_gmtoff" != "no" && AC_DEFINE(HAVE_TM_GMTOFF)])
-+test "$ac_cv_tm_gmtoff" != "no" && AC_DEFINE(HAVE_TM_GMTOFF, [1], "tm")])
- 
- AC_DEFUN([AC_CHECK_TIMEZONE],
- [AC_CACHE_CHECK([for timezone and daylight variables], ac_cv_timezone,
-   AC_TRY_COMPILE([extern long timezone; extern int daylight;],[timezone;daylight;],
-     ac_cv_timezone="yes", ac_cv_timezone="no"))
--test "$ac_cv_timezone" != "no" && AC_DEFINE(HAVE_TIMEZONE)])
-+test "$ac_cv_timezone" != "no" && AC_DEFINE(HAVE_TIMEZONE, [1], "timezone")])
- 
- AC_DEFUN([AC_CHECK_GETHOSTNAME],
- [AC_CACHE_CHECK([for gethostname in unistd.h], ac_cv_gethostname_p,
-   AC_TRY_COMPILE([#include <unistd.h>],[return (int)gethostname;],
-     ac_cv_gethostname_p="yes", ac_cv_gethostname_p="no"))
--test "$ac_cv_gethostname_p" = "no" && AC_DEFINE(NEED_GETHOSTNAME_P)])
-+test "$ac_cv_gethostname_p" = "no" && AC_DEFINE(NEED_GETHOSTNAME_P, [1], "gethostname")])
- 
- 
- if test -x /bin/test; then
-@@ -234,14 +234,14 @@ AC_DEFUN([AC_C_DOUBLE_ALIGNMENT],
-   AC_TRY_RUN([f(int i){*(double *)i=*(double *)(i+4);}
-               int main(){char b[[12]];f(b);return 0;}],
-     ac_cv_double_align="yes", ac_cv_double_align="no"))
--test "$ac_cv_double_align" = "no" && AC_DEFINE(DOUBLE_WORD_ALIGNMENT)])
-+test "$ac_cv_double_align" = "no" && AC_DEFINE(DOUBLE_WORD_ALIGNMENT, [1], "unaligned double access")])
- 
- AC_DEFUN([AC_C_DOUBLE_ORDER],
- [AC_CACHE_CHECK([whether doubles are stored in Squeak order], ac_cv_double_order,
-   AC_TRY_RUN([union { double d; int i[[2]]; } d;
- 	      int main(void) { d.d= 1.0;  return d.i[[0]] == 0; }],
-     ac_cv_double_order="yes", ac_cv_double_order="no"))
--test "$ac_cv_double_order" = "no" && AC_DEFINE(DOUBLE_WORD_ORDER)])
-+test "$ac_cv_double_order" = "no" && AC_DEFINE(DOUBLE_WORD_ORDER, [1], "double word order")])
- 
- # this assumes that libtool has already been configured and built --
- # if not then err on the side of conservatism.
-@@ -252,7 +252,7 @@ if test -x ./libtool &&
- then ac_cv_module_prefix="(none)";
- else ac_cv_module_prefix="lib"
- fi)
--AC_DEFINE_UNQUOTED(VM_MODULE_PREFIX,"$mkfrags_lib_prefix")
-+AC_DEFINE_UNQUOTED(VM_MODULE_PREFIX,"$mkfrags_lib_prefix", "VM module prefix")
- test "$ac_cv_module_prefix" = lib && mkfrags_lib_prefix=lib])
- 
- AC_DEFUN([AC_64BIT_ARCH],
-diff --git a/platforms/unix/config/configure b/platforms/unix/config/configure
-index a59ea90..ad406b2 100755
---- a/platforms/unix/config/configure
-+++ b/platforms/unix/config/configure
-@@ -1,6 +1,6 @@
- #! /bin/sh
- # Guess values for system-dependent variables and create Makefiles.
--# Generated by GNU Autoconf 2.60.
-+# Generated by GNU Autoconf 2.61.
- #
- # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
- # 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-@@ -10,7 +10,8 @@
- ## M4sh Initialization.  ##
- ## --------------------- ##
- 
--# Be Bourne compatible
-+# Be more Bourne compatible
-+DUALCASE=1; export DUALCASE # for MKS sh
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
-@@ -19,10 +20,13 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
- else
--  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+  case `(set -o) 2>/dev/null` in
-+  *posix*) set -o posix ;;
-+esac
-+
- fi
--BIN_SH=xpg4; export BIN_SH # for Tru64
--DUALCASE=1; export DUALCASE # for MKS sh
-+
-+
- 
- 
- # PATH needs CR
-@@ -215,7 +219,7 @@ test \$exitcode = 0) || { (exit 1); exit 1; }
- else
-   as_candidate_shells=
-     as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
--for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
-+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
- do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-@@ -233,7 +237,6 @@ IFS=$as_save_IFS
- 	 # Try only shells that exist, to save several forks.
- 	 if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
- 		{ ("$as_shell") 2> /dev/null <<\_ASEOF
--# Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
-@@ -242,10 +245,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
- else
--  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+  case `(set -o) 2>/dev/null` in
-+  *posix*) set -o posix ;;
-+esac
-+
- fi
--BIN_SH=xpg4; export BIN_SH # for Tru64
--DUALCASE=1; export DUALCASE # for MKS sh
-+
- 
- :
- _ASEOF
-@@ -253,7 +258,6 @@ _ASEOF
-   CONFIG_SHELL=$as_shell
- 	       as_have_required=yes
- 	       if { "$as_shell" 2> /dev/null <<\_ASEOF
--# Be Bourne compatible
- if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   emulate sh
-   NULLCMD=:
-@@ -262,10 +266,12 @@ if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
-   alias -g '${1+"$@"}'='"$@"'
-   setopt NO_GLOB_SUBST
- else
--  case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
-+  case `(set -o) 2>/dev/null` in
-+  *posix*) set -o posix ;;
-+esac
-+
- fi
--BIN_SH=xpg4; export BIN_SH # for Tru64
--DUALCASE=1; export DUALCASE # for MKS sh
-+
- 
- :
- (as_func_return () {
-@@ -512,19 +518,28 @@ else
-   as_mkdir_p=false
- fi
- 
--# Find out whether ``test -x'' works.  Don't use a zero-byte file, as
--# systems may use methods other than mode bits to determine executability.
--cat >conf$$.file <<_ASEOF
--#! /bin/sh
--exit 0
--_ASEOF
--chmod +x conf$$.file
--if test -x conf$$.file >/dev/null 2>&1; then
--  as_executable_p="test -x"
-+if test -x / >/dev/null 2>&1; then
-+  as_test_x='test -x'
- else
--  as_executable_p=:
-+  if ls -dL / >/dev/null 2>&1; then
-+    as_ls_L_option=L
-+  else
-+    as_ls_L_option=
-+  fi
-+  as_test_x='
-+    eval sh -c '\''
-+      if test -d "$1"; then
-+        test -d "$1/.";
-+      else
-+	case $1 in
-+        -*)set "./$1";;
-+	esac;
-+	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
-+	???[sx]*):;;*)false;;esac;fi
-+    '\'' sh
-+  '
- fi
--rm -f conf$$.file
-+as_executable_p=$as_test_x
- 
- # Sed expression to map a string onto a valid CPP name.
- as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
-@@ -571,7 +586,7 @@ fi
- 
- # The HP-UX ksh and POSIX shell print the target directory to stdout
- # if CDPATH is set.
--if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
-+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
- 
- if test -z "$ECHO"; then
- if test "X${echo_test_string+set}" != Xset; then
-@@ -684,9 +699,9 @@ fi
- 
- 
- 
--tagnames=`echo "$tagnames,CXX" | sed 's/^,//'`
-+tagnames=${tagnames+${tagnames},}CXX
- 
--tagnames=`echo "$tagnames,F77" | sed 's/^,//'`
-+tagnames=${tagnames+${tagnames},}F77
- 
- exec 7<&0 </dev/null 6>&1
- 
-@@ -719,36 +734,36 @@ ac_unique_file="config.h.in"
- # Factoring default headers for most tests.
- ac_includes_default="\
- #include <stdio.h>
--#if HAVE_SYS_TYPES_H
-+#ifdef HAVE_SYS_TYPES_H
- # include <sys/types.h>
- #endif
--#if HAVE_SYS_STAT_H
-+#ifdef HAVE_SYS_STAT_H
- # include <sys/stat.h>
- #endif
--#if STDC_HEADERS
-+#ifdef STDC_HEADERS
- # include <stdlib.h>
- # include <stddef.h>
- #else
--# if HAVE_STDLIB_H
-+# ifdef HAVE_STDLIB_H
- #  include <stdlib.h>
- # endif
- #endif
--#if HAVE_STRING_H
--# if !STDC_HEADERS && HAVE_MEMORY_H
-+#ifdef HAVE_STRING_H
-+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
- #  include <memory.h>
- # endif
- # include <string.h>
- #endif
--#if HAVE_STRINGS_H
-+#ifdef HAVE_STRINGS_H
- # include <strings.h>
- #endif
--#if HAVE_INTTYPES_H
-+#ifdef HAVE_INTTYPES_H
- # include <inttypes.h>
- #endif
--#if HAVE_STDINT_H
-+#ifdef HAVE_STDINT_H
- # include <stdint.h>
- #endif
--#if HAVE_UNISTD_H
-+#ifdef HAVE_UNISTD_H
- # include <unistd.h>
- #endif"
- 
-@@ -855,15 +870,14 @@ uninstall_nps
- SQ_LIBDIR
- int_modules
- ext_modules
--XMKMF
-+HAVE_LANGINFO_CODESET
-+HAVE_NANOSLEEP
- X_CFLAGS
- X_PRE_LIBS
- X_LIBS
- X_EXTRA_LIBS
- X_CPPFLAGS
- X_INCLUDES
--HAVE_LANGINFO_CODESET
--HAVE_NANOSLEEP
- LIBM_CFLAGS
- FFI_DIR
- FFI_C
-@@ -888,6 +902,7 @@ target_alias
- CC
- CFLAGS
- LDFLAGS
-+LIBS
- CPPFLAGS
- CPP
- CXX
-@@ -895,8 +910,7 @@ CXXFLAGS
- CCC
- CXXCPP
- F77
--FFLAGS
--XMKMF'
-+FFLAGS'
- 
- 
- # Initialize some variables set by options.
-@@ -1002,10 +1016,10 @@ do
-   -disable-* | --disable-*)
-     ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-    { (exit 1); exit 1; }; }
--    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-     eval enable_$ac_feature=no ;;
- 
-   -docdir | --docdir | --docdi | --doc | --do)
-@@ -1021,10 +1035,10 @@ do
-   -enable-* | --enable-*)
-     ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+    expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid feature name: $ac_feature" >&2
-    { (exit 1); exit 1; }; }
--    ac_feature=`echo $ac_feature | sed 's/-/_/g'`
-+    ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
-     eval enable_$ac_feature=\$ac_optarg ;;
- 
-   -exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
-@@ -1218,19 +1232,19 @@ do
-   -with-* | --with-*)
-     ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid package name: $ac_package" >&2
-    { (exit 1); exit 1; }; }
--    ac_package=`echo $ac_package| sed 's/-/_/g'`
-+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-     eval with_$ac_package=\$ac_optarg ;;
- 
-   -without-* | --without-*)
-     ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
-     # Reject names that are not valid shell variable names.
--    expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
-+    expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
-       { echo "$as_me: error: invalid package name: $ac_package" >&2
-    { (exit 1); exit 1; }; }
--    ac_package=`echo $ac_package | sed 's/-/_/g'`
-+    ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
-     eval with_$ac_package=no ;;
- 
-   --x)
-@@ -1494,11 +1508,11 @@ Optional Packages:
-   --with-tags[=TAGS]      include additional configurations [automatic]
-   --without-rfb           disable Remote FrameBuffer support default=enabled
-   --without-npsqueak      disable browser plugin support default=enabled
-+  --with-custom-display   enable custom window support default=disabled
-   --without-quartz        disable MacOSX Window System support default=enabled
-   --without-x             disable X Window System support default=enabled
-   --without-gl            disable OpenGL support default=enabled
-   --with-x                use the X Window System
--  --with-custom-display   enable custom window support default=disabled
-   --with-custom-sound     enable custom sound support default=disabled
-   --with-ffi=ffi          use FFI support default=auto
- 
-@@ -1507,6 +1521,7 @@ Some influential environment variables:
-   CFLAGS      C compiler flags
-   LDFLAGS     linker flags, e.g. -L<lib dir> if you have libraries in a
-               nonstandard directory <lib dir>
-+  LIBS        libraries to pass to the linker, e.g. -l<library>
-   CPPFLAGS    C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
-               you have headers in a nonstandard directory <include dir>
-   CPP         C preprocessor
-@@ -1515,7 +1530,6 @@ Some influential environment variables:
-   CXXCPP      C++ preprocessor
-   F77         Fortran 77 compiler command
-   FFLAGS      Fortran 77 compiler flags
--  XMKMF       Path to xmkmf, Makefile generator for X Window System
- 
- Use these variables to override the choices made by `configure' or to help
- it to find libraries and programs with nonstandard names/locations.
-@@ -1581,7 +1595,7 @@ test -n "$ac_init_help" && exit $ac_status
- if $ac_init_version; then
-   cat <<\_ACEOF
- configure
--generated by GNU Autoconf 2.60
-+generated by GNU Autoconf 2.61
- 
- Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
- 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
-@@ -1595,7 +1609,7 @@ This file contains any messages produced by compilers while
- running configure, to aid debugging if configure makes a mistake.
- 
- It was created by $as_me, which was
--generated by GNU Autoconf 2.60.  Invocation command line was
-+generated by GNU Autoconf 2.61.  Invocation command line was
- 
-   $ $0 $@
- 
-@@ -1832,7 +1846,7 @@ _ACEOF
- # Let the site file select an alternate cache file if it wants to.
- # Prefer explicitly selected file to automatically selected ones.
- if test -n "$CONFIG_SITE"; then
--  set x "$CONFIG_SITE"
-+  set x $CONFIG_SITE
- elif test "x$prefix" != xNONE; then
-   set x "$prefix/share/config.site" "$prefix/etc/config.site"
- else
-@@ -2007,6 +2021,7 @@ blddir=`pwd`
- 
- SQ_VERSION=${SQ_MAJOR}.${SQ_MINOR}-${SQ_UPDATE}
- 
-+
- cat >>confdefs.h <<_ACEOF
- #define SQ_VERSION "${SQ_VERSION}"
- _ACEOF
-@@ -2019,6 +2034,7 @@ _ACEOF
- 
- VM_VERSION=${VM_MAJOR}.${VM_MINOR}-${VM_RELEASE}
- 
-+
- cat >>confdefs.h <<_ACEOF
- #define VM_VERSION "${VM_VERSION}"
- _ACEOF
-@@ -2038,6 +2054,7 @@ plgdir=`eval echo ${imgdir}/${VM_VERSION}`
- 
- 
- 
-+
- cat >>confdefs.h <<\_ACEOF
- #define OS_TYPE "unix"
- _ACEOF
-@@ -2166,14 +2183,17 @@ host=`echo $host | sed 's,-unknown,,'`
- 
- 
- 
-+
- cat >>confdefs.h <<_ACEOF
- #define VM_HOST "$host"
- _ACEOF
- 
-+
- cat >>confdefs.h <<_ACEOF
- #define VM_HOST_OS "$host_os"
- _ACEOF
- 
-+
- cat >>confdefs.h <<_ACEOF
- #define VM_HOST_CPU "$host_cpu"
- _ACEOF
-@@ -2258,7 +2278,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}gcc"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2298,7 +2318,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CC="gcc"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2355,7 +2375,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="${ac_tool_prefix}cc"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2396,7 +2416,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
-        ac_prog_rejected=yes
-        continue
-@@ -2454,7 +2474,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2498,7 +2518,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_CC="$ac_prog"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -2639,7 +2659,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- # in a Makefile.  We should not override ac_cv_exeext if it was cached,
- # so that the user can short-circuit this test for compilers unknown to
- # Autoconf.
--for ac_file in $ac_files
-+for ac_file in $ac_files ''
- do
-   test -f "$ac_file" || continue
-   case $ac_file in
-@@ -2667,6 +2687,12 @@ done
- test "$ac_cv_exeext" = no && ac_cv_exeext=
- 
- else
-+  ac_file=''
-+fi
-+
-+{ echo "$as_me:$LINENO: result: $ac_file" >&5
-+echo "${ECHO_T}$ac_file" >&6; }
-+if test -z "$ac_file"; then
-   echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
- 
-@@ -2678,8 +2704,6 @@ See \`config.log' for more details." >&2;}
- fi
- 
- ac_exeext=$ac_cv_exeext
--{ echo "$as_me:$LINENO: result: $ac_file" >&5
--echo "${ECHO_T}$ac_file" >&6; }
- 
- # Check that the compiler produces executables we can run.  If not, either
- # the compiler is broken, or we cross compile.
-@@ -2857,27 +2881,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_compiler_gnu=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -2932,27 +2939,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_g=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -2987,27 +2977,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   :
- else
-   echo "$as_me: failed program was:" >&5
-@@ -3043,27 +3016,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_g=yes
- else
-   echo "$as_me: failed program was:" >&5
-@@ -3179,27 +3135,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
-   rm -f conftest.er1
-   cat conftest.err >&5
-   echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest.$ac_objext'
--  { (case "(($ac_try" in
--  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
--  *) ac_try_echo=$ac_try;;
--esac
--eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
--  (eval "$ac_try") 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
-+  (exit $ac_status); } && {
-+	 test -z "$ac_c_werror_flag" ||
-+	 test ! -s conftest.err
-+       } && test -s conftest.$ac_objext; then
-   ac_cv_prog_cc_c89=$ac_arg
- else
-   echo "$as_me: failed program was:" >&5
-@@ -3254,7 +3193,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_AS="as"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -3303,7 +3242,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -3343,7 +3282,7 @@ do
-   IFS=$as_save_IFS
-   test -z "$as_dir" && as_dir=.
-   for ac_exec_ext in '' $ac_executable_extensions; do
--  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
-+  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-     ac_cv_prog_ac_ct_RANLIB="ranlib"
-     echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
-     break 2
-@@ -3418,7 +3357,7 @@ case $as_dir/ in
-     # by default.
-     for ac_prog in ginstall scoinst install; do
-       for ac_exec_ext in '' $ac_executable_extensions; do
--	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext";