diff -uNr --exclude=CVS libgii/Makefile.in libgii.macosx/Makefile.in
--- libgii/Makefile.in	Thu Nov 28 01:10:22 2002
+++ libgii.macosx/Makefile.in	Thu Nov 28 02:00:07 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/config.h.in libgii.macosx/config.h.in
--- libgii/config.h.in	Thu Nov  7 00:27:51 2002
+++ libgii.macosx/config.h.in	Thu Nov  7 01:04:55 2002
@@ -41,6 +41,10 @@
 #undef CC_CAN_CPUID
 #undef CC_CAN_AMASK
 
+/* Define if you have the <ApplicationServices/ApplicationServices.h> header
+   file. */
+#undef HAVE_APPLICATIONSERVICES_APPLICATIONSERVICES_H
+
 /* Define if you have the <arpa/inet.h> header file. */
 #undef HAVE_ARPA_INET_H
 
diff -uNr --exclude=CVS libgii/configure libgii.macosx/configure
--- libgii/configure	Thu Nov 28 01:10:49 2002
+++ libgii.macosx/configure	Thu Nov 28 02:00:31 2002
@@ -865,7 +865,8 @@
   --disable-directx       don't build the directx inputlib
   --enable-pcjoy          build the pcjoy inputlib
   --enable-lk201          build the lk201 DEC serial terminal inputlib
-  --enable-kii          build the kii inputlib
+  --enable-kii            build the kii inputlib
+  --enable-cocoa          build the cocoa inputlib
   --enable-mutexes=TYPE   force the kind of mutexes to use
                             (builtin, pthread or dynpthread)
   --disable-debug         build without run-time debugging (speed freaks)
@@ -1072,7 +1073,7 @@
 fi
 for ac_site_file in $CONFIG_SITE; do
   if test -r "$ac_site_file"; then
-    { echo "$as_me:1075: loading site script $ac_site_file" >&5
+    { echo "$as_me:1076: loading site script $ac_site_file" >&5
 echo "$as_me: loading site script $ac_site_file" >&6;}
     cat "$ac_site_file" >&5
     . "$ac_site_file"
@@ -1083,7 +1084,7 @@
   # Some versions of bash will fail to source /dev/null (special
   # files actually), so we avoid doing that.
   if test -f "$cache_file"; then
-    { echo "$as_me:1086: loading cache $cache_file" >&5
+    { echo "$as_me:1087: loading cache $cache_file" >&5
 echo "$as_me: loading cache $cache_file" >&6;}
     case $cache_file in
       [\\/]* | ?:[\\/]* ) . $cache_file;;
@@ -1091,7 +1092,7 @@
     esac
   fi
 else
-  { echo "$as_me:1094: creating cache $cache_file" >&5
+  { echo "$as_me:1095: creating cache $cache_file" >&5
 echo "$as_me: creating cache $cache_file" >&6;}
   >$cache_file
 fi
@@ -1107,21 +1108,21 @@
   eval ac_new_val="\$ac_env_${ac_var}_value"
   case $ac_old_set,$ac_new_set in
     set,)
-      { echo "$as_me:1110: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
+      { echo "$as_me:1111: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was set to \`$ac_old_val' in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,set)
-      { echo "$as_me:1114: error: \`$ac_var' was not set in the previous run" >&5
+      { echo "$as_me:1115: error: \`$ac_var' was not set in the previous run" >&5
 echo "$as_me: error: \`$ac_var' was not set in the previous run" >&2;}
       ac_cache_corrupted=: ;;
     ,);;
     *)
       if test "x$ac_old_val" != "x$ac_new_val"; then
-        { echo "$as_me:1120: error: \`$ac_var' has changed since the previous run:" >&5
+        { echo "$as_me:1121: error: \`$ac_var' has changed since the previous run:" >&5
 echo "$as_me: error: \`$ac_var' has changed since the previous run:" >&2;}
-        { echo "$as_me:1122:   former value:  $ac_old_val" >&5
+        { echo "$as_me:1123:   former value:  $ac_old_val" >&5
 echo "$as_me:   former value:  $ac_old_val" >&2;}
-        { echo "$as_me:1124:   current value: $ac_new_val" >&5
+        { echo "$as_me:1125:   current value: $ac_new_val" >&5
 echo "$as_me:   current value: $ac_new_val" >&2;}
         ac_cache_corrupted=:
       fi;;
@@ -1140,9 +1141,9 @@
   fi
 done
 if $ac_cache_corrupted; then
-  { echo "$as_me:1143: error: changes in the environment can compromise the build" >&5
+  { echo "$as_me:1144: error: changes in the environment can compromise the build" >&5
 echo "$as_me: error: changes in the environment can compromise the build" >&2;}
-  { { echo "$as_me:1145: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
+  { { echo "$as_me:1146: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&5
 echo "$as_me: error: run \`make distclean' and/or \`rm $cache_file' and start over" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1162,10 +1163,10 @@
 echo "#! $SHELL" >conftest.sh
 echo  "exit 0"   >>conftest.sh
 chmod +x conftest.sh
-if { (echo "$as_me:1165: PATH=\".;.\"; conftest.sh") >&5
+if { (echo "$as_me:1166: PATH=\".;.\"; conftest.sh") >&5
   (PATH=".;."; conftest.sh) 2>&5
   ac_status=$?
-  echo "$as_me:1168: \$? = $ac_status" >&5
+  echo "$as_me:1169: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   ac_path_separator=';'
 else
@@ -1192,7 +1193,7 @@
   fi
 done
 if test -z "$ac_aux_dir"; then
-  { { echo "$as_me:1195: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
+  { { echo "$as_me:1196: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&5
 echo "$as_me: error: cannot find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1212,7 +1213,7 @@
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:1215: checking for a BSD compatible install" >&5
+echo "$as_me:1216: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -1261,7 +1262,7 @@
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:1264: result: $INSTALL" >&5
+echo "$as_me:1265: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -1272,7 +1273,7 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:1275: checking whether build environment is sane" >&5
+echo "$as_me:1276: checking whether build environment is sane" >&5
 echo $ECHO_N "checking whether build environment is sane... $ECHO_C" >&6
 # Just in case
 sleep 1
@@ -1296,7 +1297,7 @@
       # if, for instance, CONFIG_SHELL is bash and it inherits a
       # broken ls alias from the environment.  This has actually
       # happened.  Such a system could not be considered "sane".
-      { { echo "$as_me:1299: error: ls -t appears to fail.  Make sure there is not a broken
+      { { echo "$as_me:1300: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&5
 echo "$as_me: error: ls -t appears to fail.  Make sure there is not a broken
 alias in your environment" >&2;}
@@ -1309,13 +1310,13 @@
    # Ok.
    :
 else
-   { { echo "$as_me:1312: error: newly created file is older than distributed files!
+   { { echo "$as_me:1313: error: newly created file is older than distributed files!
 Check your system clock" >&5
 echo "$as_me: error: newly created file is older than distributed files!
 Check your system clock" >&2;}
    { (exit 1); exit 1; }; }
 fi
-echo "$as_me:1318: result: yes" >&5
+echo "$as_me:1319: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 test "$program_prefix" != NONE &&
   program_transform_name="s,^,$program_prefix,;$program_transform_name"
@@ -1339,7 +1340,7 @@
   am_missing_run="$MISSING --run "
 else
   am_missing_run=
-  { echo "$as_me:1342: WARNING: \`missing' script is too old or missing" >&5
+  { echo "$as_me:1343: WARNING: \`missing' script is too old or missing" >&5
 echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
 fi
 
@@ -1347,7 +1348,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1350: checking for $ac_word" >&5
+echo "$as_me:1351: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1362,7 +1363,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:1365: found $ac_dir/$ac_word" >&5
+echo "$as_me:1366: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1370,17 +1371,17 @@
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:1373: result: $AWK" >&5
+  echo "$as_me:1374: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:1376: result: no" >&5
+  echo "$as_me:1377: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
   test -n "$AWK" && break
 done
 
-echo "$as_me:1383: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:1384: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -1400,11 +1401,11 @@
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:1403: result: yes" >&5
+  echo "$as_me:1404: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:1407: result: no" >&5
+  echo "$as_me:1408: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -1412,7 +1413,7 @@
  # test to see if srcdir already configured
 if test "`cd $srcdir && pwd`" != "`pwd`" &&
    test -f $srcdir/config.status; then
-  { { echo "$as_me:1415: error: source directory already configured; run \"make distclean\" there first" >&5
+  { { echo "$as_me:1416: error: source directory already configured; run \"make distclean\" there first" >&5
 echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -1445,7 +1446,7 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:1448: checking for $ac_word" >&5
+echo "$as_me:1449: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1460,7 +1461,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-echo "$as_me:1463: found $ac_dir/$ac_word" >&5
+echo "$as_me:1464: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1468,10 +1469,10 @@
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  echo "$as_me:1471: result: $STRIP" >&5
+  echo "$as_me:1472: result: $STRIP" >&5
 echo "${ECHO_T}$STRIP" >&6
 else
-  echo "$as_me:1474: result: no" >&5
+  echo "$as_me:1475: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1480,7 +1481,7 @@
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-echo "$as_me:1483: checking for $ac_word" >&5
+echo "$as_me:1484: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1495,7 +1496,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_STRIP="strip"
-echo "$as_me:1498: found $ac_dir/$ac_word" >&5
+echo "$as_me:1499: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1504,10 +1505,10 @@
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:1507: result: $ac_ct_STRIP" >&5
+  echo "$as_me:1508: result: $ac_ct_STRIP" >&5
 echo "${ECHO_T}$ac_ct_STRIP" >&6
 else
-  echo "$as_me:1510: result: no" >&5
+  echo "$as_me:1511: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1522,7 +1523,7 @@
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
 
-echo "$as_me:1525: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "$as_me:1526: checking whether to enable maintainer-specific portions of Makefiles" >&5
 echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6
     # Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
 if test "${enable_maintainer_mode+set}" = set; then
@@ -1531,7 +1532,7 @@
 else
   USE_MAINTAINER_MODE=no
 fi;
-  echo "$as_me:1534: result: $USE_MAINTAINER_MODE" >&5
+  echo "$as_me:1535: result: $USE_MAINTAINER_MODE" >&5
 echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6
 
 if test $USE_MAINTAINER_MODE = yes; then
@@ -1591,7 +1592,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1594: checking for $ac_word" >&5
+echo "$as_me:1595: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AWK+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1606,7 +1607,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AWK="$ac_prog"
-echo "$as_me:1609: found $ac_dir/$ac_word" >&5
+echo "$as_me:1610: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1614,10 +1615,10 @@
 fi
 AWK=$ac_cv_prog_AWK
 if test -n "$AWK"; then
-  echo "$as_me:1617: result: $AWK" >&5
+  echo "$as_me:1618: result: $AWK" >&5
 echo "${ECHO_T}$AWK" >&6
 else
-  echo "$as_me:1620: result: no" >&5
+  echo "$as_me:1621: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1632,7 +1633,7 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
-echo "$as_me:1635: checking for $ac_word" >&5
+echo "$as_me:1636: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1647,7 +1648,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}gcc"
-echo "$as_me:1650: found $ac_dir/$ac_word" >&5
+echo "$as_me:1651: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1655,10 +1656,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1658: result: $CC" >&5
+  echo "$as_me:1659: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1661: result: no" >&5
+  echo "$as_me:1662: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1667,7 +1668,7 @@
   ac_ct_CC=$CC
   # Extract the first word of "gcc", so it can be a program name with args.
 set dummy gcc; ac_word=$2
-echo "$as_me:1670: checking for $ac_word" >&5
+echo "$as_me:1671: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1682,7 +1683,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="gcc"
-echo "$as_me:1685: found $ac_dir/$ac_word" >&5
+echo "$as_me:1686: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1690,10 +1691,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1693: result: $ac_ct_CC" >&5
+  echo "$as_me:1694: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1696: result: no" >&5
+  echo "$as_me:1697: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1706,7 +1707,7 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
 set dummy ${ac_tool_prefix}cc; ac_word=$2
-echo "$as_me:1709: checking for $ac_word" >&5
+echo "$as_me:1710: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1721,7 +1722,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="${ac_tool_prefix}cc"
-echo "$as_me:1724: found $ac_dir/$ac_word" >&5
+echo "$as_me:1725: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1729,10 +1730,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1732: result: $CC" >&5
+  echo "$as_me:1733: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1735: result: no" >&5
+  echo "$as_me:1736: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1741,7 +1742,7 @@
   ac_ct_CC=$CC
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1744: checking for $ac_word" >&5
+echo "$as_me:1745: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1756,7 +1757,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="cc"
-echo "$as_me:1759: found $ac_dir/$ac_word" >&5
+echo "$as_me:1760: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1764,10 +1765,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1767: result: $ac_ct_CC" >&5
+  echo "$as_me:1768: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1770: result: no" >&5
+  echo "$as_me:1771: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1780,7 +1781,7 @@
 if test -z "$CC"; then
   # Extract the first word of "cc", so it can be a program name with args.
 set dummy cc; ac_word=$2
-echo "$as_me:1783: checking for $ac_word" >&5
+echo "$as_me:1784: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1800,7 +1801,7 @@
   continue
 fi
 ac_cv_prog_CC="cc"
-echo "$as_me:1803: found $ac_dir/$ac_word" >&5
+echo "$as_me:1804: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1822,10 +1823,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1825: result: $CC" >&5
+  echo "$as_me:1826: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1828: result: no" >&5
+  echo "$as_me:1829: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1836,7 +1837,7 @@
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-echo "$as_me:1839: checking for $ac_word" >&5
+echo "$as_me:1840: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1851,7 +1852,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
-echo "$as_me:1854: found $ac_dir/$ac_word" >&5
+echo "$as_me:1855: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1859,10 +1860,10 @@
 fi
 CC=$ac_cv_prog_CC
 if test -n "$CC"; then
-  echo "$as_me:1862: result: $CC" >&5
+  echo "$as_me:1863: result: $CC" >&5
 echo "${ECHO_T}$CC" >&6
 else
-  echo "$as_me:1865: result: no" >&5
+  echo "$as_me:1866: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1875,7 +1876,7 @@
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:1878: checking for $ac_word" >&5
+echo "$as_me:1879: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -1890,7 +1891,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_CC="$ac_prog"
-echo "$as_me:1893: found $ac_dir/$ac_word" >&5
+echo "$as_me:1894: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -1898,10 +1899,10 @@
 fi
 ac_ct_CC=$ac_cv_prog_ac_ct_CC
 if test -n "$ac_ct_CC"; then
-  echo "$as_me:1901: result: $ac_ct_CC" >&5
+  echo "$as_me:1902: result: $ac_ct_CC" >&5
 echo "${ECHO_T}$ac_ct_CC" >&6
 else
-  echo "$as_me:1904: result: no" >&5
+  echo "$as_me:1905: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -1913,32 +1914,32 @@
 
 fi
 
-test -z "$CC" && { { echo "$as_me:1916: error: no acceptable cc found in \$PATH" >&5
+test -z "$CC" && { { echo "$as_me:1917: error: no acceptable cc found in \$PATH" >&5
 echo "$as_me: error: no acceptable cc found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
 
 # Provide some information about the compiler.
-echo "$as_me:1921:" \
+echo "$as_me:1922:" \
      "checking for C compiler version" >&5
 ac_compiler=`set X $ac_compile; echo $2`
-{ (eval echo "$as_me:1924: \"$ac_compiler --version </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1925: \"$ac_compiler --version </dev/null >&5\"") >&5
   (eval $ac_compiler --version </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1927: \$? = $ac_status" >&5
+  echo "$as_me:1928: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1929: \"$ac_compiler -v </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1930: \"$ac_compiler -v </dev/null >&5\"") >&5
   (eval $ac_compiler -v </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1932: \$? = $ac_status" >&5
+  echo "$as_me:1933: \$? = $ac_status" >&5
   (exit $ac_status); }
-{ (eval echo "$as_me:1934: \"$ac_compiler -V </dev/null >&5\"") >&5
+{ (eval echo "$as_me:1935: \"$ac_compiler -V </dev/null >&5\"") >&5
   (eval $ac_compiler -V </dev/null >&5) 2>&5
   ac_status=$?
-  echo "$as_me:1937: \$? = $ac_status" >&5
+  echo "$as_me:1938: \$? = $ac_status" >&5
   (exit $ac_status); }
 
 cat >conftest.$ac_ext <<_ACEOF
-#line 1941 "configure"
+#line 1942 "configure"
 #include "confdefs.h"
 
 int
@@ -1954,13 +1955,13 @@
 # Try to create an executable without -o first, disregard a.out.
 # It will help us diagnose broken compilers, and finding out an intuition
 # of exeext.
-echo "$as_me:1957: checking for C compiler default output" >&5
+echo "$as_me:1958: checking for C compiler default output" >&5
 echo $ECHO_N "checking for C compiler default output... $ECHO_C" >&6
 ac_link_default=`echo "$ac_link" | sed 's/ -o *conftest[^ ]*//'`
-if { (eval echo "$as_me:1960: \"$ac_link_default\"") >&5
+if { (eval echo "$as_me:1961: \"$ac_link_default\"") >&5
   (eval $ac_link_default) 2>&5
   ac_status=$?
-  echo "$as_me:1963: \$? = $ac_status" >&5
+  echo "$as_me:1964: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # Find the output, starting from the most likely.  This scheme is
 # not robust to junk in `.', hence go to wildcards (a.*) only as a last
@@ -1983,34 +1984,34 @@
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:1986: error: C compiler cannot create executables" >&5
+{ { echo "$as_me:1987: error: C compiler cannot create executables" >&5
 echo "$as_me: error: C compiler cannot create executables" >&2;}
    { (exit 77); exit 77; }; }
 fi
 
 ac_exeext=$ac_cv_exeext
-echo "$as_me:1992: result: $ac_file" >&5
+echo "$as_me:1993: result: $ac_file" >&5
 echo "${ECHO_T}$ac_file" >&6
 
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:1997: checking whether the C compiler works" >&5
+echo "$as_me:1998: checking whether the C compiler works" >&5
 echo $ECHO_N "checking whether the C compiler works... $ECHO_C" >&6
 # FIXME: These cross compiler hacks should be removed for Autoconf 3.0
 # If not cross compiling, check that we can run a simple program.
 if test "$cross_compiling" != yes; then
   if { ac_try='./$ac_file'
-  { (eval echo "$as_me:2003: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2006: \$? = $ac_status" >&5
+  echo "$as_me:2007: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
     cross_compiling=no
   else
     if test "$cross_compiling" = maybe; then
 	cross_compiling=yes
     else
-	{ { echo "$as_me:2013: error: cannot run C compiled programs.
+	{ { echo "$as_me:2014: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&5
 echo "$as_me: error: cannot run C compiled programs.
 If you meant to cross compile, use \`--host'." >&2;}
@@ -2018,24 +2019,24 @@
     fi
   fi
 fi
-echo "$as_me:2021: result: yes" >&5
+echo "$as_me:2022: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 rm -f a.out a.exe conftest$ac_cv_exeext
 ac_clean_files=$ac_clean_files_save
 # Check the compiler produces executables we can run.  If not, either
 # the compiler is broken, or we cross compile.
-echo "$as_me:2028: checking whether we are cross compiling" >&5
+echo "$as_me:2029: checking whether we are cross compiling" >&5
 echo $ECHO_N "checking whether we are cross compiling... $ECHO_C" >&6
-echo "$as_me:2030: result: $cross_compiling" >&5
+echo "$as_me:2031: result: $cross_compiling" >&5
 echo "${ECHO_T}$cross_compiling" >&6
 
-echo "$as_me:2033: checking for executable suffix" >&5
+echo "$as_me:2034: checking for executable suffix" >&5
 echo $ECHO_N "checking for executable suffix... $ECHO_C" >&6
-if { (eval echo "$as_me:2035: \"$ac_link\"") >&5
+if { (eval echo "$as_me:2036: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:2038: \$? = $ac_status" >&5
+  echo "$as_me:2039: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   # If both `conftest.exe' and `conftest' are `present' (well, observable)
 # catch `conftest.exe'.  For instance with Cygwin, `ls conftest' will
@@ -2051,25 +2052,25 @@
   esac
 done
 else
-  { { echo "$as_me:2054: error: cannot compute EXEEXT: cannot compile and link" >&5
+  { { echo "$as_me:2055: error: cannot compute EXEEXT: cannot compile and link" >&5
 echo "$as_me: error: cannot compute EXEEXT: cannot compile and link" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest$ac_cv_exeext
-echo "$as_me:2060: result: $ac_cv_exeext" >&5
+echo "$as_me:2061: result: $ac_cv_exeext" >&5
 echo "${ECHO_T}$ac_cv_exeext" >&6
 
 rm -f conftest.$ac_ext
 EXEEXT=$ac_cv_exeext
 ac_exeext=$EXEEXT
-echo "$as_me:2066: checking for object suffix" >&5
+echo "$as_me:2067: checking for object suffix" >&5
 echo $ECHO_N "checking for object suffix... $ECHO_C" >&6
 if test "${ac_cv_objext+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2072 "configure"
+#line 2073 "configure"
 #include "confdefs.h"
 
 int
@@ -2081,10 +2082,10 @@
 }
 _ACEOF
 rm -f conftest.o conftest.obj
-if { (eval echo "$as_me:2084: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2085: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2087: \$? = $ac_status" >&5
+  echo "$as_me:2088: \$? = $ac_status" >&5
   (exit $ac_status); }; then
   for ac_file in `(ls conftest.o conftest.obj; ls conftest.*) 2>/dev/null`; do
   case $ac_file in
@@ -2096,24 +2097,24 @@
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-{ { echo "$as_me:2099: error: cannot compute OBJEXT: cannot compile" >&5
+{ { echo "$as_me:2100: error: cannot compute OBJEXT: cannot compile" >&5
 echo "$as_me: error: cannot compute OBJEXT: cannot compile" >&2;}
    { (exit 1); exit 1; }; }
 fi
 
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
-echo "$as_me:2106: result: $ac_cv_objext" >&5
+echo "$as_me:2107: result: $ac_cv_objext" >&5
 echo "${ECHO_T}$ac_cv_objext" >&6
 OBJEXT=$ac_cv_objext
 ac_objext=$OBJEXT
-echo "$as_me:2110: checking whether we are using the GNU C compiler" >&5
+echo "$as_me:2111: checking whether we are using the GNU C compiler" >&5
 echo $ECHO_N "checking whether we are using the GNU C compiler... $ECHO_C" >&6
 if test "${ac_cv_c_compiler_gnu+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2116 "configure"
+#line 2117 "configure"
 #include "confdefs.h"
 
 int
@@ -2128,16 +2129,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2131: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2132: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2134: \$? = $ac_status" >&5
+  echo "$as_me:2135: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2137: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2138: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2140: \$? = $ac_status" >&5
+  echo "$as_me:2141: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_compiler_gnu=yes
 else
@@ -2149,19 +2150,19 @@
 ac_cv_c_compiler_gnu=$ac_compiler_gnu
 
 fi
-echo "$as_me:2152: result: $ac_cv_c_compiler_gnu" >&5
+echo "$as_me:2153: result: $ac_cv_c_compiler_gnu" >&5
 echo "${ECHO_T}$ac_cv_c_compiler_gnu" >&6
 GCC=`test $ac_compiler_gnu = yes && echo yes`
 ac_test_CFLAGS=${CFLAGS+set}
 ac_save_CFLAGS=$CFLAGS
 CFLAGS="-g"
-echo "$as_me:2158: checking whether $CC accepts -g" >&5
+echo "$as_me:2159: checking whether $CC accepts -g" >&5
 echo $ECHO_N "checking whether $CC accepts -g... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_g+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 2164 "configure"
+#line 2165 "configure"
 #include "confdefs.h"
 
 int
@@ -2173,16 +2174,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2176: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2177: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2179: \$? = $ac_status" >&5
+  echo "$as_me:2180: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2182: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2183: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2185: \$? = $ac_status" >&5
+  echo "$as_me:2186: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_g=yes
 else
@@ -2192,7 +2193,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:2195: result: $ac_cv_prog_cc_g" >&5
+echo "$as_me:2196: result: $ac_cv_prog_cc_g" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_g" >&6
 if test "$ac_test_CFLAGS" = set; then
   CFLAGS=$ac_save_CFLAGS
@@ -2219,16 +2220,16 @@
 #endif
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2222: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2223: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2225: \$? = $ac_status" >&5
+  echo "$as_me:2226: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2228: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2229: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2231: \$? = $ac_status" >&5
+  echo "$as_me:2232: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   for ac_declaration in \
    ''\
@@ -2240,7 +2241,7 @@
    'void exit (int);'
 do
   cat >conftest.$ac_ext <<_ACEOF
-#line 2243 "configure"
+#line 2244 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 $ac_declaration
@@ -2253,16 +2254,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2256: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2257: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2259: \$? = $ac_status" >&5
+  echo "$as_me:2260: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2262: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2263: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2265: \$? = $ac_status" >&5
+  echo "$as_me:2266: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -2272,7 +2273,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   cat >conftest.$ac_ext <<_ACEOF
-#line 2275 "configure"
+#line 2276 "configure"
 #include "confdefs.h"
 $ac_declaration
 int
@@ -2284,16 +2285,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:2287: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:2288: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:2290: \$? = $ac_status" >&5
+  echo "$as_me:2291: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:2293: \"$ac_try\"") >&5
+  { (eval echo "$as_me:2294: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:2296: \$? = $ac_status" >&5
+  echo "$as_me:2297: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   break
 else
@@ -2337,7 +2338,7 @@
 	@echo done
 END
 # If we don't find an include directive, just comment out the code.
-echo "$as_me:2340: checking for style of include used by $am_make" >&5
+echo "$as_me:2341: checking for style of include used by $am_make" >&5
 echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6
 am__include="#"
 am__quote=
@@ -2364,7 +2365,7 @@
    fi
 fi
 
-echo "$as_me:2367: result: $_am_result" >&5
+echo "$as_me:2368: result: $_am_result" >&5
 echo "${ECHO_T}$_am_result" >&6
 rm -f confinc confmf
 
@@ -2388,7 +2389,7 @@
 
 depcc="$CC"   am_compiler_list=
 
-echo "$as_me:2391: checking dependency style of $depcc" >&5
+echo "$as_me:2392: checking dependency style of $depcc" >&5
 echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6
 if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2450,7 +2451,7 @@
 fi
 
 fi
-echo "$as_me:2453: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "$as_me:2454: result: $am_cv_CC_dependencies_compiler_type" >&5
 echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6
 CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
 
@@ -2459,7 +2460,7 @@
 ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
-echo "$as_me:2462: checking how to run the C preprocessor" >&5
+echo "$as_me:2463: checking how to run the C preprocessor" >&5
 echo $ECHO_N "checking how to run the C preprocessor... $ECHO_C" >&6
 # On Suns, sometimes $CPP names a directory.
 if test -n "$CPP" && test -d "$CPP"; then
@@ -2480,18 +2481,18 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2483 "configure"
+#line 2484 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2488: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2489: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2494: \$? = $ac_status" >&5
+  echo "$as_me:2495: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2514,17 +2515,17 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2517 "configure"
+#line 2518 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2521: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2522: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2527: \$? = $ac_status" >&5
+  echo "$as_me:2528: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2561,7 +2562,7 @@
 else
   ac_cv_prog_CPP=$CPP
 fi
-echo "$as_me:2564: result: $CPP" >&5
+echo "$as_me:2565: result: $CPP" >&5
 echo "${ECHO_T}$CPP" >&6
 ac_preproc_ok=false
 for ac_c_preproc_warn_flag in '' yes
@@ -2571,18 +2572,18 @@
   # On the NeXT, cc -E runs the code through the compiler's parser,
   # not just through cpp. "Syntax error" is here to catch this case.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2574 "configure"
+#line 2575 "configure"
 #include "confdefs.h"
 #include <assert.h>
                      Syntax error
 _ACEOF
-if { (eval echo "$as_me:2579: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2580: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2585: \$? = $ac_status" >&5
+  echo "$as_me:2586: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2605,17 +2606,17 @@
   # OK, works on sane cases.  Now check whether non-existent headers
   # can be detected and how.
   cat >conftest.$ac_ext <<_ACEOF
-#line 2608 "configure"
+#line 2609 "configure"
 #include "confdefs.h"
 #include <ac_nonexistent.h>
 _ACEOF
-if { (eval echo "$as_me:2612: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:2613: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:2618: \$? = $ac_status" >&5
+  echo "$as_me:2619: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -2643,7 +2644,7 @@
 if $ac_preproc_ok; then
   :
 else
-  { { echo "$as_me:2646: error: C preprocessor \"$CPP\" fails sanity check" >&5
+  { { echo "$as_me:2647: error: C preprocessor \"$CPP\" fails sanity check" >&5
 echo "$as_me: error: C preprocessor \"$CPP\" fails sanity check" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -2666,7 +2667,7 @@
 # AFS /usr/afsws/bin/install, which mishandles nonexistent args
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
-echo "$as_me:2669: checking for a BSD compatible install" >&5
+echo "$as_me:2670: checking for a BSD compatible install" >&5
 echo $ECHO_N "checking for a BSD compatible install... $ECHO_C" >&6
 if test -z "$INSTALL"; then
 if test "${ac_cv_path_install+set}" = set; then
@@ -2715,7 +2716,7 @@
     INSTALL=$ac_install_sh
   fi
 fi
-echo "$as_me:2718: result: $INSTALL" >&5
+echo "$as_me:2719: result: $INSTALL" >&5
 echo "${ECHO_T}$INSTALL" >&6
 
 # Use test -z because SunOS4 sh mishandles braces in ${var-val}.
@@ -2726,18 +2727,18 @@
 
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
 
-echo "$as_me:2729: checking whether ln -s works" >&5
+echo "$as_me:2730: checking whether ln -s works" >&5
 echo $ECHO_N "checking whether ln -s works... $ECHO_C" >&6
 LN_S=$as_ln_s
 if test "$LN_S" = "ln -s"; then
-  echo "$as_me:2733: result: yes" >&5
+  echo "$as_me:2734: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:2736: result: no, using $LN_S" >&5
+  echo "$as_me:2737: result: no, using $LN_S" >&5
 echo "${ECHO_T}no, using $LN_S" >&6
 fi
 
-echo "$as_me:2740: checking whether ${MAKE-make} sets \${MAKE}" >&5
+echo "$as_me:2741: checking whether ${MAKE-make} sets \${MAKE}" >&5
 echo $ECHO_N "checking whether ${MAKE-make} sets \${MAKE}... $ECHO_C" >&6
 set dummy ${MAKE-make}; ac_make=`echo "$2" | sed 'y,./+-,__p_,'`
 if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\" = set"; then
@@ -2757,11 +2758,11 @@
 rm -f conftest.make
 fi
 if eval "test \"`echo '$ac_cv_prog_make_'${ac_make}_set`\" = yes"; then
-  echo "$as_me:2760: result: yes" >&5
+  echo "$as_me:2761: result: yes" >&5
 echo "${ECHO_T}yes" >&6
   SET_MAKE=
 else
-  echo "$as_me:2764: result: no" >&5
+  echo "$as_me:2765: result: no" >&5
 echo "${ECHO_T}no" >&6
   SET_MAKE="MAKE=${MAKE-make}"
 fi
@@ -2769,7 +2770,7 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:2772: checking for $ac_word" >&5
+echo "$as_me:2773: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2784,7 +2785,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:2787: found $ac_dir/$ac_word" >&5
+echo "$as_me:2788: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2792,10 +2793,10 @@
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:2795: result: $RANLIB" >&5
+  echo "$as_me:2796: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:2798: result: no" >&5
+  echo "$as_me:2799: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2804,7 +2805,7 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:2807: checking for $ac_word" >&5
+echo "$as_me:2808: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2819,7 +2820,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:2822: found $ac_dir/$ac_word" >&5
+echo "$as_me:2823: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -2828,10 +2829,10 @@
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:2831: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:2832: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:2834: result: no" >&5
+  echo "$as_me:2835: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -2886,11 +2887,11 @@
 fi;
 # Make sure we can run config.sub.
 $ac_config_sub sun4 >/dev/null 2>&1 ||
-  { { echo "$as_me:2889: error: cannot run $ac_config_sub" >&5
+  { { echo "$as_me:2890: error: cannot run $ac_config_sub" >&5
 echo "$as_me: error: cannot run $ac_config_sub" >&2;}
    { (exit 1); exit 1; }; }
 
-echo "$as_me:2893: checking build system type" >&5
+echo "$as_me:2894: checking build system type" >&5
 echo $ECHO_N "checking build system type... $ECHO_C" >&6
 if test "${ac_cv_build+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2899,23 +2900,23 @@
 test -z "$ac_cv_build_alias" &&
   ac_cv_build_alias=`$ac_config_guess`
 test -z "$ac_cv_build_alias" &&
-  { { echo "$as_me:2902: error: cannot guess build type; you must specify one" >&5
+  { { echo "$as_me:2903: error: cannot guess build type; you must specify one" >&5
 echo "$as_me: error: cannot guess build type; you must specify one" >&2;}
    { (exit 1); exit 1; }; }
 ac_cv_build=`$ac_config_sub $ac_cv_build_alias` ||
-  { { echo "$as_me:2906: error: $ac_config_sub $ac_cv_build_alias failed." >&5
+  { { echo "$as_me:2907: error: $ac_config_sub $ac_cv_build_alias failed." >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_build_alias failed." >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:2911: result: $ac_cv_build" >&5
+echo "$as_me:2912: result: $ac_cv_build" >&5
 echo "${ECHO_T}$ac_cv_build" >&6
 build=$ac_cv_build
 build_cpu=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
 build_vendor=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 build_os=`echo $ac_cv_build | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 
-echo "$as_me:2918: checking host system type" >&5
+echo "$as_me:2919: checking host system type" >&5
 echo $ECHO_N "checking host system type... $ECHO_C" >&6
 if test "${ac_cv_host+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -2924,12 +2925,12 @@
 test -z "$ac_cv_host_alias" &&
   ac_cv_host_alias=$ac_cv_build_alias
 ac_cv_host=`$ac_config_sub $ac_cv_host_alias` ||
-  { { echo "$as_me:2927: error: $ac_config_sub $ac_cv_host_alias failed" >&5
+  { { echo "$as_me:2928: error: $ac_config_sub $ac_cv_host_alias failed" >&5
 echo "$as_me: error: $ac_config_sub $ac_cv_host_alias failed" >&2;}
    { (exit 1); exit 1; }; }
 
 fi
-echo "$as_me:2932: result: $ac_cv_host" >&5
+echo "$as_me:2933: result: $ac_cv_host" >&5
 echo "${ECHO_T}$ac_cv_host" >&6
 host=$ac_cv_host
 host_cpu=`echo $ac_cv_host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'`
@@ -2957,7 +2958,7 @@
 ac_prog=ld
 if test "$GCC" = yes; then
   # Check if gcc -print-prog-name=ld gives a path.
-  echo "$as_me:2960: checking for ld used by GCC" >&5
+  echo "$as_me:2961: checking for ld used by GCC" >&5
 echo $ECHO_N "checking for ld used by GCC... $ECHO_C" >&6
   case $host in
   *-*-mingw*)
@@ -2987,10 +2988,10 @@
     ;;
   esac
 elif test "$with_gnu_ld" = yes; then
-  echo "$as_me:2990: checking for GNU ld" >&5
+  echo "$as_me:2991: checking for GNU ld" >&5
 echo $ECHO_N "checking for GNU ld... $ECHO_C" >&6
 else
-  echo "$as_me:2993: checking for non-GNU ld" >&5
+  echo "$as_me:2994: checking for non-GNU ld" >&5
 echo $ECHO_N "checking for non-GNU ld... $ECHO_C" >&6
 fi
 if test "${lt_cv_path_LD+set}" = set; then
@@ -3020,16 +3021,16 @@
 
 LD="$lt_cv_path_LD"
 if test -n "$LD"; then
-  echo "$as_me:3023: result: $LD" >&5
+  echo "$as_me:3024: result: $LD" >&5
 echo "${ECHO_T}$LD" >&6
 else
-  echo "$as_me:3026: result: no" >&5
+  echo "$as_me:3027: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
-test -z "$LD" && { { echo "$as_me:3029: error: no acceptable ld found in \$PATH" >&5
+test -z "$LD" && { { echo "$as_me:3030: error: no acceptable ld found in \$PATH" >&5
 echo "$as_me: error: no acceptable ld found in \$PATH" >&2;}
    { (exit 1); exit 1; }; }
-echo "$as_me:3032: checking if the linker ($LD) is GNU ld" >&5
+echo "$as_me:3033: checking if the linker ($LD) is GNU ld" >&5
 echo $ECHO_N "checking if the linker ($LD) is GNU ld... $ECHO_C" >&6
 if test "${lt_cv_prog_gnu_ld+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3041,23 +3042,23 @@
   lt_cv_prog_gnu_ld=no
 fi
 fi
-echo "$as_me:3044: result: $lt_cv_prog_gnu_ld" >&5
+echo "$as_me:3045: result: $lt_cv_prog_gnu_ld" >&5
 echo "${ECHO_T}$lt_cv_prog_gnu_ld" >&6
 with_gnu_ld=$lt_cv_prog_gnu_ld
 
-echo "$as_me:3048: checking for $LD option to reload object files" >&5
+echo "$as_me:3049: checking for $LD option to reload object files" >&5
 echo $ECHO_N "checking for $LD option to reload object files... $ECHO_C" >&6
 if test "${lt_cv_ld_reload_flag+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   lt_cv_ld_reload_flag='-r'
 fi
-echo "$as_me:3055: result: $lt_cv_ld_reload_flag" >&5
+echo "$as_me:3056: result: $lt_cv_ld_reload_flag" >&5
 echo "${ECHO_T}$lt_cv_ld_reload_flag" >&6
 reload_flag=$lt_cv_ld_reload_flag
 test -n "$reload_flag" && reload_flag=" $reload_flag"
 
-echo "$as_me:3060: checking for BSD-compatible nm" >&5
+echo "$as_me:3061: checking for BSD-compatible nm" >&5
 echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
 if test "${lt_cv_path_NM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3093,10 +3094,10 @@
 fi
 
 NM="$lt_cv_path_NM"
-echo "$as_me:3096: result: $NM" >&5
+echo "$as_me:3097: result: $NM" >&5
 echo "${ECHO_T}$NM" >&6
 
-echo "$as_me:3099: checking for a sed that does not truncate output" >&5
+echo "$as_me:3100: checking for a sed that does not truncate output" >&5
 echo $ECHO_N "checking for a sed that does not truncate output... $ECHO_C" >&6
 if test "${lt_cv_path_SED+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3178,10 +3179,10 @@
 else
   SED=$lt_cv_path_SED
 fi
-echo "$as_me:3181: result: $SED" >&5
+echo "$as_me:3182: result: $SED" >&5
 echo "${ECHO_T}$SED" >&6
 
-echo "$as_me:3184: checking how to recognise dependent libraries" >&5
+echo "$as_me:3185: checking how to recognise dependent libraries" >&5
 echo $ECHO_N "checking how to recognise dependent libraries... $ECHO_C" >&6
 if test "${lt_cv_deplibs_check_method+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3362,13 +3363,13 @@
 esac
 
 fi
-echo "$as_me:3365: result: $lt_cv_deplibs_check_method" >&5
+echo "$as_me:3366: result: $lt_cv_deplibs_check_method" >&5
 echo "${ECHO_T}$lt_cv_deplibs_check_method" >&6
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 
 # Check for command to grab the raw symbol name followed by C symbol from nm.
-echo "$as_me:3371: checking command to parse $NM output" >&5
+echo "$as_me:3372: checking command to parse $NM output" >&5
 echo $ECHO_N "checking command to parse $NM output... $ECHO_C" >&6
 if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3452,17 +3453,17 @@
 int main(){nm_test_var='a';nm_test_func();return(0);}
 EOF
 
-  if { (eval echo "$as_me:3455: \"$ac_compile\"") >&5
+  if { (eval echo "$as_me:3456: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3458: \$? = $ac_status" >&5
+  echo "$as_me:3459: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { (eval echo "$as_me:3462: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
+    if { (eval echo "$as_me:3463: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\"") >&5
   (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
   ac_status=$?
-  echo "$as_me:3465: \$? = $ac_status" >&5
+  echo "$as_me:3466: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
@@ -3514,10 +3515,10 @@
 	  save_CFLAGS="$CFLAGS"
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$no_builtin_flag"
-	  if { (eval echo "$as_me:3517: \"$ac_link\"") >&5
+	  if { (eval echo "$as_me:3518: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3520: \$? = $ac_status" >&5
+  echo "$as_me:3521: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest$ac_exeext; then
 	    pipe_works=yes
 	  fi
@@ -3558,33 +3559,33 @@
 fi
 if test -z "$global_symbol_pipe$global_symbol_to_cdec$global_symbol_to_c_name_address";
 then
-  echo "$as_me:3561: result: failed" >&5
+  echo "$as_me:3562: result: failed" >&5
 echo "${ECHO_T}failed" >&6
 else
-  echo "$as_me:3564: result: ok" >&5
+  echo "$as_me:3565: result: ok" >&5
 echo "${ECHO_T}ok" >&6
 fi
 
 for ac_header in dlfcn.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:3571: checking for $ac_header" >&5
+echo "$as_me:3572: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 3577 "configure"
+#line 3578 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:3581: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:3582: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:3587: \$? = $ac_status" >&5
+  echo "$as_me:3588: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -3603,7 +3604,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:3606: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:3607: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -3617,7 +3618,7 @@
 case $deplibs_check_method in
 file_magic*)
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
-    echo "$as_me:3620: checking for ${ac_tool_prefix}file" >&5
+    echo "$as_me:3621: checking for ${ac_tool_prefix}file" >&5
 echo $ECHO_N "checking for ${ac_tool_prefix}file... $ECHO_C" >&6
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3672,16 +3673,16 @@
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  echo "$as_me:3675: result: $MAGIC_CMD" >&5
+  echo "$as_me:3676: result: $MAGIC_CMD" >&5
 echo "${ECHO_T}$MAGIC_CMD" >&6
 else
-  echo "$as_me:3678: result: no" >&5
+  echo "$as_me:3679: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
 if test -z "$lt_cv_path_MAGIC_CMD"; then
   if test -n "$ac_tool_prefix"; then
-    echo "$as_me:3684: checking for file" >&5
+    echo "$as_me:3685: checking for file" >&5
 echo $ECHO_N "checking for file... $ECHO_C" >&6
 if test "${lt_cv_path_MAGIC_CMD+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3736,10 +3737,10 @@
 
 MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
 if test -n "$MAGIC_CMD"; then
-  echo "$as_me:3739: result: $MAGIC_CMD" >&5
+  echo "$as_me:3740: result: $MAGIC_CMD" >&5
 echo "${ECHO_T}$MAGIC_CMD" >&6
 else
-  echo "$as_me:3742: result: no" >&5
+  echo "$as_me:3743: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3755,7 +3756,7 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args.
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
-echo "$as_me:3758: checking for $ac_word" >&5
+echo "$as_me:3759: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3770,7 +3771,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
-echo "$as_me:3773: found $ac_dir/$ac_word" >&5
+echo "$as_me:3774: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3778,10 +3779,10 @@
 fi
 RANLIB=$ac_cv_prog_RANLIB
 if test -n "$RANLIB"; then
-  echo "$as_me:3781: result: $RANLIB" >&5
+  echo "$as_me:3782: result: $RANLIB" >&5
 echo "${ECHO_T}$RANLIB" >&6
 else
-  echo "$as_me:3784: result: no" >&5
+  echo "$as_me:3785: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3790,7 +3791,7 @@
   ac_ct_RANLIB=$RANLIB
   # Extract the first word of "ranlib", so it can be a program name with args.
 set dummy ranlib; ac_word=$2
-echo "$as_me:3793: checking for $ac_word" >&5
+echo "$as_me:3794: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3805,7 +3806,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_RANLIB="ranlib"
-echo "$as_me:3808: found $ac_dir/$ac_word" >&5
+echo "$as_me:3809: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3814,10 +3815,10 @@
 fi
 ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB
 if test -n "$ac_ct_RANLIB"; then
-  echo "$as_me:3817: result: $ac_ct_RANLIB" >&5
+  echo "$as_me:3818: result: $ac_ct_RANLIB" >&5
 echo "${ECHO_T}$ac_ct_RANLIB" >&6
 else
-  echo "$as_me:3820: result: no" >&5
+  echo "$as_me:3821: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3829,7 +3830,7 @@
 if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
 set dummy ${ac_tool_prefix}strip; ac_word=$2
-echo "$as_me:3832: checking for $ac_word" >&5
+echo "$as_me:3833: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3844,7 +3845,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
-echo "$as_me:3847: found $ac_dir/$ac_word" >&5
+echo "$as_me:3848: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3852,10 +3853,10 @@
 fi
 STRIP=$ac_cv_prog_STRIP
 if test -n "$STRIP"; then
-  echo "$as_me:3855: result: $STRIP" >&5
+  echo "$as_me:3856: result: $STRIP" >&5
 echo "${ECHO_T}$STRIP" >&6
 else
-  echo "$as_me:3858: result: no" >&5
+  echo "$as_me:3859: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3864,7 +3865,7 @@
   ac_ct_STRIP=$STRIP
   # Extract the first word of "strip", so it can be a program name with args.
 set dummy strip; ac_word=$2
-echo "$as_me:3867: checking for $ac_word" >&5
+echo "$as_me:3868: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3879,7 +3880,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_STRIP="strip"
-echo "$as_me:3882: found $ac_dir/$ac_word" >&5
+echo "$as_me:3883: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -3888,10 +3889,10 @@
 fi
 ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
 if test -n "$ac_ct_STRIP"; then
-  echo "$as_me:3891: result: $ac_ct_STRIP" >&5
+  echo "$as_me:3892: result: $ac_ct_STRIP" >&5
 echo "${ECHO_T}$ac_ct_STRIP" >&6
 else
-  echo "$as_me:3894: result: no" >&5
+  echo "$as_me:3895: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -3915,11 +3916,11 @@
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 3918 "configure"' > conftest.$ac_ext
-  if { (eval echo "$as_me:3919: \"$ac_compile\"") >&5
+  echo '#line 3919 "configure"' > conftest.$ac_ext
+  if { (eval echo "$as_me:3920: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:3922: \$? = $ac_status" >&5
+  echo "$as_me:3923: \$? = $ac_status" >&5
   (exit $ac_status); }; then
     case `/usr/bin/file conftest.$ac_objext` in
     *32-bit*)
@@ -3940,7 +3941,7 @@
   # On SCO OpenServer 5, we need -belf to get full-featured binaries.
   SAVE_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -belf"
-  echo "$as_me:3943: checking whether the C compiler needs -belf" >&5
+  echo "$as_me:3944: checking whether the C compiler needs -belf" >&5
 echo $ECHO_N "checking whether the C compiler needs -belf... $ECHO_C" >&6
 if test "${lt_cv_cc_needs_belf+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -3953,7 +3954,7 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
      cat >conftest.$ac_ext <<_ACEOF
-#line 3956 "configure"
+#line 3957 "configure"
 #include "confdefs.h"
 
 int
@@ -3965,16 +3966,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:3968: \"$ac_link\"") >&5
+if { (eval echo "$as_me:3969: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:3971: \$? = $ac_status" >&5
+  echo "$as_me:3972: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:3974: \"$ac_try\"") >&5
+  { (eval echo "$as_me:3975: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:3977: \$? = $ac_status" >&5
+  echo "$as_me:3978: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   lt_cv_cc_needs_belf=yes
 else
@@ -3990,7 +3991,7 @@
 ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 fi
-echo "$as_me:3993: result: $lt_cv_cc_needs_belf" >&5
+echo "$as_me:3994: result: $lt_cv_cc_needs_belf" >&5
 echo "${ECHO_T}$lt_cv_cc_needs_belf" >&6
   if test x"$lt_cv_cc_needs_belf" != x"yes"; then
     # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
@@ -4002,7 +4003,7 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
 set dummy ${ac_tool_prefix}dlltool; ac_word=$2
-echo "$as_me:4005: checking for $ac_word" >&5
+echo "$as_me:4006: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_DLLTOOL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4017,7 +4018,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
-echo "$as_me:4020: found $ac_dir/$ac_word" >&5
+echo "$as_me:4021: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4025,10 +4026,10 @@
 fi
 DLLTOOL=$ac_cv_prog_DLLTOOL
 if test -n "$DLLTOOL"; then
-  echo "$as_me:4028: result: $DLLTOOL" >&5
+  echo "$as_me:4029: result: $DLLTOOL" >&5
 echo "${ECHO_T}$DLLTOOL" >&6
 else
-  echo "$as_me:4031: result: no" >&5
+  echo "$as_me:4032: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4037,7 +4038,7 @@
   ac_ct_DLLTOOL=$DLLTOOL
   # Extract the first word of "dlltool", so it can be a program name with args.
 set dummy dlltool; ac_word=$2
-echo "$as_me:4040: checking for $ac_word" >&5
+echo "$as_me:4041: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_DLLTOOL+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4052,7 +4053,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_DLLTOOL="dlltool"
-echo "$as_me:4055: found $ac_dir/$ac_word" >&5
+echo "$as_me:4056: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4061,10 +4062,10 @@
 fi
 ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
 if test -n "$ac_ct_DLLTOOL"; then
-  echo "$as_me:4064: result: $ac_ct_DLLTOOL" >&5
+  echo "$as_me:4065: result: $ac_ct_DLLTOOL" >&5
 echo "${ECHO_T}$ac_ct_DLLTOOL" >&6
 else
-  echo "$as_me:4067: result: no" >&5
+  echo "$as_me:4068: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4076,7 +4077,7 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}as", so it can be a program name with args.
 set dummy ${ac_tool_prefix}as; ac_word=$2
-echo "$as_me:4079: checking for $ac_word" >&5
+echo "$as_me:4080: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_AS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4091,7 +4092,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_AS="${ac_tool_prefix}as"
-echo "$as_me:4094: found $ac_dir/$ac_word" >&5
+echo "$as_me:4095: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4099,10 +4100,10 @@
 fi
 AS=$ac_cv_prog_AS
 if test -n "$AS"; then
-  echo "$as_me:4102: result: $AS" >&5
+  echo "$as_me:4103: result: $AS" >&5
 echo "${ECHO_T}$AS" >&6
 else
-  echo "$as_me:4105: result: no" >&5
+  echo "$as_me:4106: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4111,7 +4112,7 @@
   ac_ct_AS=$AS
   # Extract the first word of "as", so it can be a program name with args.
 set dummy as; ac_word=$2
-echo "$as_me:4114: checking for $ac_word" >&5
+echo "$as_me:4115: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_AS+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4126,7 +4127,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_AS="as"
-echo "$as_me:4129: found $ac_dir/$ac_word" >&5
+echo "$as_me:4130: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4135,10 +4136,10 @@
 fi
 ac_ct_AS=$ac_cv_prog_ac_ct_AS
 if test -n "$ac_ct_AS"; then
-  echo "$as_me:4138: result: $ac_ct_AS" >&5
+  echo "$as_me:4139: result: $ac_ct_AS" >&5
 echo "${ECHO_T}$ac_ct_AS" >&6
 else
-  echo "$as_me:4141: result: no" >&5
+  echo "$as_me:4142: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4150,7 +4151,7 @@
   if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}objdump", so it can be a program name with args.
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
-echo "$as_me:4153: checking for $ac_word" >&5
+echo "$as_me:4154: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_OBJDUMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4165,7 +4166,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
-echo "$as_me:4168: found $ac_dir/$ac_word" >&5
+echo "$as_me:4169: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4173,10 +4174,10 @@
 fi
 OBJDUMP=$ac_cv_prog_OBJDUMP
 if test -n "$OBJDUMP"; then
-  echo "$as_me:4176: result: $OBJDUMP" >&5
+  echo "$as_me:4177: result: $OBJDUMP" >&5
 echo "${ECHO_T}$OBJDUMP" >&6
 else
-  echo "$as_me:4179: result: no" >&5
+  echo "$as_me:4180: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4185,7 +4186,7 @@
   ac_ct_OBJDUMP=$OBJDUMP
   # Extract the first word of "objdump", so it can be a program name with args.
 set dummy objdump; ac_word=$2
-echo "$as_me:4188: checking for $ac_word" >&5
+echo "$as_me:4189: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4200,7 +4201,7 @@
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_ac_ct_OBJDUMP="objdump"
-echo "$as_me:4203: found $ac_dir/$ac_word" >&5
+echo "$as_me:4204: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -4209,10 +4210,10 @@
 fi
 ac_ct_OBJDUMP=$ac_cv_prog_ac_ct_OBJDUMP
 if test -n "$ac_ct_OBJDUMP"; then
-  echo "$as_me:4212: result: $ac_ct_OBJDUMP" >&5
+  echo "$as_me:4213: result: $ac_ct_OBJDUMP" >&5
 echo "${ECHO_T}$ac_ct_OBJDUMP" >&6
 else
-  echo "$as_me:4215: result: no" >&5
+  echo "$as_me:4216: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -4223,13 +4224,13 @@
 
   # recent cygwin and mingw systems supply a stub DllMain which the user
   # can override, but on older systems we have to supply one
-  echo "$as_me:4226: checking if libtool should supply DllMain function" >&5
+  echo "$as_me:4227: checking if libtool should supply DllMain function" >&5
 echo $ECHO_N "checking if libtool should supply DllMain function... $ECHO_C" >&6
 if test "${lt_cv_need_dllmain+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4232 "configure"
+#line 4233 "configure"
 #include "confdefs.h"
 
 int
@@ -4242,16 +4243,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4245: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4246: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4248: \$? = $ac_status" >&5
+  echo "$as_me:4249: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4251: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4252: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4254: \$? = $ac_status" >&5
+  echo "$as_me:4255: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   lt_cv_need_dllmain=no
 else
@@ -4261,7 +4262,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4264: result: $lt_cv_need_dllmain" >&5
+echo "$as_me:4265: result: $lt_cv_need_dllmain" >&5
 echo "${ECHO_T}$lt_cv_need_dllmain" >&6
 
   case $host/$CC in
@@ -4270,13 +4271,13 @@
     # require "-mdll"
     SAVE_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS -mdll"
-    echo "$as_me:4273: checking how to link DLLs" >&5
+    echo "$as_me:4274: checking how to link DLLs" >&5
 echo $ECHO_N "checking how to link DLLs... $ECHO_C" >&6
 if test "${lt_cv_cc_dll_switch+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 4279 "configure"
+#line 4280 "configure"
 #include "confdefs.h"
 
 int
@@ -4288,16 +4289,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4291: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4292: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4294: \$? = $ac_status" >&5
+  echo "$as_me:4295: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4298: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4300: \$? = $ac_status" >&5
+  echo "$as_me:4301: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   lt_cv_cc_dll_switch=-mdll
 else
@@ -4307,7 +4308,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:4310: result: $lt_cv_cc_dll_switch" >&5
+echo "$as_me:4311: result: $lt_cv_cc_dll_switch" >&5
 echo "${ECHO_T}$lt_cv_cc_dll_switch" >&6
     CFLAGS="$SAVE_CFLAGS" ;;
   *-*-cygwin* | *-*-pw32*)
@@ -4409,7 +4410,7 @@
 set dummy $CC
 compiler="$2"
 
-echo "$as_me:4412: checking for objdir" >&5
+echo "$as_me:4413: checking for objdir" >&5
 echo $ECHO_N "checking for objdir... $ECHO_C" >&6
 rm -f .libs 2>/dev/null
 mkdir .libs 2>/dev/null
@@ -4420,7 +4421,7 @@
   objdir=_libs
 fi
 rmdir .libs 2>/dev/null
-echo "$as_me:4423: result: $objdir" >&5
+echo "$as_me:4424: result: $objdir" >&5
 echo "${ECHO_T}$objdir" >&6
 
 # Check whether --with-pic or --without-pic was given.
@@ -4435,7 +4436,7 @@
 # We assume here that the value for lt_cv_prog_cc_pic will not be cached
 # in isolation, and that seeing it set (from the cache) indicates that
 # the associated values are set (in the cache) correctly too.
-echo "$as_me:4438: checking for $compiler option to produce PIC" >&5
+echo "$as_me:4439: checking for $compiler option to produce PIC" >&5
 echo $ECHO_N "checking for $compiler option to produce PIC... $ECHO_C" >&6
 if test "${lt_cv_prog_cc_pic+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4578,14 +4579,14 @@
 fi
 
 if test -z "$lt_cv_prog_cc_pic"; then
-  echo "$as_me:4581: result: none" >&5
+  echo "$as_me:4582: result: none" >&5
 echo "${ECHO_T}none" >&6
 else
-  echo "$as_me:4584: result: $lt_cv_prog_cc_pic" >&5
+  echo "$as_me:4585: result: $lt_cv_prog_cc_pic" >&5
 echo "${ECHO_T}$lt_cv_prog_cc_pic" >&6
 
   # Check to make sure the pic_flag actually works.
-  echo "$as_me:4588: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
+  echo "$as_me:4589: checking if $compiler PIC flag $lt_cv_prog_cc_pic works" >&5
 echo $ECHO_N "checking if $compiler PIC flag $lt_cv_prog_cc_pic works... $ECHO_C" >&6
   if test "${lt_cv_prog_cc_pic_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4593,7 +4594,7 @@
       save_CFLAGS="$CFLAGS"
     CFLAGS="$CFLAGS $lt_cv_prog_cc_pic -DPIC"
     cat >conftest.$ac_ext <<_ACEOF
-#line 4596 "configure"
+#line 4597 "configure"
 #include "confdefs.h"
 
 int
@@ -4605,16 +4606,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4608: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4609: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4611: \$? = $ac_status" >&5
+  echo "$as_me:4612: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4614: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4615: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4617: \$? = $ac_status" >&5
+  echo "$as_me:4618: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
         case $host_os in
       hpux9* | hpux10* | hpux11*)
@@ -4650,23 +4651,23 @@
     lt_cv_prog_cc_pic=" $lt_cv_prog_cc_pic"
   fi
 
-  echo "$as_me:4653: result: $lt_cv_prog_cc_pic_works" >&5
+  echo "$as_me:4654: result: $lt_cv_prog_cc_pic_works" >&5
 echo "${ECHO_T}$lt_cv_prog_cc_pic_works" >&6
 fi
 
 # Check for any special shared library compilation flags.
 if test -n "$lt_cv_prog_cc_shlib"; then
-  { echo "$as_me:4659: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5
+  { echo "$as_me:4660: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&5
 echo "$as_me: WARNING: \`$CC' requires \`$lt_cv_prog_cc_shlib' to build shared libraries" >&2;}
   if echo "$old_CC $old_CFLAGS " | egrep -e "[ 	]$lt_cv_prog_cc_shlib[ 	]" >/dev/null; then :
   else
-   { echo "$as_me:4663: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
+   { echo "$as_me:4664: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&5
 echo "$as_me: WARNING: add \`$lt_cv_prog_cc_shlib' to the CC or CFLAGS env variable and reconfigure" >&2;}
     lt_cv_prog_cc_can_build_shared=no
   fi
 fi
 
-echo "$as_me:4669: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
+echo "$as_me:4670: checking if $compiler static flag $lt_cv_prog_cc_static works" >&5
 echo $ECHO_N "checking if $compiler static flag $lt_cv_prog_cc_static works... $ECHO_C" >&6
 if test "${lt_cv_prog_cc_static_works+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4675,7 +4676,7 @@
   save_LDFLAGS="$LDFLAGS"
   LDFLAGS="$LDFLAGS $lt_cv_prog_cc_static"
   cat >conftest.$ac_ext <<_ACEOF
-#line 4678 "configure"
+#line 4679 "configure"
 #include "confdefs.h"
 
 int
@@ -4687,16 +4688,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:4690: \"$ac_link\"") >&5
+if { (eval echo "$as_me:4691: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:4693: \$? = $ac_status" >&5
+  echo "$as_me:4694: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:4696: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4697: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4699: \$? = $ac_status" >&5
+  echo "$as_me:4700: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   lt_cv_prog_cc_static_works=yes
 else
@@ -4710,7 +4711,7 @@
 
 # Belt *and* braces to stop my trousers falling down:
 test "X$lt_cv_prog_cc_static_works" = Xno && lt_cv_prog_cc_static=
-echo "$as_me:4713: result: $lt_cv_prog_cc_static_works" >&5
+echo "$as_me:4714: result: $lt_cv_prog_cc_static_works" >&5
 echo "${ECHO_T}$lt_cv_prog_cc_static_works" >&6
 
 pic_flag="$lt_cv_prog_cc_pic"
@@ -4721,7 +4722,7 @@
 can_build_shared="$lt_cv_prog_cc_can_build_shared"
 
 # Check to see if options -o and -c are simultaneously supported by compiler
-echo "$as_me:4724: checking if $compiler supports -c -o file.$ac_objext" >&5
+echo "$as_me:4725: checking if $compiler supports -c -o file.$ac_objext" >&5
 echo $ECHO_N "checking if $compiler supports -c -o file.$ac_objext... $ECHO_C" >&6
 if test "${lt_cv_compiler_c_o+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4741,7 +4742,7 @@
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:4744: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:4745: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -4765,12 +4766,12 @@
 fi
 
 compiler_c_o=$lt_cv_compiler_c_o
-echo "$as_me:4768: result: $compiler_c_o" >&5
+echo "$as_me:4769: result: $compiler_c_o" >&5
 echo "${ECHO_T}$compiler_c_o" >&6
 
 if test x"$compiler_c_o" = x"yes"; then
   # Check to see if we can write to a .lo
-  echo "$as_me:4773: checking if $compiler supports -c -o file.lo" >&5
+  echo "$as_me:4774: checking if $compiler supports -c -o file.lo" >&5
 echo $ECHO_N "checking if $compiler supports -c -o file.lo... $ECHO_C" >&6
   if test "${lt_cv_compiler_o_lo+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -4782,7 +4783,7 @@
   save_objext="$ac_objext"
   ac_objext=lo
   cat >conftest.$ac_ext <<_ACEOF
-#line 4785 "configure"
+#line 4786 "configure"
 #include "confdefs.h"
 
 int
@@ -4794,16 +4795,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4797: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4798: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4800: \$? = $ac_status" >&5
+  echo "$as_me:4801: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4803: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4806: \$? = $ac_status" >&5
+  echo "$as_me:4807: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
       # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@@ -4824,7 +4825,7 @@
 fi
 
   compiler_o_lo=$lt_cv_compiler_o_lo
-  echo "$as_me:4827: result: $compiler_o_lo" >&5
+  echo "$as_me:4828: result: $compiler_o_lo" >&5
 echo "${ECHO_T}$compiler_o_lo" >&6
 else
   compiler_o_lo=no
@@ -4834,7 +4835,7 @@
 hard_links="nottested"
 if test "$compiler_c_o" = no && test "$need_locks" != no; then
   # do not overwrite the value of need_locks provided by the user
-  echo "$as_me:4837: checking if we can lock with hard links" >&5
+  echo "$as_me:4838: checking if we can lock with hard links" >&5
 echo $ECHO_N "checking if we can lock with hard links... $ECHO_C" >&6
   hard_links=yes
   $rm conftest*
@@ -4842,10 +4843,10 @@
   touch conftest.a
   ln conftest.a conftest.b 2>&5 || hard_links=no
   ln conftest.a conftest.b 2>/dev/null && hard_links=no
-  echo "$as_me:4845: result: $hard_links" >&5
+  echo "$as_me:4846: result: $hard_links" >&5
 echo "${ECHO_T}$hard_links" >&6
   if test "$hard_links" = no; then
-    { echo "$as_me:4848: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
+    { echo "$as_me:4849: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&5
 echo "$as_me: WARNING: \`$CC' does not support \`-c -o', so \`make -j' may be unsafe" >&2;}
     need_locks=warn
   fi
@@ -4855,14 +4856,14 @@
 
 if test "$GCC" = yes; then
   # Check to see if options -fno-rtti -fno-exceptions are supported by compiler
-  echo "$as_me:4858: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
+  echo "$as_me:4859: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 echo $ECHO_N "checking if $compiler supports -fno-rtti -fno-exceptions... $ECHO_C" >&6
   echo "int some_variable = 0;" > conftest.$ac_ext
   save_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS -fno-rtti -fno-exceptions -c conftest.$ac_ext"
   compiler_rtti_exceptions=no
   cat >conftest.$ac_ext <<_ACEOF
-#line 4865 "configure"
+#line 4866 "configure"
 #include "confdefs.h"
 
 int
@@ -4874,16 +4875,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:4877: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:4878: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:4880: \$? = $ac_status" >&5
+  echo "$as_me:4881: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:4883: \"$ac_try\"") >&5
+  { (eval echo "$as_me:4884: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:4886: \$? = $ac_status" >&5
+  echo "$as_me:4887: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
       # The compiler can only warn and ignore the option if not recognized
     # So say no if there are warnings
@@ -4899,7 +4900,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
   CFLAGS="$save_CFLAGS"
-  echo "$as_me:4902: result: $compiler_rtti_exceptions" >&5
+  echo "$as_me:4903: result: $compiler_rtti_exceptions" >&5
 echo "${ECHO_T}$compiler_rtti_exceptions" >&6
 
   if test "$compiler_rtti_exceptions" = "yes"; then
@@ -4910,7 +4911,7 @@
 fi
 
 # See if the linker supports building shared libraries.
-echo "$as_me:4913: checking whether the linker ($LD) supports shared libraries" >&5
+echo "$as_me:4914: checking whether the linker ($LD) supports shared libraries" >&5
 echo $ECHO_N "checking whether the linker ($LD) supports shared libraries... $ECHO_C" >&6
 
 allow_undefined_flag=
@@ -5605,12 +5606,12 @@
     ;;
   esac
 fi
-echo "$as_me:5608: result: $ld_shlibs" >&5
+echo "$as_me:5609: result: $ld_shlibs" >&5
 echo "${ECHO_T}$ld_shlibs" >&6
 test "$ld_shlibs" = no && can_build_shared=no
 
 # Check hardcoding attributes.
-echo "$as_me:5613: checking how to hardcode library paths into programs" >&5
+echo "$as_me:5614: checking how to hardcode library paths into programs" >&5
 echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
 hardcode_action=
 if test -n "$hardcode_libdir_flag_spec" || \
@@ -5634,20 +5635,20 @@
   # directories.
   hardcode_action=unsupported
 fi
-echo "$as_me:5637: result: $hardcode_action" >&5
+echo "$as_me:5638: result: $hardcode_action" >&5
 echo "${ECHO_T}$hardcode_action" >&6
 
 striplib=
 old_striplib=
-echo "$as_me:5642: checking whether stripping libraries is possible" >&5
+echo "$as_me:5643: checking whether stripping libraries is possible" >&5
 echo $ECHO_N "checking whether stripping libraries is possible... $ECHO_C" >&6
 if test -n "$STRIP" && $STRIP -V 2>&1 | grep "GNU strip" >/dev/null; then
   test -z "$old_striplib" && old_striplib="$STRIP --strip-debug"
   test -z "$striplib" && striplib="$STRIP --strip-unneeded"
-  echo "$as_me:5647: result: yes" >&5
+  echo "$as_me:5648: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:5650: result: no" >&5
+  echo "$as_me:5651: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -5655,7 +5656,7 @@
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
 
 # PORTME Fill in your ld.so characteristics
-echo "$as_me:5658: checking dynamic linker characteristics" >&5
+echo "$as_me:5659: checking dynamic linker characteristics" >&5
 echo $ECHO_N "checking dynamic linker characteristics... $ECHO_C" >&6
 library_names_spec=
 libname_spec='lib$name'
@@ -6062,17 +6063,17 @@
   dynamic_linker=no
   ;;
 esac
-echo "$as_me:6065: result: $dynamic_linker" >&5
+echo "$as_me:6066: result: $dynamic_linker" >&5
 echo "${ECHO_T}$dynamic_linker" >&6
 test "$dynamic_linker" = no && can_build_shared=no
 
 # Report the final consequences.
-echo "$as_me:6070: checking if libtool supports shared libraries" >&5
+echo "$as_me:6071: checking if libtool supports shared libraries" >&5
 echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-echo "$as_me:6072: result: $can_build_shared" >&5
+echo "$as_me:6073: result: $can_build_shared" >&5
 echo "${ECHO_T}$can_build_shared" >&6
 
-echo "$as_me:6075: checking whether to build shared libraries" >&5
+echo "$as_me:6076: checking whether to build shared libraries" >&5
 echo $ECHO_N "checking whether to build shared libraries... $ECHO_C" >&6
 test "$can_build_shared" = "no" && enable_shared=no
 
@@ -6093,14 +6094,14 @@
   fi
   ;;
 esac
-echo "$as_me:6096: result: $enable_shared" >&5
+echo "$as_me:6097: result: $enable_shared" >&5
 echo "${ECHO_T}$enable_shared" >&6
 
-echo "$as_me:6099: checking whether to build static libraries" >&5
+echo "$as_me:6100: checking whether to build static libraries" >&5
 echo $ECHO_N "checking whether to build static libraries... $ECHO_C" >&6
 # Make sure either enable_shared or enable_static is yes.
 test "$enable_shared" = yes || enable_static=yes
-echo "$as_me:6103: result: $enable_static" >&5
+echo "$as_me:6104: result: $enable_static" >&5
 echo "${ECHO_T}$enable_static" >&6
 
 if test "$hardcode_action" = relink; then
@@ -6138,13 +6139,13 @@
    ;;
 
   *)
-    echo "$as_me:6141: checking for shl_load" >&5
+    echo "$as_me:6142: checking for shl_load" >&5
 echo $ECHO_N "checking for shl_load... $ECHO_C" >&6
 if test "${ac_cv_func_shl_load+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6147 "configure"
+#line 6148 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shl_load (); below.  */
@@ -6175,16 +6176,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6178: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6179: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6181: \$? = $ac_status" >&5
+  echo "$as_me:6182: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6185: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6187: \$? = $ac_status" >&5
+  echo "$as_me:6188: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shl_load=yes
 else
@@ -6194,12 +6195,12 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6197: result: $ac_cv_func_shl_load" >&5
+echo "$as_me:6198: result: $ac_cv_func_shl_load" >&5
 echo "${ECHO_T}$ac_cv_func_shl_load" >&6
 if test $ac_cv_func_shl_load = yes; then
   lt_cv_dlopen="shl_load"
 else
-  echo "$as_me:6202: checking for shl_load in -ldld" >&5
+  echo "$as_me:6203: checking for shl_load in -ldld" >&5
 echo $ECHO_N "checking for shl_load in -ldld... $ECHO_C" >&6
 if test "${ac_cv_lib_dld_shl_load+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6207,7 +6208,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6210 "configure"
+#line 6211 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6226,16 +6227,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6229: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6230: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6232: \$? = $ac_status" >&5
+  echo "$as_me:6233: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6235: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6236: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6238: \$? = $ac_status" >&5
+  echo "$as_me:6239: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dld_shl_load=yes
 else
@@ -6246,18 +6247,18 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6249: result: $ac_cv_lib_dld_shl_load" >&5
+echo "$as_me:6250: result: $ac_cv_lib_dld_shl_load" >&5
 echo "${ECHO_T}$ac_cv_lib_dld_shl_load" >&6
 if test $ac_cv_lib_dld_shl_load = yes; then
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"
 else
-  echo "$as_me:6254: checking for dlopen" >&5
+  echo "$as_me:6255: checking for dlopen" >&5
 echo $ECHO_N "checking for dlopen... $ECHO_C" >&6
 if test "${ac_cv_func_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 6260 "configure"
+#line 6261 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char dlopen (); below.  */
@@ -6288,16 +6289,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6291: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6292: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6294: \$? = $ac_status" >&5
+  echo "$as_me:6295: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6297: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6298: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6300: \$? = $ac_status" >&5
+  echo "$as_me:6301: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_dlopen=yes
 else
@@ -6307,12 +6308,12 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:6310: result: $ac_cv_func_dlopen" >&5
+echo "$as_me:6311: result: $ac_cv_func_dlopen" >&5
 echo "${ECHO_T}$ac_cv_func_dlopen" >&6
 if test $ac_cv_func_dlopen = yes; then
   lt_cv_dlopen="dlopen"
 else
-  echo "$as_me:6315: checking for dlopen in -ldl" >&5
+  echo "$as_me:6316: checking for dlopen in -ldl" >&5
 echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6320,7 +6321,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6323 "configure"
+#line 6324 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6339,16 +6340,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6342: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6343: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6345: \$? = $ac_status" >&5
+  echo "$as_me:6346: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6349: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6351: \$? = $ac_status" >&5
+  echo "$as_me:6352: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dl_dlopen=yes
 else
@@ -6359,12 +6360,12 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6362: result: $ac_cv_lib_dl_dlopen" >&5
+echo "$as_me:6363: result: $ac_cv_lib_dl_dlopen" >&5
 echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
 if test $ac_cv_lib_dl_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
-  echo "$as_me:6367: checking for dlopen in -lsvld" >&5
+  echo "$as_me:6368: checking for dlopen in -lsvld" >&5
 echo $ECHO_N "checking for dlopen in -lsvld... $ECHO_C" >&6
 if test "${ac_cv_lib_svld_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6372,7 +6373,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsvld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6375 "configure"
+#line 6376 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6391,16 +6392,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6394: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6395: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6397: \$? = $ac_status" >&5
+  echo "$as_me:6398: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6400: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6401: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6403: \$? = $ac_status" >&5
+  echo "$as_me:6404: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_svld_dlopen=yes
 else
@@ -6411,12 +6412,12 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6414: result: $ac_cv_lib_svld_dlopen" >&5
+echo "$as_me:6415: result: $ac_cv_lib_svld_dlopen" >&5
 echo "${ECHO_T}$ac_cv_lib_svld_dlopen" >&6
 if test $ac_cv_lib_svld_dlopen = yes; then
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
-  echo "$as_me:6419: checking for dld_link in -ldld" >&5
+  echo "$as_me:6420: checking for dld_link in -ldld" >&5
 echo $ECHO_N "checking for dld_link in -ldld... $ECHO_C" >&6
 if test "${ac_cv_lib_dld_dld_link+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6424,7 +6425,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldld  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 6427 "configure"
+#line 6428 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -6443,16 +6444,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:6446: \"$ac_link\"") >&5
+if { (eval echo "$as_me:6447: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6449: \$? = $ac_status" >&5
+  echo "$as_me:6450: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:6452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:6453: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:6455: \$? = $ac_status" >&5
+  echo "$as_me:6456: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dld_dld_link=yes
 else
@@ -6463,7 +6464,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:6466: result: $ac_cv_lib_dld_dld_link" >&5
+echo "$as_me:6467: result: $ac_cv_lib_dld_dld_link" >&5
 echo "${ECHO_T}$ac_cv_lib_dld_dld_link" >&6
 if test $ac_cv_lib_dld_dld_link = yes; then
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"
@@ -6499,7 +6500,7 @@
     save_LIBS="$LIBS"
     LIBS="$lt_cv_dlopen_libs $LIBS"
 
-    echo "$as_me:6502: checking whether a program can dlopen itself" >&5
+    echo "$as_me:6503: checking whether a program can dlopen itself" >&5
 echo $ECHO_N "checking whether a program can dlopen itself... $ECHO_C" >&6
 if test "${lt_cv_dlopen_self+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6510,7 +6511,7 @@
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6513 "configure"
+#line 6514 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6571,10 +6572,10 @@
     exit (status);
 }
 EOF
-  if { (eval echo "$as_me:6574: \"$ac_link\"") >&5
+  if { (eval echo "$as_me:6575: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6577: \$? = $ac_status" >&5
+  echo "$as_me:6578: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) 2>/dev/null
     lt_status=$?
@@ -6591,12 +6592,12 @@
 rm -fr conftest*
 
 fi
-echo "$as_me:6594: result: $lt_cv_dlopen_self" >&5
+echo "$as_me:6595: result: $lt_cv_dlopen_self" >&5
 echo "${ECHO_T}$lt_cv_dlopen_self" >&6
 
     if test "x$lt_cv_dlopen_self" = xyes; then
       LDFLAGS="$LDFLAGS $link_static_flag"
-      echo "$as_me:6599: checking whether a statically linked program can dlopen itself" >&5
+      echo "$as_me:6600: checking whether a statically linked program can dlopen itself" >&5
 echo $ECHO_N "checking whether a statically linked program can dlopen itself... $ECHO_C" >&6
 if test "${lt_cv_dlopen_self_static+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6607,7 +6608,7 @@
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6610 "configure"
+#line 6611 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6668,10 +6669,10 @@
     exit (status);
 }
 EOF
-  if { (eval echo "$as_me:6671: \"$ac_link\"") >&5
+  if { (eval echo "$as_me:6672: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:6674: \$? = $ac_status" >&5
+  echo "$as_me:6675: \$? = $ac_status" >&5
   (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
     (./conftest; exit; ) 2>/dev/null
     lt_status=$?
@@ -6688,7 +6689,7 @@
 rm -fr conftest*
 
 fi
-echo "$as_me:6691: result: $lt_cv_dlopen_self_static" >&5
+echo "$as_me:6692: result: $lt_cv_dlopen_self_static" >&5
 echo "${ECHO_T}$lt_cv_dlopen_self_static" >&6
     fi
 
@@ -6718,7 +6719,7 @@
     # Test whether the compiler implicitly links with -lc since on some
     # systems, -lgcc has to come before -lc. If gcc already passes -lc
     # to ld, don't add -lc before -lgcc.
-    echo "$as_me:6721: checking whether -lc should be explicitly linked in" >&5
+    echo "$as_me:6722: checking whether -lc should be explicitly linked in" >&5
 echo $ECHO_N "checking whether -lc should be explicitly linked in... $ECHO_C" >&6
     if test "${lt_cv_archive_cmds_need_lc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -6726,10 +6727,10 @@
   $rm conftest*
     echo 'static int dummy;' > conftest.$ac_ext
 
-    if { (eval echo "$as_me:6729: \"$ac_compile\"") >&5
+    if { (eval echo "$as_me:6730: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:6732: \$? = $ac_status" >&5
+  echo "$as_me:6733: \$? = $ac_status" >&5
   (exit $ac_status); }; then
       soname=conftest
       lib=conftest
@@ -6743,10 +6744,10 @@
       libname=conftest
       save_allow_undefined_flag=$allow_undefined_flag
       allow_undefined_flag=
-      if { (eval echo "$as_me:6746: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
+      if { (eval echo "$as_me:6747: \"$archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1\"") >&5
   (eval $archive_cmds 2\>\&1 \| grep \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
-  echo "$as_me:6749: \$? = $ac_status" >&5
+  echo "$as_me:6750: \$? = $ac_status" >&5
   (exit $ac_status); }
       then
 	lt_cv_archive_cmds_need_lc=no
@@ -6759,7 +6760,7 @@
     fi
 fi
 
-    echo "$as_me:6762: result: $lt_cv_archive_cmds_need_lc" >&5
+    echo "$as_me:6763: result: $lt_cv_archive_cmds_need_lc" >&5
 echo "${ECHO_T}$lt_cv_archive_cmds_need_lc" >&6
     ;;
   esac
@@ -7327,13 +7328,13 @@
 
 # Prevent multiple expansion
 
-echo "$as_me:7330: checking whether CC can assemble cpuid instruction" >&5
+echo "$as_me:7331: checking whether CC can assemble cpuid instruction" >&5
 echo $ECHO_N "checking whether CC can assemble cpuid instruction... $ECHO_C" >&6
 if test "${ac_cc_can_cpuid+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
    cat >conftest.$ac_ext <<_ACEOF
-#line 7336 "configure"
+#line 7337 "configure"
 #include "confdefs.h"
 
 int
@@ -7347,16 +7348,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7350: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7351: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7353: \$? = $ac_status" >&5
+  echo "$as_me:7354: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7356: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7357: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7359: \$? = $ac_status" >&5
+  echo "$as_me:7360: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cc_can_cpuid="yes"
 else
@@ -7366,7 +7367,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7369: result: $ac_cc_can_cpuid" >&5
+echo "$as_me:7370: result: $ac_cc_can_cpuid" >&5
 echo "${ECHO_T}$ac_cc_can_cpuid" >&6
 	if test "x$ac_cc_can_cpuid" = "xyes"; then
 	     cat >>confdefs.h <<\EOF
@@ -7375,13 +7376,13 @@
 
 	fi
 
-echo "$as_me:7378: checking whether CC can assemble amask instruction" >&5
+echo "$as_me:7379: checking whether CC can assemble amask instruction" >&5
 echo $ECHO_N "checking whether CC can assemble amask instruction... $ECHO_C" >&6
 if test "${ac_cc_can_amask+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
    cat >conftest.$ac_ext <<_ACEOF
-#line 7384 "configure"
+#line 7385 "configure"
 #include "confdefs.h"
 
 int
@@ -7395,16 +7396,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7398: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7399: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7401: \$? = $ac_status" >&5
+  echo "$as_me:7402: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7404: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7405: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7407: \$? = $ac_status" >&5
+  echo "$as_me:7408: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cc_can_amask="yes"
 else
@@ -7414,7 +7415,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:7417: result: $ac_cc_can_amask" >&5
+echo "$as_me:7418: result: $ac_cc_can_amask" >&5
 echo "${ECHO_T}$ac_cc_can_amask" >&6
 	if test "x$ac_cc_can_amask" = "xyes"; then
 	     cat >>confdefs.h <<\EOF
@@ -7544,6 +7545,11 @@
   enableval="$enable_kii"
   build_kii_input=$enableval
 fi;
+# Check whether --enable-cocoa or --disable-cocoa was given.
+if test "${enable_cocoa+set}" = set; then
+  enableval="$enable_cocoa"
+  build_cocoa_input=$enableval
+fi;
 
 # Check whether --enable-mutexes or --disable-mutexes was given.
 if test "${enable_mutexes+set}" = set; then
@@ -7603,7 +7609,7 @@
    IFS=$ac_save_ifs
 fi
 
-echo "$as_me:7606: checking for VGLInit in -lvgl" >&5
+echo "$as_me:7612: checking for VGLInit in -lvgl" >&5
 echo $ECHO_N "checking for VGLInit in -lvgl... $ECHO_C" >&6
 if test "${ac_cv_lib_vgl_VGLInit+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -7611,7 +7617,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lvgl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 7614 "configure"
+#line 7620 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -7630,16 +7636,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7633: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7639: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7636: \$? = $ac_status" >&5
+  echo "$as_me:7642: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7639: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7645: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7642: \$? = $ac_status" >&5
+  echo "$as_me:7648: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_vgl_VGLInit=yes
 else
@@ -7650,7 +7656,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:7653: result: $ac_cv_lib_vgl_VGLInit" >&5
+echo "$as_me:7659: result: $ac_cv_lib_vgl_VGLInit" >&5
 echo "${ECHO_T}$ac_cv_lib_vgl_VGLInit" >&6
 if test $ac_cv_lib_vgl_VGLInit = yes; then
   foo=bar
@@ -7658,7 +7664,7 @@
   build_vgl_target="no"
 fi
 
-echo "$as_me:7661: checking for X" >&5
+echo "$as_me:7667: checking for X" >&5
 echo $ECHO_N "checking for X... $ECHO_C" >&6
 
 # Check whether --with-x or --without-x was given.
@@ -7755,17 +7761,17 @@
   # Guess where to find include files, by looking for Intrinsic.h.
   # First, try using that file with no special directory specified.
   cat >conftest.$ac_ext <<_ACEOF
-#line 7758 "configure"
+#line 7764 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 _ACEOF
-if { (eval echo "$as_me:7762: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7768: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7768: \$? = $ac_status" >&5
+  echo "$as_me:7774: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7798,7 +7804,7 @@
   ac_save_LIBS=$LIBS
   LIBS="-lXt $LIBS"
   cat >conftest.$ac_ext <<_ACEOF
-#line 7801 "configure"
+#line 7807 "configure"
 #include "confdefs.h"
 #include <X11/Intrinsic.h>
 int
@@ -7810,16 +7816,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:7813: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7819: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7816: \$? = $ac_status" >&5
+  echo "$as_me:7822: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:7819: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7825: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7822: \$? = $ac_status" >&5
+  echo "$as_me:7828: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   LIBS=$ac_save_LIBS
 # We can link X programs with no special library path.
@@ -7857,7 +7863,7 @@
 fi # $with_x != no
 
 if test "$have_x" != yes; then
-  echo "$as_me:7860: result: $have_x" >&5
+  echo "$as_me:7866: result: $have_x" >&5
 echo "${ECHO_T}$have_x" >&6
   no_x=yes
 else
@@ -7867,17 +7873,17 @@
   # Update the cache value to reflect the command line values.
   ac_cv_have_x="have_x=yes \
 		ac_x_includes=$x_includes ac_x_libraries=$x_libraries"
-  echo "$as_me:7870: result: libraries $x_libraries, headers $x_includes" >&5
+  echo "$as_me:7876: result: libraries $x_libraries, headers $x_includes" >&5
 echo "${ECHO_T}libraries $x_libraries, headers $x_includes" >&6
 fi
 
-echo "$as_me:7874: checking for ANSI C header files" >&5
+echo "$as_me:7880: checking for ANSI C header files" >&5
 echo $ECHO_N "checking for ANSI C header files... $ECHO_C" >&6
 if test "${ac_cv_header_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7880 "configure"
+#line 7886 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 #include <stdarg.h>
@@ -7885,13 +7891,13 @@
 #include <float.h>
 
 _ACEOF
-if { (eval echo "$as_me:7888: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:7894: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:7894: \$? = $ac_status" >&5
+  echo "$as_me:7900: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -7913,7 +7919,7 @@
 if test $ac_cv_header_stdc = yes; then
   # SunOS 4.x string.h does not declare mem*, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 7916 "configure"
+#line 7922 "configure"
 #include "confdefs.h"
 #include <string.h>
 
@@ -7931,7 +7937,7 @@
 if test $ac_cv_header_stdc = yes; then
   # ISC 2.0.2 stdlib.h does not declare free, contrary to ANSI.
   cat >conftest.$ac_ext <<_ACEOF
-#line 7934 "configure"
+#line 7940 "configure"
 #include "confdefs.h"
 #include <stdlib.h>
 
@@ -7952,7 +7958,7 @@
   :
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 7955 "configure"
+#line 7961 "configure"
 #include "confdefs.h"
 #include <ctype.h>
 #if ((' ' & 0x0FF) == 0x020)
@@ -7978,15 +7984,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:7981: \"$ac_link\"") >&5
+if { (eval echo "$as_me:7987: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:7984: \$? = $ac_status" >&5
+  echo "$as_me:7990: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:7986: \"$ac_try\"") >&5
+  { (eval echo "$as_me:7992: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:7989: \$? = $ac_status" >&5
+  echo "$as_me:7995: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
@@ -7999,7 +8005,7 @@
 fi
 fi
 fi
-echo "$as_me:8002: result: $ac_cv_header_stdc" >&5
+echo "$as_me:8008: result: $ac_cv_header_stdc" >&5
 echo "${ECHO_T}$ac_cv_header_stdc" >&6
 if test $ac_cv_header_stdc = yes; then
 
@@ -8009,13 +8015,13 @@
 
 fi
 
-echo "$as_me:8012: checking whether time.h and sys/time.h may both be included" >&5
+echo "$as_me:8018: checking whether time.h and sys/time.h may both be included" >&5
 echo $ECHO_N "checking whether time.h and sys/time.h may both be included... $ECHO_C" >&6
 if test "${ac_cv_header_time+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8018 "configure"
+#line 8024 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/time.h>
@@ -8031,16 +8037,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8034: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8040: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8037: \$? = $ac_status" >&5
+  echo "$as_me:8043: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8040: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8046: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8043: \$? = $ac_status" >&5
+  echo "$as_me:8049: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_header_time=yes
 else
@@ -8050,7 +8056,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8053: result: $ac_cv_header_time" >&5
+echo "$as_me:8059: result: $ac_cv_header_time" >&5
 echo "${ECHO_T}$ac_cv_header_time" >&6
 if test $ac_cv_header_time = yes; then
 
@@ -8070,26 +8076,27 @@
 	linux/h3600_ts.h 					\
 	termios.h vgl.h windows.h dinput.h			\
 	mach-o/dyld.h						\
+	ApplicationServices/ApplicationServices.h
 
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8076: checking for $ac_header" >&5
+echo "$as_me:8083: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8082 "configure"
+#line 8089 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:8086: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:8093: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:8092: \$? = $ac_status" >&5
+  echo "$as_me:8099: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -8108,7 +8115,7 @@
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:8111: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8118: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8118,7 +8125,7 @@
 fi
 done
 
-echo "$as_me:8121: checking for $CC option to accept ANSI C" >&5
+echo "$as_me:8128: checking for $CC option to accept ANSI C" >&5
 echo $ECHO_N "checking for $CC option to accept ANSI C... $ECHO_C" >&6
 if test "${ac_cv_prog_cc_stdc+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8126,7 +8133,7 @@
   ac_cv_prog_cc_stdc=no
 ac_save_CC=$CC
 cat >conftest.$ac_ext <<_ACEOF
-#line 8129 "configure"
+#line 8136 "configure"
 #include "confdefs.h"
 #include <stdarg.h>
 #include <stdio.h>
@@ -8175,16 +8182,16 @@
 do
   CC="$ac_save_CC $ac_arg"
   rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8178: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8185: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8181: \$? = $ac_status" >&5
+  echo "$as_me:8188: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8184: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8191: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8187: \$? = $ac_status" >&5
+  echo "$as_me:8194: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_cc_stdc=$ac_arg
 break
@@ -8201,21 +8208,21 @@
 
 case "x$ac_cv_prog_cc_stdc" in
   x|xno)
-    echo "$as_me:8204: result: none needed" >&5
+    echo "$as_me:8211: result: none needed" >&5
 echo "${ECHO_T}none needed" >&6 ;;
   *)
-    echo "$as_me:8207: result: $ac_cv_prog_cc_stdc" >&5
+    echo "$as_me:8214: result: $ac_cv_prog_cc_stdc" >&5
 echo "${ECHO_T}$ac_cv_prog_cc_stdc" >&6
     CC="$CC $ac_cv_prog_cc_stdc" ;;
 esac
 
-echo "$as_me:8212: checking for an ANSI C-conforming const" >&5
+echo "$as_me:8219: checking for an ANSI C-conforming const" >&5
 echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6
 if test "${ac_cv_c_const+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8218 "configure"
+#line 8225 "configure"
 #include "confdefs.h"
 
 int
@@ -8273,16 +8280,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8276: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8283: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8279: \$? = $ac_status" >&5
+  echo "$as_me:8286: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8282: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8289: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8285: \$? = $ac_status" >&5
+  echo "$as_me:8292: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_const=yes
 else
@@ -8292,7 +8299,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8295: result: $ac_cv_c_const" >&5
+echo "$as_me:8302: result: $ac_cv_c_const" >&5
 echo "${ECHO_T}$ac_cv_c_const" >&6
 if test $ac_cv_c_const = no; then
 
@@ -8302,7 +8309,7 @@
 
 fi
 
-echo "$as_me:8305: checking for inline" >&5
+echo "$as_me:8312: checking for inline" >&5
 echo $ECHO_N "checking for inline... $ECHO_C" >&6
 if test "${ac_cv_c_inline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8310,7 +8317,7 @@
   ac_cv_c_inline=no
 for ac_kw in inline __inline__ __inline; do
   cat >conftest.$ac_ext <<_ACEOF
-#line 8313 "configure"
+#line 8320 "configure"
 #include "confdefs.h"
 #ifndef __cplusplus
 static $ac_kw int static_foo () {return 0; }
@@ -8319,16 +8326,16 @@
 
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8322: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8329: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8325: \$? = $ac_status" >&5
+  echo "$as_me:8332: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8328: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8335: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8331: \$? = $ac_status" >&5
+  echo "$as_me:8338: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_inline=$ac_kw; break
 else
@@ -8339,7 +8346,7 @@
 done
 
 fi
-echo "$as_me:8342: result: $ac_cv_c_inline" >&5
+echo "$as_me:8349: result: $ac_cv_c_inline" >&5
 echo "${ECHO_T}$ac_cv_c_inline" >&6
 case $ac_cv_c_inline in
   inline | yes) ;;
@@ -8360,28 +8367,28 @@
                   inttypes.h stdint.h unistd.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:8363: checking for $ac_header" >&5
+echo "$as_me:8370: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8369 "configure"
+#line 8376 "configure"
 #include "confdefs.h"
 $ac_includes_default
 #include <$ac_header>
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8375: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8382: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8378: \$? = $ac_status" >&5
+  echo "$as_me:8385: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8381: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8388: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8384: \$? = $ac_status" >&5
+  echo "$as_me:8391: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_Header=yes"
 else
@@ -8391,7 +8398,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8394: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:8401: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -8401,13 +8408,13 @@
 fi
 done
 
-echo "$as_me:8404: checking for size_t" >&5
+echo "$as_me:8411: checking for size_t" >&5
 echo $ECHO_N "checking for size_t... $ECHO_C" >&6
 if test "${ac_cv_type_size_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8410 "configure"
+#line 8417 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8422,16 +8429,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8425: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8432: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8428: \$? = $ac_status" >&5
+  echo "$as_me:8435: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8431: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8438: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8434: \$? = $ac_status" >&5
+  echo "$as_me:8441: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_size_t=yes
 else
@@ -8441,7 +8448,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8444: result: $ac_cv_type_size_t" >&5
+echo "$as_me:8451: result: $ac_cv_type_size_t" >&5
 echo "${ECHO_T}$ac_cv_type_size_t" >&6
 if test $ac_cv_type_size_t = yes; then
   :
@@ -8453,13 +8460,13 @@
 
 fi
 
-echo "$as_me:8456: checking for struct stat.st_rdev" >&5
+echo "$as_me:8463: checking for struct stat.st_rdev" >&5
 echo $ECHO_N "checking for struct stat.st_rdev... $ECHO_C" >&6
 if test "${ac_cv_member_struct_stat_st_rdev+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8462 "configure"
+#line 8469 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8473,16 +8480,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8476: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8483: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8479: \$? = $ac_status" >&5
+  echo "$as_me:8486: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8482: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8489: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8485: \$? = $ac_status" >&5
+  echo "$as_me:8492: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_member_struct_stat_st_rdev=yes
 else
@@ -8492,7 +8499,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8495: result: $ac_cv_member_struct_stat_st_rdev" >&5
+echo "$as_me:8502: result: $ac_cv_member_struct_stat_st_rdev" >&5
 echo "${ECHO_T}$ac_cv_member_struct_stat_st_rdev" >&6
 if test $ac_cv_member_struct_stat_st_rdev = yes; then
 
@@ -8509,7 +8516,7 @@
 if test "$CC" = "i386-mingw32-gcc"; then
   ac_cv_c_bigendian=no
 else
-  echo "$as_me:8512: checking whether byte ordering is bigendian" >&5
+  echo "$as_me:8519: checking whether byte ordering is bigendian" >&5
 echo $ECHO_N "checking whether byte ordering is bigendian... $ECHO_C" >&6
 if test "${ac_cv_c_bigendian+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8517,7 +8524,7 @@
   ac_cv_c_bigendian=unknown
 # See if sys/param.h defines the BYTE_ORDER macro.
 cat >conftest.$ac_ext <<_ACEOF
-#line 8520 "configure"
+#line 8527 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -8534,20 +8541,20 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8537: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8544: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8540: \$? = $ac_status" >&5
+  echo "$as_me:8547: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8543: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8550: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8546: \$? = $ac_status" >&5
+  echo "$as_me:8553: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   # It does; now see whether it defined to BIG_ENDIAN or not.
 cat >conftest.$ac_ext <<_ACEOF
-#line 8550 "configure"
+#line 8557 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <sys/param.h>
@@ -8564,16 +8571,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8567: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8574: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8570: \$? = $ac_status" >&5
+  echo "$as_me:8577: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8573: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8580: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8576: \$? = $ac_status" >&5
+  echo "$as_me:8583: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=yes
 else
@@ -8589,12 +8596,12 @@
 rm -f conftest.$ac_objext conftest.$ac_ext
 if test $ac_cv_c_bigendian = unknown; then
 if test "$cross_compiling" = yes; then
-  { { echo "$as_me:8592: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:8599: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8597 "configure"
+#line 8604 "configure"
 #include "confdefs.h"
 int
 main ()
@@ -8610,15 +8617,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8613: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8620: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8616: \$? = $ac_status" >&5
+  echo "$as_me:8623: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8618: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8625: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8621: \$? = $ac_status" >&5
+  echo "$as_me:8628: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_c_bigendian=no
 else
@@ -8631,7 +8638,7 @@
 fi
 fi
 fi
-echo "$as_me:8634: result: $ac_cv_c_bigendian" >&5
+echo "$as_me:8641: result: $ac_cv_c_bigendian" >&5
 echo "${ECHO_T}$ac_cv_c_bigendian" >&6
 if test $ac_cv_c_bigendian = yes; then
 
@@ -8642,13 +8649,13 @@
 fi
 
 fi
-echo "$as_me:8645: checking for char" >&5
+echo "$as_me:8652: checking for char" >&5
 echo $ECHO_N "checking for char... $ECHO_C" >&6
 if test "${ac_cv_type_char+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8651 "configure"
+#line 8658 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8663,16 +8670,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8666: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8673: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8669: \$? = $ac_status" >&5
+  echo "$as_me:8676: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8672: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8679: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8675: \$? = $ac_status" >&5
+  echo "$as_me:8682: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_char=yes
 else
@@ -8682,10 +8689,10 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8685: result: $ac_cv_type_char" >&5
+echo "$as_me:8692: result: $ac_cv_type_char" >&5
 echo "${ECHO_T}$ac_cv_type_char" >&6
 
-echo "$as_me:8688: checking size of char" >&5
+echo "$as_me:8695: checking size of char" >&5
 echo $ECHO_N "checking size of char... $ECHO_C" >&6
 if test "${ac_cv_sizeof_char+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8694,7 +8701,7 @@
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 8697 "configure"
+#line 8704 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8706,21 +8713,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8709: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8716: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8712: \$? = $ac_status" >&5
+  echo "$as_me:8719: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8715: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8722: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8718: \$? = $ac_status" >&5
+  echo "$as_me:8725: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 8723 "configure"
+#line 8730 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8732,16 +8739,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8735: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8742: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8738: \$? = $ac_status" >&5
+  echo "$as_me:8745: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8741: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8748: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8744: \$? = $ac_status" >&5
+  echo "$as_me:8751: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -8757,7 +8764,7 @@
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 8760 "configure"
+#line 8767 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8769,16 +8776,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8772: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8779: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8775: \$? = $ac_status" >&5
+  echo "$as_me:8782: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8778: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8785: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8781: \$? = $ac_status" >&5
+  echo "$as_me:8788: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -8794,7 +8801,7 @@
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 8797 "configure"
+#line 8804 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8806,16 +8813,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8809: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8816: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8812: \$? = $ac_status" >&5
+  echo "$as_me:8819: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8815: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8822: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8818: \$? = $ac_status" >&5
+  echo "$as_me:8825: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -8828,12 +8835,12 @@
 ac_cv_sizeof_char=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:8831: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:8838: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8836 "configure"
+#line 8843 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8849,15 +8856,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:8852: \"$ac_link\"") >&5
+if { (eval echo "$as_me:8859: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:8855: \$? = $ac_status" >&5
+  echo "$as_me:8862: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:8857: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8864: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8860: \$? = $ac_status" >&5
+  echo "$as_me:8867: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_char=`cat conftest.val`
 else
@@ -8873,19 +8880,19 @@
   ac_cv_sizeof_char=0
 fi
 fi
-echo "$as_me:8876: result: $ac_cv_sizeof_char" >&5
+echo "$as_me:8883: result: $ac_cv_sizeof_char" >&5
 echo "${ECHO_T}$ac_cv_sizeof_char" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_CHAR $ac_cv_sizeof_char
 EOF
 
-echo "$as_me:8882: checking for short" >&5
+echo "$as_me:8889: checking for short" >&5
 echo $ECHO_N "checking for short... $ECHO_C" >&6
 if test "${ac_cv_type_short+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 8888 "configure"
+#line 8895 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8900,16 +8907,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8903: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8910: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8906: \$? = $ac_status" >&5
+  echo "$as_me:8913: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8909: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8916: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8912: \$? = $ac_status" >&5
+  echo "$as_me:8919: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_short=yes
 else
@@ -8919,10 +8926,10 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:8922: result: $ac_cv_type_short" >&5
+echo "$as_me:8929: result: $ac_cv_type_short" >&5
 echo "${ECHO_T}$ac_cv_type_short" >&6
 
-echo "$as_me:8925: checking size of short" >&5
+echo "$as_me:8932: checking size of short" >&5
 echo $ECHO_N "checking size of short... $ECHO_C" >&6
 if test "${ac_cv_sizeof_short+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -8931,7 +8938,7 @@
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 8934 "configure"
+#line 8941 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8943,21 +8950,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8946: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8953: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8949: \$? = $ac_status" >&5
+  echo "$as_me:8956: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8952: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8959: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8955: \$? = $ac_status" >&5
+  echo "$as_me:8962: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 8960 "configure"
+#line 8967 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -8969,16 +8976,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:8972: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:8979: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:8975: \$? = $ac_status" >&5
+  echo "$as_me:8982: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:8978: \"$ac_try\"") >&5
+  { (eval echo "$as_me:8985: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:8981: \$? = $ac_status" >&5
+  echo "$as_me:8988: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -8994,7 +9001,7 @@
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 8997 "configure"
+#line 9004 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9006,16 +9013,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9009: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9016: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9012: \$? = $ac_status" >&5
+  echo "$as_me:9019: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9015: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9022: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9018: \$? = $ac_status" >&5
+  echo "$as_me:9025: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -9031,7 +9038,7 @@
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 9034 "configure"
+#line 9041 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9043,16 +9050,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9046: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9053: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9049: \$? = $ac_status" >&5
+  echo "$as_me:9056: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9052: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9059: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9055: \$? = $ac_status" >&5
+  echo "$as_me:9062: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -9065,12 +9072,12 @@
 ac_cv_sizeof_short=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:9068: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:9075: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9073 "configure"
+#line 9080 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9086,15 +9093,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9089: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9096: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9092: \$? = $ac_status" >&5
+  echo "$as_me:9099: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9094: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9101: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9097: \$? = $ac_status" >&5
+  echo "$as_me:9104: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_short=`cat conftest.val`
 else
@@ -9110,19 +9117,19 @@
   ac_cv_sizeof_short=0
 fi
 fi
-echo "$as_me:9113: result: $ac_cv_sizeof_short" >&5
+echo "$as_me:9120: result: $ac_cv_sizeof_short" >&5
 echo "${ECHO_T}$ac_cv_sizeof_short" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_SHORT $ac_cv_sizeof_short
 EOF
 
-echo "$as_me:9119: checking for int" >&5
+echo "$as_me:9126: checking for int" >&5
 echo $ECHO_N "checking for int... $ECHO_C" >&6
 if test "${ac_cv_type_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9125 "configure"
+#line 9132 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9137,16 +9144,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9140: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9147: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9143: \$? = $ac_status" >&5
+  echo "$as_me:9150: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9149: \$? = $ac_status" >&5
+  echo "$as_me:9156: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_int=yes
 else
@@ -9156,10 +9163,10 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9159: result: $ac_cv_type_int" >&5
+echo "$as_me:9166: result: $ac_cv_type_int" >&5
 echo "${ECHO_T}$ac_cv_type_int" >&6
 
-echo "$as_me:9162: checking size of int" >&5
+echo "$as_me:9169: checking size of int" >&5
 echo $ECHO_N "checking size of int... $ECHO_C" >&6
 if test "${ac_cv_sizeof_int+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9168,7 +9175,7 @@
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 9171 "configure"
+#line 9178 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9180,21 +9187,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9183: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9190: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9186: \$? = $ac_status" >&5
+  echo "$as_me:9193: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9189: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9196: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9192: \$? = $ac_status" >&5
+  echo "$as_me:9199: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 9197 "configure"
+#line 9204 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9206,16 +9213,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9209: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9216: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9212: \$? = $ac_status" >&5
+  echo "$as_me:9219: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9215: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9222: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9218: \$? = $ac_status" >&5
+  echo "$as_me:9225: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -9231,7 +9238,7 @@
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 9234 "configure"
+#line 9241 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9243,16 +9250,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9246: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9253: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9249: \$? = $ac_status" >&5
+  echo "$as_me:9256: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9252: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9259: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9255: \$? = $ac_status" >&5
+  echo "$as_me:9262: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -9268,7 +9275,7 @@
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 9271 "configure"
+#line 9278 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9280,16 +9287,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9283: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9290: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9286: \$? = $ac_status" >&5
+  echo "$as_me:9293: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9289: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9296: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9292: \$? = $ac_status" >&5
+  echo "$as_me:9299: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -9302,12 +9309,12 @@
 ac_cv_sizeof_int=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:9305: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:9312: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9310 "configure"
+#line 9317 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9323,15 +9330,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9326: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9333: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9329: \$? = $ac_status" >&5
+  echo "$as_me:9336: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9331: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9338: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9334: \$? = $ac_status" >&5
+  echo "$as_me:9341: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_int=`cat conftest.val`
 else
@@ -9347,19 +9354,19 @@
   ac_cv_sizeof_int=0
 fi
 fi
-echo "$as_me:9350: result: $ac_cv_sizeof_int" >&5
+echo "$as_me:9357: result: $ac_cv_sizeof_int" >&5
 echo "${ECHO_T}$ac_cv_sizeof_int" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_INT $ac_cv_sizeof_int
 EOF
 
-echo "$as_me:9356: checking for long" >&5
+echo "$as_me:9363: checking for long" >&5
 echo $ECHO_N "checking for long... $ECHO_C" >&6
 if test "${ac_cv_type_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9362 "configure"
+#line 9369 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9374,16 +9381,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9377: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9384: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9380: \$? = $ac_status" >&5
+  echo "$as_me:9387: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9383: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9390: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9386: \$? = $ac_status" >&5
+  echo "$as_me:9393: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long=yes
 else
@@ -9393,10 +9400,10 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9396: result: $ac_cv_type_long" >&5
+echo "$as_me:9403: result: $ac_cv_type_long" >&5
 echo "${ECHO_T}$ac_cv_type_long" >&6
 
-echo "$as_me:9399: checking size of long" >&5
+echo "$as_me:9406: checking size of long" >&5
 echo $ECHO_N "checking size of long... $ECHO_C" >&6
 if test "${ac_cv_sizeof_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9405,7 +9412,7 @@
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 9408 "configure"
+#line 9415 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9417,21 +9424,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9420: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9427: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9423: \$? = $ac_status" >&5
+  echo "$as_me:9430: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9426: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9433: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9429: \$? = $ac_status" >&5
+  echo "$as_me:9436: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 9434 "configure"
+#line 9441 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9443,16 +9450,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9446: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9453: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9449: \$? = $ac_status" >&5
+  echo "$as_me:9456: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9452: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9459: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9455: \$? = $ac_status" >&5
+  echo "$as_me:9462: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -9468,7 +9475,7 @@
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 9471 "configure"
+#line 9478 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9480,16 +9487,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9483: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9490: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9486: \$? = $ac_status" >&5
+  echo "$as_me:9493: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9489: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9496: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9492: \$? = $ac_status" >&5
+  echo "$as_me:9499: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -9505,7 +9512,7 @@
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 9508 "configure"
+#line 9515 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9517,16 +9524,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9520: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9527: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9523: \$? = $ac_status" >&5
+  echo "$as_me:9530: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9526: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9533: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9529: \$? = $ac_status" >&5
+  echo "$as_me:9536: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -9539,12 +9546,12 @@
 ac_cv_sizeof_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:9542: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:9549: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9547 "configure"
+#line 9554 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9560,15 +9567,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9563: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9570: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9566: \$? = $ac_status" >&5
+  echo "$as_me:9573: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9568: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9575: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9571: \$? = $ac_status" >&5
+  echo "$as_me:9578: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long=`cat conftest.val`
 else
@@ -9584,19 +9591,19 @@
   ac_cv_sizeof_long=0
 fi
 fi
-echo "$as_me:9587: result: $ac_cv_sizeof_long" >&5
+echo "$as_me:9594: result: $ac_cv_sizeof_long" >&5
 echo "${ECHO_T}$ac_cv_sizeof_long" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_LONG $ac_cv_sizeof_long
 EOF
 
-echo "$as_me:9593: checking for long long" >&5
+echo "$as_me:9600: checking for long long" >&5
 echo $ECHO_N "checking for long long... $ECHO_C" >&6
 if test "${ac_cv_type_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9599 "configure"
+#line 9606 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9611,16 +9618,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9614: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9621: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9617: \$? = $ac_status" >&5
+  echo "$as_me:9624: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9620: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9627: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9623: \$? = $ac_status" >&5
+  echo "$as_me:9630: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_long_long=yes
 else
@@ -9630,10 +9637,10 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:9633: result: $ac_cv_type_long_long" >&5
+echo "$as_me:9640: result: $ac_cv_type_long_long" >&5
 echo "${ECHO_T}$ac_cv_type_long_long" >&6
 
-echo "$as_me:9636: checking size of long long" >&5
+echo "$as_me:9643: checking size of long long" >&5
 echo $ECHO_N "checking size of long long... $ECHO_C" >&6
 if test "${ac_cv_sizeof_long_long+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -9642,7 +9649,7 @@
   if test "$cross_compiling" = yes; then
   # Depending upon the size, compute the lo and hi bounds.
 cat >conftest.$ac_ext <<_ACEOF
-#line 9645 "configure"
+#line 9652 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9654,21 +9661,21 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9657: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9664: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9660: \$? = $ac_status" >&5
+  echo "$as_me:9667: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9663: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9670: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9666: \$? = $ac_status" >&5
+  echo "$as_me:9673: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=0 ac_mid=0
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 9671 "configure"
+#line 9678 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9680,16 +9687,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9683: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9690: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9686: \$? = $ac_status" >&5
+  echo "$as_me:9693: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9689: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9696: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9692: \$? = $ac_status" >&5
+  echo "$as_me:9699: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid; break
 else
@@ -9705,7 +9712,7 @@
 ac_hi=-1 ac_mid=-1
   while :; do
     cat >conftest.$ac_ext <<_ACEOF
-#line 9708 "configure"
+#line 9715 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9717,16 +9724,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9720: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9727: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9723: \$? = $ac_status" >&5
+  echo "$as_me:9730: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9726: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9733: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9729: \$? = $ac_status" >&5
+  echo "$as_me:9736: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_lo=$ac_mid; break
 else
@@ -9742,7 +9749,7 @@
 while test "x$ac_lo" != "x$ac_hi"; do
   ac_mid=`expr '(' $ac_hi - $ac_lo ')' / 2 + $ac_lo`
   cat >conftest.$ac_ext <<_ACEOF
-#line 9745 "configure"
+#line 9752 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9754,16 +9761,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:9757: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:9764: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:9760: \$? = $ac_status" >&5
+  echo "$as_me:9767: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:9763: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9770: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9766: \$? = $ac_status" >&5
+  echo "$as_me:9773: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_hi=$ac_mid
 else
@@ -9776,12 +9783,12 @@
 ac_cv_sizeof_long_long=$ac_lo
 else
   if test "$cross_compiling" = yes; then
-  { { echo "$as_me:9779: error: cannot run test program while cross compiling" >&5
+  { { echo "$as_me:9786: error: cannot run test program while cross compiling" >&5
 echo "$as_me: error: cannot run test program while cross compiling" >&2;}
    { (exit 1); exit 1; }; }
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 9784 "configure"
+#line 9791 "configure"
 #include "confdefs.h"
 $ac_includes_default
 int
@@ -9797,15 +9804,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:9800: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9807: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9803: \$? = $ac_status" >&5
+  echo "$as_me:9810: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:9805: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9812: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9808: \$? = $ac_status" >&5
+  echo "$as_me:9815: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_sizeof_long_long=`cat conftest.val`
 else
@@ -9821,14 +9828,14 @@
   ac_cv_sizeof_long_long=0
 fi
 fi
-echo "$as_me:9824: result: $ac_cv_sizeof_long_long" >&5
+echo "$as_me:9831: result: $ac_cv_sizeof_long_long" >&5
 echo "${ECHO_T}$ac_cv_sizeof_long_long" >&6
 cat >>confdefs.h <<EOF
 #define SIZEOF_LONG_LONG $ac_cv_sizeof_long_long
 EOF
 
 if test "x$cross_compiling" = "xyes"; then
-  { echo "$as_me:9831: WARNING:
+  { echo "$as_me:9838: WARNING:
   You are using a cross-compiler, please set the SIZEOF_* defines in config.h
   properly before compiling this package. Also check that the typedefs and
   defines in include/ggi/system.h are correct.
@@ -9853,7 +9860,7 @@
 elif test "$ac_cv_sizeof_short" = "1"; then
   GGI_8="short"
 else
-  { { echo "$as_me:9856: error: No 8-bit datatype on this system???" >&5
+  { { echo "$as_me:9863: error: No 8-bit datatype on this system???" >&5
 echo "$as_me: error: No 8-bit datatype on this system???" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9867,7 +9874,7 @@
 elif test "$ac_cv_sizeof_long" = "2"; then
   GGI_16="long"
 else
-  { { echo "$as_me:9870: error: No 16-bit datatype on this system???" >&5
+  { { echo "$as_me:9877: error: No 16-bit datatype on this system???" >&5
 echo "$as_me: error: No 16-bit datatype on this system???" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9883,7 +9890,7 @@
 elif test "$ac_cv_sizeof_long_LONG" = "4"; then
   GGI_32="long long"
 else
-  { { echo "$as_me:9886: error: No 32-bit datatype on this system???" >&5
+  { { echo "$as_me:9893: error: No 32-bit datatype on this system???" >&5
 echo "$as_me: error: No 32-bit datatype on this system???" >&2;}
    { (exit 1); exit 1; }; }
 fi
@@ -9891,10 +9898,10 @@
 ac_cc_can_int64="no"
 if test "$ac_cv_sizeof_int" = "8"; then
   GGI_64="int"
-  echo "$as_me:9894: checking whether CC thinks type $GGI_64 is a fully working 64-bit int" >&5
+  echo "$as_me:9901: checking whether CC thinks type $GGI_64 is a fully working 64-bit int" >&5
 echo $ECHO_N "checking whether CC thinks type $GGI_64 is a fully working 64-bit int... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
-#line 9897 "configure"
+#line 9904 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9926,24 +9933,24 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9929: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9936: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9932: \$? = $ac_status" >&5
+  echo "$as_me:9939: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9935: \"$ac_try\"") >&5
+  { (eval echo "$as_me:9942: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:9938: \$? = $ac_status" >&5
+  echo "$as_me:9945: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-   echo "$as_me:9940: result: yes" >&5
+   echo "$as_me:9947: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             ac_cc_can_int64="yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:9946: result: nope" >&5
+ echo "$as_me:9953: result: nope" >&5
 echo "${ECHO_T}nope" >&6
             ac_cc_can_int64="no"
 fi
@@ -9953,10 +9960,10 @@
 if test "x$ac_cc_can_int64" = "xno"; then
   if test "$ac_cv_sizeof_long" = "8"; then
     GGI_64="long"
-    echo "$as_me:9956: checking whether CC thinks type $GGI_64 is a fully working 64-bit int" >&5
+    echo "$as_me:9963: checking whether CC thinks type $GGI_64 is a fully working 64-bit int" >&5
 echo $ECHO_N "checking whether CC thinks type $GGI_64 is a fully working 64-bit int... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
-#line 9959 "configure"
+#line 9966 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -9988,24 +9995,24 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:9991: \"$ac_link\"") >&5
+if { (eval echo "$as_me:9998: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:9994: \$? = $ac_status" >&5
+  echo "$as_me:10001: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:9997: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10004: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10000: \$? = $ac_status" >&5
+  echo "$as_me:10007: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-   echo "$as_me:10002: result: yes" >&5
+   echo "$as_me:10009: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             ac_cc_can_int64="yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:10008: result: nope" >&5
+ echo "$as_me:10015: result: nope" >&5
 echo "${ECHO_T}nope" >&6
             ac_cc_can_int64="no"
 fi
@@ -10016,10 +10023,10 @@
 if test "x$ac_cc_can_int64" = "xno"; then
   if test "$ac_cv_sizeof_char" = "8"; then
     GGI_64="char"
-    echo "$as_me:10019: checking whether CC thinks type $GGI_64 is a fully working 64-bit int" >&5
+    echo "$as_me:10026: checking whether CC thinks type $GGI_64 is a fully working 64-bit int" >&5
 echo $ECHO_N "checking whether CC thinks type $GGI_64 is a fully working 64-bit int... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
-#line 10022 "configure"
+#line 10029 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10051,24 +10058,24 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10054: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10061: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10057: \$? = $ac_status" >&5
+  echo "$as_me:10064: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10060: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10067: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10063: \$? = $ac_status" >&5
+  echo "$as_me:10070: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-   echo "$as_me:10065: result: yes" >&5
+   echo "$as_me:10072: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             ac_cc_can_int64="yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:10071: result: nope" >&5
+ echo "$as_me:10078: result: nope" >&5
 echo "${ECHO_T}nope" >&6
             ac_cc_can_int64="no"
 fi
@@ -10079,10 +10086,10 @@
 if test "x$ac_cc_can_int64" = "xno"; then
   if test "$ac_cv_sizeof_short" = "8"; then
     GGI_64="short"
-    echo "$as_me:10082: checking whether CC thinks type $GGI_64 is a fully working 64-bit int" >&5
+    echo "$as_me:10089: checking whether CC thinks type $GGI_64 is a fully working 64-bit int" >&5
 echo $ECHO_N "checking whether CC thinks type $GGI_64 is a fully working 64-bit int... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
-#line 10085 "configure"
+#line 10092 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10114,24 +10121,24 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10117: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10124: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10120: \$? = $ac_status" >&5
+  echo "$as_me:10127: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10123: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10130: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10126: \$? = $ac_status" >&5
+  echo "$as_me:10133: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-   echo "$as_me:10128: result: yes" >&5
+   echo "$as_me:10135: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             ac_cc_can_int64="yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:10134: result: nope" >&5
+ echo "$as_me:10141: result: nope" >&5
 echo "${ECHO_T}nope" >&6
             ac_cc_can_int64="no"
 fi
@@ -10142,10 +10149,10 @@
 if test "x$ac_cc_can_int64" = "xno"; then
   if test "$ac_cv_sizeof_long_long" = "8"; then
     GGI_64="long long"
-    echo "$as_me:10145: checking whether CC thinks type $GGI_64 is a fully working 64-bit int" >&5
+    echo "$as_me:10152: checking whether CC thinks type $GGI_64 is a fully working 64-bit int" >&5
 echo $ECHO_N "checking whether CC thinks type $GGI_64 is a fully working 64-bit int... $ECHO_C" >&6
  cat >conftest.$ac_ext <<_ACEOF
-#line 10148 "configure"
+#line 10155 "configure"
 #include "confdefs.h"
 #include <stdio.h>
 int
@@ -10177,24 +10184,24 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10180: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10187: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10183: \$? = $ac_status" >&5
+  echo "$as_me:10190: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10186: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10193: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10189: \$? = $ac_status" >&5
+  echo "$as_me:10196: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-   echo "$as_me:10191: result: yes" >&5
+   echo "$as_me:10198: result: yes" >&5
 echo "${ECHO_T}yes" >&6
             ac_cc_can_int64="yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
- echo "$as_me:10197: result: nope" >&5
+ echo "$as_me:10204: result: nope" >&5
 echo "${ECHO_T}nope" >&6
             ac_cc_can_int64="no"
 fi
@@ -10205,11 +10212,11 @@
 
 if test "x$ac_cc_can_int64" = "xno"; then
   GGI_DEFINE_INT64="#undef"
-  echo "$as_me:10208: result: No working 64-bit integers.  64-bit code will be disabled." >&5
+  echo "$as_me:10215: result: No working 64-bit integers.  64-bit code will be disabled." >&5
 echo "${ECHO_T}No working 64-bit integers.  64-bit code will be disabled." >&6
 else
   GGI_DEFINE_INT64="#define"
-  echo "$as_me:10212: result: Using type $GGI_64 for 64-bit integers" >&5
+  echo "$as_me:10219: result: Using type $GGI_64 for 64-bit integers" >&5
 echo "${ECHO_T}Using type $GGI_64 for 64-bit integers" >&6
 fi
 
@@ -10237,10 +10244,10 @@
 ;;
 esac
 
-echo "$as_me:10240: checking for TIOCMSET in termios.h or sys/ioctl.h" >&5
+echo "$as_me:10247: checking for TIOCMSET in termios.h or sys/ioctl.h" >&5
 echo $ECHO_N "checking for TIOCMSET in termios.h or sys/ioctl.h... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
-#line 10243 "configure"
+#line 10250 "configure"
 #include "confdefs.h"
 #include <sys/ioctl.h>
 #include <termios.h>
@@ -10260,10 +10267,10 @@
 fi
 rm -f conftest*
 
-echo "$as_me:10263: result: $HAVE_TIOCMSET" >&5
+echo "$as_me:10270: result: $HAVE_TIOCMSET" >&5
 echo "${ECHO_T}$HAVE_TIOCMSET" >&6
 
-echo "$as_me:10266: checking for shared library extension" >&5
+echo "$as_me:10273: checking for shared library extension" >&5
 echo $ECHO_N "checking for shared library extension... $ECHO_C" >&6
 case "${host}" in
   *-*-mingw* | *-*-cygwin*)
@@ -10273,18 +10280,18 @@
 	DLLEXT="so"
         ;;
 esac
-echo "$as_me:10276: result: $DLLEXT" >&5
+echo "$as_me:10283: result: $DLLEXT" >&5
 echo "${ECHO_T}$DLLEXT" >&6
 
 if test $ac_cv_c_compiler_gnu = yes; then
-    echo "$as_me:10280: checking whether $CC needs -traditional" >&5
+    echo "$as_me:10287: checking whether $CC needs -traditional" >&5
 echo $ECHO_N "checking whether $CC needs -traditional... $ECHO_C" >&6
 if test "${ac_cv_prog_gcc_traditional+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
     ac_pattern="Autoconf.*'x'"
   cat >conftest.$ac_ext <<_ACEOF
-#line 10287 "configure"
+#line 10294 "configure"
 #include "confdefs.h"
 #include <sgtty.h>
 Autoconf TIOCGETP
@@ -10299,7 +10306,7 @@
 
   if test $ac_cv_prog_gcc_traditional = no; then
     cat >conftest.$ac_ext <<_ACEOF
-#line 10302 "configure"
+#line 10309 "configure"
 #include "confdefs.h"
 #include <termio.h>
 Autoconf TCGETA
@@ -10312,14 +10319,14 @@
 
   fi
 fi
-echo "$as_me:10315: result: $ac_cv_prog_gcc_traditional" >&5
+echo "$as_me:10322: result: $ac_cv_prog_gcc_traditional" >&5
 echo "${ECHO_T}$ac_cv_prog_gcc_traditional" >&6
   if test $ac_cv_prog_gcc_traditional = yes; then
     CC="$CC -traditional"
   fi
 fi
 
-echo "$as_me:10322: checking for working memcmp" >&5
+echo "$as_me:10329: checking for working memcmp" >&5
 echo $ECHO_N "checking for working memcmp... $ECHO_C" >&6
 if test "${ac_cv_func_memcmp_working+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -10328,7 +10335,7 @@
   ac_cv_func_memcmp_working=no
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10331 "configure"
+#line 10338 "configure"
 #include "confdefs.h"
 
 int
@@ -10364,15 +10371,15 @@
 }
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:10367: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10374: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10370: \$? = $ac_status" >&5
+  echo "$as_me:10377: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:10372: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10379: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10375: \$? = $ac_status" >&5
+  echo "$as_me:10382: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_memcmp_working=yes
 else
@@ -10384,17 +10391,17 @@
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 fi
-echo "$as_me:10387: result: $ac_cv_func_memcmp_working" >&5
+echo "$as_me:10394: result: $ac_cv_func_memcmp_working" >&5
 echo "${ECHO_T}$ac_cv_func_memcmp_working" >&6
 test $ac_cv_func_memcmp_working = no && LIBOBJS="$LIBOBJS memcmp.$ac_objext"
 
-echo "$as_me:10391: checking return type of signal handlers" >&5
+echo "$as_me:10398: checking return type of signal handlers" >&5
 echo $ECHO_N "checking return type of signal handlers... $ECHO_C" >&6
 if test "${ac_cv_type_signal+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10397 "configure"
+#line 10404 "configure"
 #include "confdefs.h"
 #include <sys/types.h>
 #include <signal.h>
@@ -10416,16 +10423,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:10419: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:10426: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:10422: \$? = $ac_status" >&5
+  echo "$as_me:10429: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:10425: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10432: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10428: \$? = $ac_status" >&5
+  echo "$as_me:10435: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_signal=void
 else
@@ -10435,7 +10442,7 @@
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:10438: result: $ac_cv_type_signal" >&5
+echo "$as_me:10445: result: $ac_cv_type_signal" >&5
 echo "${ECHO_T}$ac_cv_type_signal" >&6
 
 cat >>confdefs.h <<EOF
@@ -10445,13 +10452,13 @@
 for ac_func in vprintf
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10448: checking for $ac_func" >&5
+echo "$as_me:10455: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10454 "configure"
+#line 10461 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10482,16 +10489,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10485: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10492: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10488: \$? = $ac_status" >&5
+  echo "$as_me:10495: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10491: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10498: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10494: \$? = $ac_status" >&5
+  echo "$as_me:10501: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10501,20 +10508,20 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10504: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10511: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
 EOF
 
-echo "$as_me:10511: checking for _doprnt" >&5
+echo "$as_me:10518: checking for _doprnt" >&5
 echo $ECHO_N "checking for _doprnt... $ECHO_C" >&6
 if test "${ac_cv_func__doprnt+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10517 "configure"
+#line 10524 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char _doprnt (); below.  */
@@ -10545,16 +10552,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10548: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10555: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10551: \$? = $ac_status" >&5
+  echo "$as_me:10558: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10554: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10561: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10557: \$? = $ac_status" >&5
+  echo "$as_me:10564: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func__doprnt=yes
 else
@@ -10564,7 +10571,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10567: result: $ac_cv_func__doprnt" >&5
+echo "$as_me:10574: result: $ac_cv_func__doprnt" >&5
 echo "${ECHO_T}$ac_cv_func__doprnt" >&6
 if test $ac_cv_func__doprnt = yes; then
 
@@ -10585,13 +10592,13 @@
 	atexit on_exit connect gethostbyname
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10588: checking for $ac_func" >&5
+echo "$as_me:10595: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10594 "configure"
+#line 10601 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10622,16 +10629,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10625: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10632: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10628: \$? = $ac_status" >&5
+  echo "$as_me:10635: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10631: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10638: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10634: \$? = $ac_status" >&5
+  echo "$as_me:10641: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10641,7 +10648,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10644: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10651: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -10655,13 +10662,13 @@
 		Sleep GetSystemTime
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:10658: checking for $ac_func" >&5
+echo "$as_me:10665: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10664 "configure"
+#line 10671 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -10692,16 +10699,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10695: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10702: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10698: \$? = $ac_status" >&5
+  echo "$as_me:10705: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10701: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10708: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10704: \$? = $ac_status" >&5
+  echo "$as_me:10711: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -10711,7 +10718,7 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:10714: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:10721: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -10726,7 +10733,7 @@
 		Sleep GetSystemTime
 do
 
-echo "$as_me:10729: checking for $ac_func (winfunc)" >&5
+echo "$as_me:10736: checking for $ac_func (winfunc)" >&5
 echo $ECHO_N "checking for $ac_func (winfunc)... $ECHO_C" >&6
 if eval "test \"`echo 'x$ac_cv_func_'$ac_func`\" = xno"; then
   eval "unset ac_cv_func_$ac_func"
@@ -10735,7 +10742,7 @@
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 10738 "configure"
+#line 10745 "configure"
 #include "confdefs.h"
 
 #include <assert.h>
@@ -10756,23 +10763,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10759: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10766: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10762: \$? = $ac_status" >&5
+  echo "$as_me:10769: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10765: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10772: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10768: \$? = $ac_status" >&5
+  echo "$as_me:10775: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "ac_cv_func_$ac_func=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 10775 "configure"
+#line 10782 "configure"
 #include "confdefs.h"
 
 #include <assert.h>
@@ -10792,23 +10799,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10795: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10802: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10798: \$? = $ac_status" >&5
+  echo "$as_me:10805: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10801: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10808: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10804: \$? = $ac_status" >&5
+  echo "$as_me:10811: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "ac_cv_func_$ac_func=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 10811 "configure"
+#line 10818 "configure"
 #include "confdefs.h"
 
 #include <assert.h>
@@ -10829,23 +10836,23 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10832: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10839: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10835: \$? = $ac_status" >&5
+  echo "$as_me:10842: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10838: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10845: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10841: \$? = $ac_status" >&5
+  echo "$as_me:10848: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "ac_cv_func_$ac_func=yes"
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
 cat >conftest.$ac_ext <<_ACEOF
-#line 10848 "configure"
+#line 10855 "configure"
 #include "confdefs.h"
 
 #include <assert.h>
@@ -10866,16 +10873,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:10869: \"$ac_link\"") >&5
+if { (eval echo "$as_me:10876: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:10872: \$? = $ac_status" >&5
+  echo "$as_me:10879: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:10875: \"$ac_try\"") >&5
+  { (eval echo "$as_me:10882: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:10878: \$? = $ac_status" >&5
+  echo "$as_me:10885: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "ac_cv_func_$ac_func=yes"
 else
@@ -10893,7 +10900,7 @@
 fi
 
 if eval "test \"`echo '$ac_cv_func_'$ac_func`\" = yes"; then
-  echo "$as_me:10896: result: yes" >&5
+  echo "$as_me:10903: result: yes" >&5
 echo "${ECHO_T}yes" >&6
     ac_tr_func=HAVE_`echo $ac_func | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
   cat >>confdefs.h <<EOF
@@ -10901,7 +10908,7 @@
 EOF
 
 else
-  echo "$as_me:10904: result: no" >&5
+  echo "$as_me:10911: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 done
@@ -10967,7 +10974,7 @@
   if test "x$ac_cv_func_on_exit" = "xyes"; then
      GG_ATEXIT="#define atexit(f) on_exit((void (*)(int,void*))f,NULL)"
   else
-     { { echo "$as_me:10970: error: No atexit alternative on this system." >&5
+     { { echo "$as_me:10977: error: No atexit alternative on this system." >&5
 echo "$as_me: error: No atexit alternative on this system." >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -10976,12 +10983,12 @@
 fi
 
 if test "x$ac_cv_func_select" = "xno"; then
-  echo "$as_me:10979: checking for select in -lwsock32" >&5
+  echo "$as_me:10986: checking for select in -lwsock32" >&5
 echo $ECHO_N "checking for select in -lwsock32... $ECHO_C" >&6
   SAVELIBS="$LIBS"
   LIBS="$LIBS -lwsock32"
   cat >conftest.$ac_ext <<_ACEOF
-#line 10984 "configure"
+#line 10991 "configure"
 #include "confdefs.h"
 
 #include <winsock.h>
@@ -10997,26 +11004,26 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11000: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11007: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11003: \$? = $ac_status" >&5
+  echo "$as_me:11010: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11006: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11013: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11009: \$? = $ac_status" >&5
+  echo "$as_me:11016: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   SELECTLIBS="$SELECTLIBS -lwsock32"
     NETLIBS="$NETLIBS -lwsock32"
     ac_cv_func_select=yes
-    echo "$as_me:11014: result: yes" >&5
+    echo "$as_me:11021: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:11019: result: no" >&5
+echo "$as_me:11026: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
@@ -11025,7 +11032,7 @@
 
 if test "x$ac_cv_func_connect" = "xno"; then
 
-echo "$as_me:11028: checking for connect in -lc" >&5
+echo "$as_me:11035: checking for connect in -lc" >&5
 echo $ECHO_N "checking for connect in -lc... $ECHO_C" >&6
 if test "${ac_cv_lib_c_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11033,7 +11040,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11036 "configure"
+#line 11043 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11052,16 +11059,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11055: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11062: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11058: \$? = $ac_status" >&5
+  echo "$as_me:11065: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11061: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11068: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11064: \$? = $ac_status" >&5
+  echo "$as_me:11071: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_c_connect=yes
 else
@@ -11072,7 +11079,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11075: result: $ac_cv_lib_c_connect" >&5
+echo "$as_me:11082: result: $ac_cv_lib_c_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_c_connect" >&6
 if test $ac_cv_lib_c_connect = yes; then
   cat >>confdefs.h <<EOF
@@ -11082,7 +11089,7 @@
   LIBS="-lc $LIBS"
 
 else
-  echo "$as_me:11085: checking for connect in -lsocket" >&5
+  echo "$as_me:11092: checking for connect in -lsocket" >&5
 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11090,7 +11097,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11093 "configure"
+#line 11100 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11109,16 +11116,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11112: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11119: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11115: \$? = $ac_status" >&5
+  echo "$as_me:11122: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11118: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11125: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11121: \$? = $ac_status" >&5
+  echo "$as_me:11128: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -11129,7 +11136,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11132: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:11139: result: $ac_cv_lib_socket_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 if test $ac_cv_lib_socket_connect = yes; then
   NETLIBS="$NETLIBS -lsocket"
@@ -11141,7 +11148,7 @@
 
 if test "x$ac_cv_func_gethostbyname" = "xno"; then
 
-echo "$as_me:11144: checking for gethostbyname in -lc" >&5
+echo "$as_me:11151: checking for gethostbyname in -lc" >&5
 echo $ECHO_N "checking for gethostbyname in -lc... $ECHO_C" >&6
 if test "${ac_cv_lib_c_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11149,7 +11156,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11152 "configure"
+#line 11159 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11168,16 +11175,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11171: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11178: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11174: \$? = $ac_status" >&5
+  echo "$as_me:11181: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11177: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11184: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11180: \$? = $ac_status" >&5
+  echo "$as_me:11187: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_c_gethostbyname=yes
 else
@@ -11188,7 +11195,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11191: result: $ac_cv_lib_c_gethostbyname" >&5
+echo "$as_me:11198: result: $ac_cv_lib_c_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_c_gethostbyname" >&6
 if test $ac_cv_lib_c_gethostbyname = yes; then
   cat >>confdefs.h <<EOF
@@ -11198,7 +11205,7 @@
   LIBS="-lc $LIBS"
 
 else
-  echo "$as_me:11201: checking for gethostbyname in -lnsl" >&5
+  echo "$as_me:11208: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11206,7 +11213,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11209 "configure"
+#line 11216 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11225,16 +11232,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11228: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11235: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11231: \$? = $ac_status" >&5
+  echo "$as_me:11238: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11234: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11241: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11237: \$? = $ac_status" >&5
+  echo "$as_me:11244: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -11245,7 +11252,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11248: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:11255: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   NETLIBS="$NETLIBS -lnsl"
@@ -11256,7 +11263,7 @@
 fi
 
 if test "x$ac_cv_func_nanosleep" = "xno"; then
-  echo "$as_me:11259: checking for nanosleep in -lrt" >&5
+  echo "$as_me:11266: checking for nanosleep in -lrt" >&5
 echo $ECHO_N "checking for nanosleep in -lrt... $ECHO_C" >&6
 if test "${ac_cv_lib_rt_nanosleep+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11264,7 +11271,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lrt  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11267 "configure"
+#line 11274 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11283,16 +11290,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11286: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11293: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11289: \$? = $ac_status" >&5
+  echo "$as_me:11296: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11292: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11299: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11295: \$? = $ac_status" >&5
+  echo "$as_me:11302: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_rt_nanosleep=yes
 else
@@ -11303,7 +11310,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11306: result: $ac_cv_lib_rt_nanosleep" >&5
+echo "$as_me:11313: result: $ac_cv_lib_rt_nanosleep" >&5
 echo "${ECHO_T}$ac_cv_lib_rt_nanosleep" >&6
 if test $ac_cv_lib_rt_nanosleep = yes; then
   GGDLLIBS="$GGDLLIBS -lrt"
@@ -11312,7 +11319,7 @@
 EOF
 
 else
-  echo "$as_me:11315: checking for nanosleep in -lposix4" >&5
+  echo "$as_me:11322: checking for nanosleep in -lposix4" >&5
 echo $ECHO_N "checking for nanosleep in -lposix4... $ECHO_C" >&6
 if test "${ac_cv_lib_posix4_nanosleep+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11320,7 +11327,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix4  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11323 "configure"
+#line 11330 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11339,16 +11346,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11342: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11349: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11345: \$? = $ac_status" >&5
+  echo "$as_me:11352: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11348: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11355: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11351: \$? = $ac_status" >&5
+  echo "$as_me:11358: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix4_nanosleep=yes
 else
@@ -11359,7 +11366,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11362: result: $ac_cv_lib_posix4_nanosleep" >&5
+echo "$as_me:11369: result: $ac_cv_lib_posix4_nanosleep" >&5
 echo "${ECHO_T}$ac_cv_lib_posix4_nanosleep" >&6
 if test $ac_cv_lib_posix4_nanosleep = yes; then
   GGDLLIBS="$GGDLLIBS -lposix4"
@@ -11374,7 +11381,7 @@
 fi
 
 if test "x$ac_cv_func_sched_yield" = "xno"; then
-   echo "$as_me:11377: checking for sched_yield in -lposix4" >&5
+   echo "$as_me:11384: checking for sched_yield in -lposix4" >&5
 echo $ECHO_N "checking for sched_yield in -lposix4... $ECHO_C" >&6
 if test "${ac_cv_lib_posix4_sched_yield+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11382,7 +11389,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix4  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11385 "configure"
+#line 11392 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11401,16 +11408,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11404: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11411: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11407: \$? = $ac_status" >&5
+  echo "$as_me:11414: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11410: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11417: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11413: \$? = $ac_status" >&5
+  echo "$as_me:11420: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix4_sched_yield=yes
 else
@@ -11421,7 +11428,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11424: result: $ac_cv_lib_posix4_sched_yield" >&5
+echo "$as_me:11431: result: $ac_cv_lib_posix4_sched_yield" >&5
 echo "${ECHO_T}$ac_cv_lib_posix4_sched_yield" >&6
 if test $ac_cv_lib_posix4_sched_yield = yes; then
   GGDLLIBS="$GGDLLIBS -lposix4"
@@ -11434,7 +11441,7 @@
 fi
 
 if test "x$ac_cv_func_dlopen" = "xno"; then
-  echo "$as_me:11437: checking for dlopen in -ldl" >&5
+  echo "$as_me:11444: checking for dlopen in -ldl" >&5
 echo $ECHO_N "checking for dlopen in -ldl... $ECHO_C" >&6
 if test "${ac_cv_lib_dl_dlopen+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11442,7 +11449,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11445 "configure"
+#line 11452 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11461,16 +11468,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11464: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11471: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11467: \$? = $ac_status" >&5
+  echo "$as_me:11474: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11470: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11477: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11473: \$? = $ac_status" >&5
+  echo "$as_me:11480: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dl_dlopen=yes
 else
@@ -11481,7 +11488,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11484: result: $ac_cv_lib_dl_dlopen" >&5
+echo "$as_me:11491: result: $ac_cv_lib_dl_dlopen" >&5
 echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6
 if test $ac_cv_lib_dl_dlopen = yes; then
   GGDLLIBS="$GGDLLIBS -ldl"
@@ -11490,19 +11497,19 @@
 fi
 
 if test "$mutextype" != "builtin"; then
-  echo "$as_me:11493: checking for pthread_mutex_init in -lpthread" >&5
+  echo "$as_me:11500: checking for pthread_mutex_init in -lpthread" >&5
 echo $ECHO_N "checking for pthread_mutex_init in -lpthread... $ECHO_C" >&6
   if test "x$ac_cv_header_pthread_h" = "xyes"; then
     TMP_SAVE_LIBS="$LIBS"
     LIBS="$LIBS -lpthread"
     if test "$cross_compiling" = yes; then
-  echo "$as_me:11499: result: no" >&5
+  echo "$as_me:11506: result: no" >&5
 echo "${ECHO_T}no" >&6
       mutextype=builtin
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11505 "configure"
+#line 11512 "configure"
 #include "confdefs.h"
 
 #define __C_ASM_H /* fix for retarded Digital Unix headers */
@@ -11515,29 +11522,29 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11518: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11525: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11521: \$? = $ac_status" >&5
+  echo "$as_me:11528: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11523: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11530: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11526: \$? = $ac_status" >&5
+  echo "$as_me:11533: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:11528: result: yes" >&5
+  echo "$as_me:11535: result: yes" >&5
 echo "${ECHO_T}yes" >&6
       if test "$mutextype" != "dynpthread"; then
-        echo "$as_me:11531: checking if this system is known to have broken pthread mutexes" >&5
+        echo "$as_me:11538: checking if this system is known to have broken pthread mutexes" >&5
 echo $ECHO_N "checking if this system is known to have broken pthread mutexes... $ECHO_C" >&6
         if test `uname -s` = "Linux"; then
-          echo "$as_me:11534: result: yes" >&5
+          echo "$as_me:11541: result: yes" >&5
 echo "${ECHO_T}yes" >&6
           if test "$mutextype" != "pthread"; then
             mutextype=dynpthread
           fi
         else
-          echo "$as_me:11540: result: no" >&5
+          echo "$as_me:11547: result: no" >&5
 echo "${ECHO_T}no" >&6
         fi
       fi
@@ -11550,24 +11557,24 @@
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:11553: result: no" >&5
+echo "$as_me:11560: result: no" >&5
 echo "${ECHO_T}no" >&6
       if test "$host_os" = "openbsd3.0"; then
 	_pthread="-pthread"
       else
 	_pthread="-lc_r"
       fi
-      echo "$as_me:11560: checking for pthread_mutex_init in $_pthread" >&5
+      echo "$as_me:11567: checking for pthread_mutex_init in $_pthread" >&5
 echo $ECHO_N "checking for pthread_mutex_init in $_pthread... $ECHO_C" >&6
       LIBS="$TMP_SAVE_LIBS $_pthread"
       if test "$cross_compiling" = yes; then
-  echo "$as_me:11564: result: no" >&5
+  echo "$as_me:11571: result: no" >&5
 echo "${ECHO_T}no" >&6
         mutextype=builtin
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11570 "configure"
+#line 11577 "configure"
 #include "confdefs.h"
 
 #include <pthread.h>
@@ -11579,17 +11586,17 @@
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:11582: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11589: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11585: \$? = $ac_status" >&5
+  echo "$as_me:11592: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:11587: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11594: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11590: \$? = $ac_status" >&5
+  echo "$as_me:11597: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:11592: result: yes" >&5
+  echo "$as_me:11599: result: yes" >&5
 echo "${ECHO_T}yes" >&6
         if test "$mutextype" != "dynpthread"; then
           mutextype=pthread
@@ -11604,7 +11611,7 @@
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:11607: result: no" >&5
+echo "$as_me:11614: result: no" >&5
 echo "${ECHO_T}no" >&6
         mutextype=builtin
 
@@ -11617,13 +11624,13 @@
 fi
     LIBS="$TMP_SAVE_LIBS"
   else
-    echo "$as_me:11620: result: no" >&5
+    echo "$as_me:11627: result: no" >&5
 echo "${ECHO_T}no" >&6
     mutextype=builtin
   fi
 fi
 
-echo "$as_me:11626: checking what kind of mutexes to use" >&5
+echo "$as_me:11633: checking what kind of mutexes to use" >&5
 echo $ECHO_N "checking what kind of mutexes to use... $ECHO_C" >&6
 
 if test "$mutextype" = "pthread"; then
@@ -11650,7 +11657,7 @@
   BUILTINLOCK_FALSE=
 fi
 
-echo "$as_me:11653: result: $mutextype" >&5
+echo "$as_me:11660: result: $mutextype" >&5
 echo "${ECHO_T}$mutextype" >&6
 
 if test "$no_x" = yes; then
@@ -11673,11 +11680,11 @@
     # others require no space.  Words are not sufficient . . . .
     case `(uname -sr) 2>/dev/null` in
     "SunOS 5"*)
-      echo "$as_me:11676: checking whether -R must be followed by a space" >&5
+      echo "$as_me:11683: checking whether -R must be followed by a space" >&5
 echo $ECHO_N "checking whether -R must be followed by a space... $ECHO_C" >&6
       ac_xsave_LIBS=$LIBS; LIBS="$LIBS -R$x_libraries"
       cat >conftest.$ac_ext <<_ACEOF
-#line 11680 "configure"
+#line 11687 "configure"
 #include "confdefs.h"
 
 int
@@ -11689,16 +11696,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11692: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11699: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11695: \$? = $ac_status" >&5
+  echo "$as_me:11702: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11698: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11705: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11701: \$? = $ac_status" >&5
+  echo "$as_me:11708: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_nospace=yes
 else
@@ -11708,13 +11715,13 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
       if test $ac_R_nospace = yes; then
-	echo "$as_me:11711: result: no" >&5
+	echo "$as_me:11718: result: no" >&5
 echo "${ECHO_T}no" >&6
 	X_LIBS="$X_LIBS -R$x_libraries"
       else
 	LIBS="$ac_xsave_LIBS -R $x_libraries"
 	cat >conftest.$ac_ext <<_ACEOF
-#line 11717 "configure"
+#line 11724 "configure"
 #include "confdefs.h"
 
 int
@@ -11726,16 +11733,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11729: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11736: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11732: \$? = $ac_status" >&5
+  echo "$as_me:11739: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11735: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11742: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11738: \$? = $ac_status" >&5
+  echo "$as_me:11745: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_R_space=yes
 else
@@ -11745,11 +11752,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 	if test $ac_R_space = yes; then
-	  echo "$as_me:11748: result: yes" >&5
+	  echo "$as_me:11755: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 	  X_LIBS="$X_LIBS -R $x_libraries"
 	else
-	  echo "$as_me:11752: result: neither works" >&5
+	  echo "$as_me:11759: result: neither works" >&5
 echo "${ECHO_T}neither works" >&6
 	fi
       fi
@@ -11769,7 +11776,7 @@
     # the Alpha needs dnet_stub (dnet does not exist).
     ac_xsave_LIBS="$LIBS"; LIBS="$LIBS $X_LIBS -lX11"
     cat >conftest.$ac_ext <<_ACEOF
-#line 11772 "configure"
+#line 11779 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11788,22 +11795,22 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11791: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11798: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11794: \$? = $ac_status" >&5
+  echo "$as_me:11801: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11797: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11804: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11800: \$? = $ac_status" >&5
+  echo "$as_me:11807: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   :
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:11806: checking for dnet_ntoa in -ldnet" >&5
+echo "$as_me:11813: checking for dnet_ntoa in -ldnet" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11811,7 +11818,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11814 "configure"
+#line 11821 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11830,16 +11837,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11833: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11840: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11836: \$? = $ac_status" >&5
+  echo "$as_me:11843: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11839: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11846: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11842: \$? = $ac_status" >&5
+  echo "$as_me:11849: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_dnet_ntoa=yes
 else
@@ -11850,14 +11857,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11853: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
+echo "$as_me:11860: result: $ac_cv_lib_dnet_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"
 fi
 
     if test $ac_cv_lib_dnet_dnet_ntoa = no; then
-      echo "$as_me:11860: checking for dnet_ntoa in -ldnet_stub" >&5
+      echo "$as_me:11867: checking for dnet_ntoa in -ldnet_stub" >&5
 echo $ECHO_N "checking for dnet_ntoa in -ldnet_stub... $ECHO_C" >&6
 if test "${ac_cv_lib_dnet_stub_dnet_ntoa+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11865,7 +11872,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ldnet_stub  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11868 "configure"
+#line 11875 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -11884,16 +11891,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11887: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11894: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11890: \$? = $ac_status" >&5
+  echo "$as_me:11897: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11893: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11900: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11896: \$? = $ac_status" >&5
+  echo "$as_me:11903: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_dnet_stub_dnet_ntoa=yes
 else
@@ -11904,7 +11911,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:11907: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
+echo "$as_me:11914: result: $ac_cv_lib_dnet_stub_dnet_ntoa" >&5
 echo "${ECHO_T}$ac_cv_lib_dnet_stub_dnet_ntoa" >&6
 if test $ac_cv_lib_dnet_stub_dnet_ntoa = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"
@@ -11923,13 +11930,13 @@
     # on Irix 5.2, according to T.E. Dickey.
     # The functions gethostbyname, getservbyname, and inet_addr are
     # in -lbsd on LynxOS 3.0.1/i386, according to Lars Hecking.
-    echo "$as_me:11926: checking for gethostbyname" >&5
+    echo "$as_me:11933: checking for gethostbyname" >&5
 echo $ECHO_N "checking for gethostbyname... $ECHO_C" >&6
 if test "${ac_cv_func_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 11932 "configure"
+#line 11939 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char gethostbyname (); below.  */
@@ -11960,16 +11967,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:11963: \"$ac_link\"") >&5
+if { (eval echo "$as_me:11970: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:11966: \$? = $ac_status" >&5
+  echo "$as_me:11973: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:11969: \"$ac_try\"") >&5
+  { (eval echo "$as_me:11976: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:11972: \$? = $ac_status" >&5
+  echo "$as_me:11979: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_gethostbyname=yes
 else
@@ -11979,11 +11986,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:11982: result: $ac_cv_func_gethostbyname" >&5
+echo "$as_me:11989: result: $ac_cv_func_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_func_gethostbyname" >&6
 
     if test $ac_cv_func_gethostbyname = no; then
-      echo "$as_me:11986: checking for gethostbyname in -lnsl" >&5
+      echo "$as_me:11993: checking for gethostbyname in -lnsl" >&5
 echo $ECHO_N "checking for gethostbyname in -lnsl... $ECHO_C" >&6
 if test "${ac_cv_lib_nsl_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -11991,7 +11998,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lnsl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 11994 "configure"
+#line 12001 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12010,16 +12017,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12013: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12020: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12016: \$? = $ac_status" >&5
+  echo "$as_me:12023: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12019: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12026: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12022: \$? = $ac_status" >&5
+  echo "$as_me:12029: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_nsl_gethostbyname=yes
 else
@@ -12030,14 +12037,14 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12033: result: $ac_cv_lib_nsl_gethostbyname" >&5
+echo "$as_me:12040: result: $ac_cv_lib_nsl_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_nsl_gethostbyname" >&6
 if test $ac_cv_lib_nsl_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"
 fi
 
       if test $ac_cv_lib_nsl_gethostbyname = no; then
-        echo "$as_me:12040: checking for gethostbyname in -lbsd" >&5
+        echo "$as_me:12047: checking for gethostbyname in -lbsd" >&5
 echo $ECHO_N "checking for gethostbyname in -lbsd... $ECHO_C" >&6
 if test "${ac_cv_lib_bsd_gethostbyname+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12045,7 +12052,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lbsd  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12048 "configure"
+#line 12055 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12064,16 +12071,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12067: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12074: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12070: \$? = $ac_status" >&5
+  echo "$as_me:12077: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12073: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12080: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12076: \$? = $ac_status" >&5
+  echo "$as_me:12083: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_bsd_gethostbyname=yes
 else
@@ -12084,7 +12091,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12087: result: $ac_cv_lib_bsd_gethostbyname" >&5
+echo "$as_me:12094: result: $ac_cv_lib_bsd_gethostbyname" >&5
 echo "${ECHO_T}$ac_cv_lib_bsd_gethostbyname" >&6
 if test $ac_cv_lib_bsd_gethostbyname = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"
@@ -12100,13 +12107,13 @@
     # variants that don't use the nameserver (or something).  -lsocket
     # must be given before -lnsl if both are needed.  We assume that
     # if connect needs -lnsl, so does gethostbyname.
-    echo "$as_me:12103: checking for connect" >&5
+    echo "$as_me:12110: checking for connect" >&5
 echo $ECHO_N "checking for connect... $ECHO_C" >&6
 if test "${ac_cv_func_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12109 "configure"
+#line 12116 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char connect (); below.  */
@@ -12137,16 +12144,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12140: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12147: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12143: \$? = $ac_status" >&5
+  echo "$as_me:12150: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12146: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12153: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12149: \$? = $ac_status" >&5
+  echo "$as_me:12156: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_connect=yes
 else
@@ -12156,11 +12163,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12159: result: $ac_cv_func_connect" >&5
+echo "$as_me:12166: result: $ac_cv_func_connect" >&5
 echo "${ECHO_T}$ac_cv_func_connect" >&6
 
     if test $ac_cv_func_connect = no; then
-      echo "$as_me:12163: checking for connect in -lsocket" >&5
+      echo "$as_me:12170: checking for connect in -lsocket" >&5
 echo $ECHO_N "checking for connect in -lsocket... $ECHO_C" >&6
 if test "${ac_cv_lib_socket_connect+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12168,7 +12175,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12171 "configure"
+#line 12178 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12187,16 +12194,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12190: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12197: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12193: \$? = $ac_status" >&5
+  echo "$as_me:12200: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12196: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12203: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12199: \$? = $ac_status" >&5
+  echo "$as_me:12206: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_socket_connect=yes
 else
@@ -12207,7 +12214,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12210: result: $ac_cv_lib_socket_connect" >&5
+echo "$as_me:12217: result: $ac_cv_lib_socket_connect" >&5
 echo "${ECHO_T}$ac_cv_lib_socket_connect" >&6
 if test $ac_cv_lib_socket_connect = yes; then
   X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"
@@ -12216,13 +12223,13 @@
     fi
 
     # Guillermo Gomez says -lposix is necessary on A/UX.
-    echo "$as_me:12219: checking for remove" >&5
+    echo "$as_me:12226: checking for remove" >&5
 echo $ECHO_N "checking for remove... $ECHO_C" >&6
 if test "${ac_cv_func_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12225 "configure"
+#line 12232 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char remove (); below.  */
@@ -12253,16 +12260,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12256: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12263: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12259: \$? = $ac_status" >&5
+  echo "$as_me:12266: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12262: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12269: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12265: \$? = $ac_status" >&5
+  echo "$as_me:12272: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_remove=yes
 else
@@ -12272,11 +12279,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12275: result: $ac_cv_func_remove" >&5
+echo "$as_me:12282: result: $ac_cv_func_remove" >&5
 echo "${ECHO_T}$ac_cv_func_remove" >&6
 
     if test $ac_cv_func_remove = no; then
-      echo "$as_me:12279: checking for remove in -lposix" >&5
+      echo "$as_me:12286: checking for remove in -lposix" >&5
 echo $ECHO_N "checking for remove in -lposix... $ECHO_C" >&6
 if test "${ac_cv_lib_posix_remove+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12284,7 +12291,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lposix  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12287 "configure"
+#line 12294 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12303,16 +12310,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12306: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12313: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12309: \$? = $ac_status" >&5
+  echo "$as_me:12316: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12312: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12319: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12315: \$? = $ac_status" >&5
+  echo "$as_me:12322: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_posix_remove=yes
 else
@@ -12323,7 +12330,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12326: result: $ac_cv_lib_posix_remove" >&5
+echo "$as_me:12333: result: $ac_cv_lib_posix_remove" >&5
 echo "${ECHO_T}$ac_cv_lib_posix_remove" >&6
 if test $ac_cv_lib_posix_remove = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"
@@ -12332,13 +12339,13 @@
     fi
 
     # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
-    echo "$as_me:12335: checking for shmat" >&5
+    echo "$as_me:12342: checking for shmat" >&5
 echo $ECHO_N "checking for shmat... $ECHO_C" >&6
 if test "${ac_cv_func_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 12341 "configure"
+#line 12348 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char shmat (); below.  */
@@ -12369,16 +12376,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12372: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12379: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12375: \$? = $ac_status" >&5
+  echo "$as_me:12382: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12378: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12385: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12381: \$? = $ac_status" >&5
+  echo "$as_me:12388: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_func_shmat=yes
 else
@@ -12388,11 +12395,11 @@
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:12391: result: $ac_cv_func_shmat" >&5
+echo "$as_me:12398: result: $ac_cv_func_shmat" >&5
 echo "${ECHO_T}$ac_cv_func_shmat" >&6
 
     if test $ac_cv_func_shmat = no; then
-      echo "$as_me:12395: checking for shmat in -lipc" >&5
+      echo "$as_me:12402: checking for shmat in -lipc" >&5
 echo $ECHO_N "checking for shmat in -lipc... $ECHO_C" >&6
 if test "${ac_cv_lib_ipc_shmat+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12400,7 +12407,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lipc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12403 "configure"
+#line 12410 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12419,16 +12426,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12422: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12429: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12425: \$? = $ac_status" >&5
+  echo "$as_me:12432: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12428: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12435: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12431: \$? = $ac_status" >&5
+  echo "$as_me:12438: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ipc_shmat=yes
 else
@@ -12439,7 +12446,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12442: result: $ac_cv_lib_ipc_shmat" >&5
+echo "$as_me:12449: result: $ac_cv_lib_ipc_shmat" >&5
 echo "${ECHO_T}$ac_cv_lib_ipc_shmat" >&6
 if test $ac_cv_lib_ipc_shmat = yes; then
   X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"
@@ -12457,7 +12464,7 @@
   # These have to be linked with before -lX11, unlike the other
   # libraries we check for below, so use a different variable.
   # John Interrante, Karl Berry
-  echo "$as_me:12460: checking for IceConnectionNumber in -lICE" >&5
+  echo "$as_me:12467: checking for IceConnectionNumber in -lICE" >&5
 echo $ECHO_N "checking for IceConnectionNumber in -lICE... $ECHO_C" >&6
 if test "${ac_cv_lib_ICE_IceConnectionNumber+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12465,7 +12472,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lICE $X_EXTRA_LIBS $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12468 "configure"
+#line 12475 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12484,16 +12491,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12487: \"$ac_link\"") >&5
+if { (eval echo "$as_me:12494: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12490: \$? = $ac_status" >&5
+  echo "$as_me:12497: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12493: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12500: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12496: \$? = $ac_status" >&5
+  echo "$as_me:12503: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_ICE_IceConnectionNumber=yes
 else
@@ -12504,7 +12511,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12507: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
+echo "$as_me:12514: result: $ac_cv_lib_ICE_IceConnectionNumber" >&5
 echo "${ECHO_T}$ac_cv_lib_ICE_IceConnectionNumber" >&6
 if test $ac_cv_lib_ICE_IceConnectionNumber = yes; then
   X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"
@@ -12526,162 +12533,241 @@
 	build_zaurus_ts_input="no"
 fi
 
-echo "$as_me:12529: checking if we should build the mhub program" >&5
+if test "x$ac_cv_header_ApplicationServices_ApplicationServices_h" != "xno"; then
+  echo "$as_me:12537: checking for ApplicationServices/ApplicationServices.h" >&5
+echo $ECHO_N "checking for ApplicationServices/ApplicationServices.h... $ECHO_C" >&6
+if test "${ac_cv_header_ApplicationServices_ApplicationServices_h+set}" = set; then
+  echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 12543 "configure"
+#include "confdefs.h"
+#include <ApplicationServices/ApplicationServices.h>
+_ACEOF
+if { (eval echo "$as_me:12547: \"$ac_cpp conftest.$ac_ext\"") >&5
+  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
+  ac_status=$?
+  egrep -v '^ *\+' conftest.er1 >conftest.err
+  rm -f conftest.er1
+  cat conftest.err >&5
+  echo "$as_me:12553: \$? = $ac_status" >&5
+  (exit $ac_status); } >/dev/null; then
+  if test -s conftest.err; then
+    ac_cpp_err=$ac_c_preproc_warn_flag
+  else
+    ac_cpp_err=
+  fi
+else
+  ac_cpp_err=yes
+fi
+if test -z "$ac_cpp_err"; then
+  ac_cv_header_ApplicationServices_ApplicationServices_h=yes
+else
+  echo "$as_me: failed program was:" >&5
+  cat conftest.$ac_ext >&5
+  ac_cv_header_ApplicationServices_ApplicationServices_h=no
+fi
+rm -f conftest.err conftest.$ac_ext
+fi
+echo "$as_me:12572: result: $ac_cv_header_ApplicationServices_ApplicationServices_h" >&5
+echo "${ECHO_T}$ac_cv_header_ApplicationServices_ApplicationServices_h" >&6
+if test $ac_cv_header_ApplicationServices_ApplicationServices_h = yes; then
+  cat >conftest.$ac_ext <<_ACEOF
+#line 12576 "configure"
+#include "confdefs.h"
+
+#include <ApplicationServices/ApplicationServices.h>
+
+int
+main ()
+{
+
+CGDirectDisplayID id;
+
+  ;
+  return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext
+if { (eval echo "$as_me:12592: \"$ac_compile\"") >&5
+  (eval $ac_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:12595: \$? = $ac_status" >&5
+  (exit $ac_status); } &&
+         { ac_try='test -s conftest.$ac_objext'
+  { (eval echo "$as_me:12598: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:12601: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  foo=bar
+else
+  echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+fi
+rm -f conftest.$ac_objext conftest.$ac_ext
+else
+  build_cocoa_input="no"
+fi
+
+fi
+
+echo "$as_me:12615: checking if we should build the mhub program" >&5
 echo $ECHO_N "checking if we should build the mhub program... $ECHO_C" >&6
 if test "x$ac_cv_header_unistd_h" = "xyes" \
 	-a "x$ac_cv_func_fcntl" = "xyes" \
 	-a "x$ac_cv_func_signal" = "xyes"; then
   DEMOS="$DEMOS mhub"
-  echo "$as_me:12535: result: yes" >&5
+  echo "$as_me:12621: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12538: result: no" >&5
+  echo "$as_me:12624: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12542: checking if we should build the xsendbut program" >&5
+echo "$as_me:12628: checking if we should build the xsendbut program" >&5
 echo $ECHO_N "checking if we should build the xsendbut program... $ECHO_C" >&6
 if test "x$no_x" != "xyes"; then
   DEMOS="$DEMOS xsendbut"
-  echo "$as_me:12546: result: yes" >&5
+  echo "$as_me:12632: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12549: result: no" >&5
+  echo "$as_me:12635: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12553: checking if we should build null inputlib" >&5
+echo "$as_me:12639: checking if we should build null inputlib" >&5
 echo $ECHO_N "checking if we should build null inputlib... $ECHO_C" >&6
 if test "x$build_null_input" != "xno"; then
   INPUTSUBDIRS="$INPUTSUBDIRS null"
-  echo "$as_me:12557: result: yes" >&5
+  echo "$as_me:12643: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12560: result: no" >&5
+  echo "$as_me:12646: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12564: checking if we should build file inputlib" >&5
+echo "$as_me:12650: checking if we should build file inputlib" >&5
 echo $ECHO_N "checking if we should build file inputlib... $ECHO_C" >&6
 if test "x$build_file_input" != "xno"; then
   INPUTSUBDIRS="$INPUTSUBDIRS file"
-  echo "$as_me:12568: result: yes" >&5
+  echo "$as_me:12654: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12571: result: no" >&5
+  echo "$as_me:12657: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12575: checking if we should build ipaq_touchscreen inputlib" >&5
+echo "$as_me:12661: checking if we should build ipaq_touchscreen inputlib" >&5
 echo $ECHO_N "checking if we should build ipaq_touchscreen inputlib... $ECHO_C" >&6
 if test "x$build_ipaq_ts_input" != "xno"; then
   INPUTSUBDIRS="$INPUTSUBDIRS ipaq_touchscreen"
-  echo "$as_me:12579: result: yes" >&5
+  echo "$as_me:12665: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12582: result: no" >&5
+  echo "$as_me:12668: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12586: checking if we should build zaurus_touchscreen inputlib" >&5
+echo "$as_me:12672: checking if we should build zaurus_touchscreen inputlib" >&5
 echo $ECHO_N "checking if we should build zaurus_touchscreen inputlib... $ECHO_C" >&6
 if test "x$build_zaurus_ts_input" != "xno"; then
   INPUTSUBDIRS="$INPUTSUBDIRS touchscreen"
-  echo "$as_me:12590: result: yes" >&5
+  echo "$as_me:12676: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12593: result: no" >&5
+  echo "$as_me:12679: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12597: checking if we should build tcp inputlib" >&5
+echo "$as_me:12683: checking if we should build tcp inputlib" >&5
 echo $ECHO_N "checking if we should build tcp inputlib... $ECHO_C" >&6
 if test "x$build_tcp_input" != "xno"; then
   INPUTSUBDIRS="$INPUTSUBDIRS tcp"
-  echo "$as_me:12601: result: yes" >&5
+  echo "$as_me:12687: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12604: result: no" >&5
+  echo "$as_me:12690: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12608: checking if we should build stdio inputlib" >&5
+echo "$as_me:12694: checking if we should build stdio inputlib" >&5
 echo $ECHO_N "checking if we should build stdio inputlib... $ECHO_C" >&6
 if test "x$build_stdio_input" != "xno" -a \
 	"x$ac_cv_header_unistd_h" = "xyes"; then
   INPUTSUBDIRS="$INPUTSUBDIRS stdin"
-  echo "$as_me:12613: result: yes" >&5
+  echo "$as_me:12699: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12616: result: no" >&5
+  echo "$as_me:12702: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12620: checking if we should build x inputlib" >&5
+echo "$as_me:12706: checking if we should build x inputlib" >&5
 echo $ECHO_N "checking if we should build x inputlib... $ECHO_C" >&6
 if test "x$build_x_input" != "xno" -a "x$no_x" != "xyes"; then
   INPUTSUBDIRS="$INPUTSUBDIRS x"
-  echo "$as_me:12624: result: yes" >&5
+  echo "$as_me:12710: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12627: result: no" >&5
+  echo "$as_me:12713: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12631: checking if we should build xwin inputlib" >&5
+echo "$as_me:12717: checking if we should build xwin inputlib" >&5
 echo $ECHO_N "checking if we should build xwin inputlib... $ECHO_C" >&6
 if test "x$build_xwin_input" != "xno" -a "x$no_x" != "xyes"; then
   INPUTSUBDIRS="$INPUTSUBDIRS xwin"
-  echo "$as_me:12635: result: yes" >&5
+  echo "$as_me:12721: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12638: result: no" >&5
+  echo "$as_me:12724: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12642: checking if we should build mouse inputlib" >&5
+echo "$as_me:12728: checking if we should build mouse inputlib" >&5
 echo $ECHO_N "checking if we should build mouse inputlib... $ECHO_C" >&6
 if test "x$build_mouse_input" != "xno" -a \
 	"x$ac_cv_header_unistd_h" = "xyes"; then
   INPUTSUBDIRS="$INPUTSUBDIRS mouse"
-  echo "$as_me:12647: result: yes" >&5
+  echo "$as_me:12733: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12650: result: no" >&5
+  echo "$as_me:12736: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12654: checking if we should build linux-mouse inputlib" >&5
+echo "$as_me:12740: checking if we should build linux-mouse inputlib" >&5
 echo $ECHO_N "checking if we should build linux-mouse inputlib... $ECHO_C" >&6
 if test "x$build_linux_mouse_input" != "xno" -a \
 	"x$ac_cv_header_sys_ioctl_h" = "xyes" -a \
 	"x$ac_cv_header_termios_h" = "xyes"; then
   INPUTSUBDIRS="$INPUTSUBDIRS linux_mouse"
-  echo "$as_me:12660: result: yes" >&5
+  echo "$as_me:12746: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12663: result: no" >&5
+  echo "$as_me:12749: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12667: checking if we should build linux-kbd inputlib" >&5
+echo "$as_me:12753: checking if we should build linux-kbd inputlib" >&5
 echo $ECHO_N "checking if we should build linux-kbd inputlib... $ECHO_C" >&6
 if test "x$build_linux_kbd_input" != "xno" -a \
 	"x$ac_cv_header_linux_keyboard_h" = "xyes"; then
   INPUTSUBDIRS="$INPUTSUBDIRS linux_kbd"
-  echo "$as_me:12672: result: yes" >&5
+  echo "$as_me:12758: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12675: result: no" >&5
+  echo "$as_me:12761: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12679: checking if we should build linux-joy inputlib" >&5
+echo "$as_me:12765: checking if we should build linux-joy inputlib" >&5
 echo $ECHO_N "checking if we should build linux-joy inputlib... $ECHO_C" >&6
 if test "x$build_linux_joy_input" != "xno" -a \
 	"x$ac_cv_header_linux_joystick_h" = "xyes"; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 12684 "configure"
+#line 12770 "configure"
 #include "confdefs.h"
 #include <linux/joystick.h>
 #ifdef JSIOCGVERSION
@@ -12692,99 +12778,99 @@
 if (eval "$ac_cpp conftest.$ac_ext") 2>&5 |
   egrep "wonkdummy" >/dev/null 2>&1; then
   INPUTSUBDIRS="$INPUTSUBDIRS linux_joy"
-    echo "$as_me:12695: result: yes" >&5
+    echo "$as_me:12781: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12698: result: no" >&5
+  echo "$as_me:12784: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f conftest*
 
 else
-  echo "$as_me:12704: result: no" >&5
+  echo "$as_me:12790: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12708: checking if we should build linux-evdev inputlib" >&5
+echo "$as_me:12794: checking if we should build linux-evdev inputlib" >&5
 echo $ECHO_N "checking if we should build linux-evdev inputlib... $ECHO_C" >&6
 if test "x$build_linux_evdev_input" != "xno" -a \
 	"x$ac_cv_header_linux_input_h" = "xyes"; then
   INPUTSUBDIRS="$INPUTSUBDIRS linux_evdev"
-  echo "$as_me:12713: result: yes" >&5
+  echo "$as_me:12799: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12716: result: no" >&5
+  echo "$as_me:12802: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12720: checking if we should build spaceorb inputlib" >&5
+echo "$as_me:12806: checking if we should build spaceorb inputlib" >&5
 echo $ECHO_N "checking if we should build spaceorb inputlib... $ECHO_C" >&6
 if test "x$build_spaceorb_input" != "xno" -a \
 	"x$ac_cv_header_sys_ioctl_h" = "xyes" -a \
 	"x$ac_cv_header_termios_h" = "xyes"; then
   INPUTSUBDIRS="$INPUTSUBDIRS spaceorb"
-  echo "$as_me:12726: result: yes" >&5
+  echo "$as_me:12812: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12729: result: no" >&5
+  echo "$as_me:12815: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12733: checking if we should build vgl inputlib" >&5
+echo "$as_me:12819: checking if we should build vgl inputlib" >&5
 echo $ECHO_N "checking if we should build vgl inputlib... $ECHO_C" >&6
 if test "x$build_vgl_input" != "xno" -a \
 	"x$ac_cv_header_vgl_h" = "xyes"; then
   INPUTSUBDIRS="$INPUTSUBDIRS vgl"
-  echo "$as_me:12738: result: yes" >&5
+  echo "$as_me:12824: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12741: result: no" >&5
+  echo "$as_me:12827: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12745: checking if we should build directx inputlib" >&5
+echo "$as_me:12831: checking if we should build directx inputlib" >&5
 echo $ECHO_N "checking if we should build directx inputlib... $ECHO_C" >&6
 if test "x$build_directx_input" != "xno" -a \
 	"x$ac_cv_header_dinput_h" = "xyes"; then
   INPUTSUBDIRS="$INPUTSUBDIRS directx"
-  echo "$as_me:12750: result: yes" >&5
+  echo "$as_me:12836: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12753: result: no" >&5
+  echo "$as_me:12839: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12757: checking if we should build pcjoy inputlib" >&5
+echo "$as_me:12843: checking if we should build pcjoy inputlib" >&5
 echo $ECHO_N "checking if we should build pcjoy inputlib... $ECHO_C" >&6
 if test "x$build_pcjoy_input" = "xyes" -a \
 	"x$ac_cv_header_unistd_h" = "xyes" -a \
 	"x$ac_cv_header_asm_io_h" = "xyes"; then
   INPUTSUBDIRS="$INPUTSUBDIRS pcjoy"
-  echo "$as_me:12763: result: yes" >&5
+  echo "$as_me:12849: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12766: result: no" >&5
+  echo "$as_me:12852: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12770: checking if we should build lk201 inputlib" >&5
+echo "$as_me:12856: checking if we should build lk201 inputlib" >&5
 echo $ECHO_N "checking if we should build lk201 inputlib... $ECHO_C" >&6
 if test "x$build_lk201_input" = "xyes" -a \
 	"x$ac_cv_header_unistd_h" = "xyes" -a \
 	"x$ac_cv_header_termios_h" = "xyes"; then
   INPUTSUBDIRS="$INPUTSUBDIRS lk201"
-  echo "$as_me:12776: result: yes" >&5
+  echo "$as_me:12862: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12779: result: no" >&5
+  echo "$as_me:12865: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12783: checking if we should build kii inputlib" >&5
+echo "$as_me:12869: checking if we should build kii inputlib" >&5
 echo $ECHO_N "checking if we should build kii inputlib... $ECHO_C" >&6
 if test "x$build_kii_input" != "xno" ; then
   cat >conftest.$ac_ext <<_ACEOF
-#line 12787 "configure"
+#line 12873 "configure"
 #include "confdefs.h"
 
 #include "kgi/config.h"
@@ -12802,16 +12888,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:12805: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:12891: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:12808: \$? = $ac_status" >&5
+  echo "$as_me:12894: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:12811: \"$ac_try\"") >&5
+  { (eval echo "$as_me:12897: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12814: \$? = $ac_status" >&5
+  echo "$as_me:12900: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   build_kii_input=yes
 else
@@ -12824,39 +12910,52 @@
 fi
 if test "x$build_kii_input" != "xno" ; then
   INPUTSUBDIRS="$INPUTSUBDIRS kii"
-  echo "$as_me:12827: result: yes" >&5
+  echo "$as_me:12913: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12830: result: no" >&5
+  echo "$as_me:12916: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
-echo "$as_me:12834: checking if we should build mouse emulation filterlib" >&5
+echo "$as_me:12920: checking if we should build cocoa inputlib" >&5
+echo $ECHO_N "checking if we should build cocoa inputlib... $ECHO_C" >&6
+if test "x$build_cocoa_input" != "xno" -a \
+	"x$ac_cv_header_ApplicationServices_ApplicationServices_h" = "xyes"
+then
+  INPUTSUBDIRS="$INPUTSUBDIRS cocoa"
+  echo "$as_me:12926: result: yes" >&5
+echo "${ECHO_T}yes" >&6
+else
+  echo "$as_me:12929: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+
+echo "$as_me:12933: checking if we should build mouse emulation filterlib" >&5
 echo $ECHO_N "checking if we should build mouse emulation filterlib... $ECHO_C" >&6
 FILTERSUBDIRS="$FILTERSUBDIRS mouse"
-echo "$as_me:12837: result: yes" >&5
+echo "$as_me:12936: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-echo "$as_me:12840: checking if we should build key translation filterlib" >&5
+echo "$as_me:12939: checking if we should build key translation filterlib" >&5
 echo $ECHO_N "checking if we should build key translation filterlib... $ECHO_C" >&6
 FILTERSUBDIRS="$FILTERSUBDIRS keytrans"
-echo "$as_me:12843: result: yes" >&5
+echo "$as_me:12942: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-echo "$as_me:12846: checking if we should build save filterlib" >&5
+echo "$as_me:12945: checking if we should build save filterlib" >&5
 echo $ECHO_N "checking if we should build save filterlib... $ECHO_C" >&6
 FILTERSUBDIRS="$FILTERSUBDIRS save"
-echo "$as_me:12849: result: yes" >&5
+echo "$as_me:12948: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
-echo "$as_me:12852: checking if we should build tcp filterlib" >&5
+echo "$as_me:12951: checking if we should build tcp filterlib" >&5
 echo $ECHO_N "checking if we should build tcp filterlib... $ECHO_C" >&6
 if test "x$build_tcp_filter" != "xno"; then
   FILTERSUBDIRS="$FILTERSUBDIRS tcp"
-  echo "$as_me:12856: result: yes" >&5
+  echo "$as_me:12955: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 else
-  echo "$as_me:12859: result: no" >&5
+  echo "$as_me:12958: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -12876,7 +12975,7 @@
 fi
 
 if test "$use_memdebug" = "yes"; then
-  echo "$as_me:12879: checking for __malloc_hook in -lc" >&5
+  echo "$as_me:12978: checking for __malloc_hook in -lc" >&5
 echo $ECHO_N "checking for __malloc_hook in -lc... $ECHO_C" >&6
 if test "${ac_cv_lib_c___malloc_hook+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -12884,7 +12983,7 @@
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lc  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 12887 "configure"
+#line 12986 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -12903,16 +13002,16 @@
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:12906: \"$ac_link\"") >&5
+if { (eval echo "$as_me:13005: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:12909: \$? = $ac_status" >&5
+  echo "$as_me:13008: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:12912: \"$ac_try\"") >&5
+  { (eval echo "$as_me:13011: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:12915: \$? = $ac_status" >&5
+  echo "$as_me:13014: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_c___malloc_hook=yes
 else
@@ -12923,7 +13022,7 @@
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:12926: result: $ac_cv_lib_c___malloc_hook" >&5
+echo "$as_me:13025: result: $ac_cv_lib_c___malloc_hook" >&5
 echo "${ECHO_T}$ac_cv_lib_c___malloc_hook" >&6
 if test $ac_cv_lib_c___malloc_hook = yes; then
   cat >>confdefs.h <<\EOF
@@ -12934,8 +13033,23 @@
 
 fi
 
+CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE"
+
+if test "x$use_debug" = "xyes"; then
+  CFLAGS="$CFLAGS -DDEBUG"
+  if test "$ac_cv_c_compiler_gnu" = "yes"; then
+    CFLAGS="$CFLAGS -g -Wall"
+  fi
+fi
+
+# Check for darwin at the very end and set up the Objective C compiler
+# We do this here so that we get the full CFLAGS into OBJCFLAGS
 case "${host}" in
   *-*-darwin* | *-*-rhapsody*)
+	OBJC="cc"
+	OBJCFLAGS="$CFLAGS"
+	OBJCDEPMODE="$CCDEPMODE"
+
 	os_darwin=yes
 	;;
   *)
@@ -12951,15 +13065,6 @@
   OS_DARWIN_FALSE=
 fi
 
-CFLAGS="$CFLAGS -D_REENTRANT -D_THREAD_SAFE"
-
-if test "x$use_debug" = "xyes"; then
-  CFLAGS="$CFLAGS -DDEBUG"
-  if test "$ac_cv_c_compiler_gnu" = "yes"; then
-    CFLAGS="$CFLAGS -g -Wall"
-  fi
-fi
-
 test "x$prefix" = xNONE && prefix=$ac_default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
@@ -12997,7 +13102,7 @@
 # along with our hook.
 ac_config_headers="$ac_config_headers config.h"
 
-ac_config_files="$ac_config_files Makefile gg/Makefile gii/Makefile input/Makefile input/null/Makefile input/file/Makefile input/tcp/Makefile input/stdin/Makefile input/x/Makefile input/xwin/Makefile input/mouse/Makefile input/linux_mouse/Makefile input/linux_kbd/Makefile input/linux_joy/Makefile input/linux_evdev/Makefile input/ipaq_touchscreen/Makefile input/touchscreen/Makefile input/spaceorb/Makefile input/vgl/Makefile input/directx/Makefile input/fdselect/Makefile input/pcjoy/Makefile input/lk201/Makefile input/kii/Makefile filter/Makefile filter/mouse/Makefile filter/keytrans/Makefile filter/save/Makefile filter/tcp/Makefile demos/Makefile include/Makefile include/ggi/system.h include/ggi/Makefile include/ggi/input/Makefile include/ggi/internal/Makefile doc/Makefile doc/man/Makefile m4/Makefile libgii.conf dist/Makefile dist/rpm/Makefile dist/rpm/libgii.spec"
+ac_config_files="$ac_config_files Makefile gg/Makefile gii/Makefile input/Makefile input/null/Makefile input/file/Makefile input/tcp/Makefile input/stdin/Makefile input/x/Makefile input/xwin/Makefile input/mouse/Makefile input/linux_mouse/Makefile input/linux_kbd/Makefile input/linux_joy/Makefile input/linux_evdev/Makefile input/ipaq_touchscreen/Makefile input/touchscreen/Makefile input/spaceorb/Makefile input/vgl/Makefile input/directx/Makefile input/fdselect/Makefile input/pcjoy/Makefile input/lk201/Makefile input/kii/Makefile input/cocoa/Makefile filter/Makefile filter/mouse/Makefile filter/keytrans/Makefile filter/save/Makefile filter/tcp/Makefile demos/Makefile include/Makefile include/ggi/system.h include/ggi/Makefile include/ggi/input/Makefile include/ggi/internal/Makefile doc/Makefile doc/man/Makefile m4/Makefile libgii.conf dist/Makefile dist/rpm/Makefile dist/rpm/libgii.spec"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -13075,49 +13180,49 @@
 DEFS=-DHAVE_CONFIG_H
 
 if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
-  { { echo "$as_me:13078: error: conditional \"MAINTAINER_MODE\" was never defined.
+  { { echo "$as_me:13183: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
 echo "$as_me: error: conditional \"MAINTAINER_MODE\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
-  { { echo "$as_me:13085: error: conditional \"AMDEP\" was never defined.
+  { { echo "$as_me:13190: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
 echo "$as_me: error: conditional \"AMDEP\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${PTLOCK_TRUE}" && test -z "${PTLOCK_FALSE}"; then
-  { { echo "$as_me:13092: error: conditional \"PTLOCK\" was never defined.
+  { { echo "$as_me:13197: error: conditional \"PTLOCK\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
 echo "$as_me: error: conditional \"PTLOCK\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${DLPTLOCK_TRUE}" && test -z "${DLPTLOCK_FALSE}"; then
-  { { echo "$as_me:13099: error: conditional \"DLPTLOCK\" was never defined.
+  { { echo "$as_me:13204: error: conditional \"DLPTLOCK\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
 echo "$as_me: error: conditional \"DLPTLOCK\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${BUILTINLOCK_TRUE}" && test -z "${BUILTINLOCK_FALSE}"; then
-  { { echo "$as_me:13106: error: conditional \"BUILTINLOCK\" was never defined.
+  { { echo "$as_me:13211: error: conditional \"BUILTINLOCK\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
 echo "$as_me: error: conditional \"BUILTINLOCK\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${MEMDEBUG_TRUE}" && test -z "${MEMDEBUG_FALSE}"; then
-  { { echo "$as_me:13113: error: conditional \"MEMDEBUG\" was never defined.
+  { { echo "$as_me:13218: error: conditional \"MEMDEBUG\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
 echo "$as_me: error: conditional \"MEMDEBUG\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
 if test -z "${OS_DARWIN_TRUE}" && test -z "${OS_DARWIN_FALSE}"; then
-  { { echo "$as_me:13120: error: conditional \"OS_DARWIN\" was never defined.
+  { { echo "$as_me:13225: error: conditional \"OS_DARWIN\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
 echo "$as_me: error: conditional \"OS_DARWIN\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
@@ -13127,7 +13232,7 @@
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:13130: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:13235: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -13303,7 +13408,7 @@
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:13306: error: ambiguous option: $1
+    { { echo "$as_me:13411: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -13322,7 +13427,7 @@
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:13325: error: unrecognized option: $1
+  -*) { { echo "$as_me:13430: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -13390,6 +13495,7 @@
   "input/pcjoy/Makefile" ) CONFIG_FILES="$CONFIG_FILES input/pcjoy/Makefile" ;;
   "input/lk201/Makefile" ) CONFIG_FILES="$CONFIG_FILES input/lk201/Makefile" ;;
   "input/kii/Makefile" ) CONFIG_FILES="$CONFIG_FILES input/kii/Makefile" ;;
+  "input/cocoa/Makefile" ) CONFIG_FILES="$CONFIG_FILES input/cocoa/Makefile" ;;
   "filter/Makefile" ) CONFIG_FILES="$CONFIG_FILES filter/Makefile" ;;
   "filter/mouse/Makefile" ) CONFIG_FILES="$CONFIG_FILES filter/mouse/Makefile" ;;
   "filter/keytrans/Makefile" ) CONFIG_FILES="$CONFIG_FILES filter/keytrans/Makefile" ;;
@@ -13410,7 +13516,7 @@
   "dist/rpm/libgii.spec" ) CONFIG_FILES="$CONFIG_FILES dist/rpm/libgii.spec" ;;
   "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
-  *) { { echo "$as_me:13413: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:13519: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -13562,6 +13668,9 @@
 s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
 s,@MEMDEBUG_TRUE@,$MEMDEBUG_TRUE,;t t
 s,@MEMDEBUG_FALSE@,$MEMDEBUG_FALSE,;t t
+s,@OBJC@,$OBJC,;t t
+s,@OBJCFLAGS@,$OBJCFLAGS,;t t
+s,@OBJCDEPMODE@,$OBJCDEPMODE,;t t
 s,@OS_DARWIN_TRUE@,$OS_DARWIN_TRUE,;t t
 s,@OS_DARWIN_FALSE@,$OS_DARWIN_FALSE,;t t
 s,@TIMEVAL_INCLUDE@,$TIMEVAL_INCLUDE,;t t
@@ -13699,7 +13808,7 @@
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:13702: creating $ac_file" >&5
+    { echo "$as_me:13811: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -13717,7 +13826,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:13720: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:13829: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -13730,7 +13839,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:13733: error: cannot find input file: $f" >&5
+           { { echo "$as_me:13842: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -13791,7 +13900,7 @@
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:13794: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:13903: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -13802,7 +13911,7 @@
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:13805: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:13914: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -13815,7 +13924,7 @@
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:13818: error: cannot find input file: $f" >&5
+           { { echo "$as_me:13927: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -13932,7 +14041,7 @@
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:13935: $ac_file is unchanged" >&5
+      { echo "$as_me:14044: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
diff -uNr --exclude=CVS libgii/configure.in libgii.macosx/configure.in
--- libgii/configure.in	Thu Nov 28 01:09:59 2002
+++ libgii.macosx/configure.in	Thu Nov 28 01:58:10 2002
@@ -130,8 +130,11 @@
 [  --enable-lk201          build the lk201 DEC serial terminal inputlib],
 build_lk201_input=$enableval)
 AC_ARG_ENABLE(kii,
-[  --enable-kii          build the kii inputlib],
+[  --enable-kii            build the kii inputlib],
 build_kii_input=$enableval)
+AC_ARG_ENABLE(cocoa,
+[  --enable-cocoa          build the cocoa inputlib],
+build_cocoa_input=$enableval)
 
 AC_ARG_ENABLE(mutexes,
 [  --enable-mutexes=TYPE   force the kind of mutexes to use
@@ -184,6 +187,7 @@
 	linux/h3600_ts.h 					\
 	termios.h vgl.h windows.h dinput.h			\
 	mach-o/dyld.h						\
+	ApplicationServices/ApplicationServices.h
 	)
 
 
@@ -552,6 +556,16 @@
 	build_zaurus_ts_input="no"
 fi
 
+if test "x$ac_cv_header_ApplicationServices_ApplicationServices_h" != "xno"; then
+  AC_CHECK_HEADER(ApplicationServices/ApplicationServices.h,
+    AC_TRY_COMPILE([
+#include <ApplicationServices/ApplicationServices.h>
+],[
+CGDirectDisplayID id;
+], foo=bar), build_cocoa_input="no")
+fi
+
+
 dnl ========================================================================
 dnl Check for inputlibs
 
@@ -758,6 +772,16 @@
   AC_MSG_RESULT(no)
 fi
 
+AC_MSG_CHECKING(if we should build cocoa inputlib)
+if test "x$build_cocoa_input" != "xno" -a \
+	"x$ac_cv_header_ApplicationServices_ApplicationServices_h" = "xyes"
+then
+  INPUTSUBDIRS="$INPUTSUBDIRS cocoa"
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+fi
+
 dnl ========================================================================
 dnl Check for filterlibs
 
@@ -782,7 +806,7 @@
 fi
 
 
-dnl ========================================================================
+dnl ===============================================================================
 dnl System specific things
 
 if test "x$USE_SYMBOL_UNDERSCORE" = "xyes"; then
@@ -794,17 +818,6 @@
   AC_CHECK_LIB(c, __malloc_hook, AC_DEFINE(HAVE_MALLOC_HOOK))
 fi
 
-case "${host}" in
-  *-*-darwin* | *-*-rhapsody*)
-	os_darwin=yes
-	;;
-  *)
-	os_darwin=no
-	;;
-esac
-AM_CONDITIONAL(OS_DARWIN, test "$os_darwin" = "yes" )
-
-
 dnl ========================================================================
 dnl Finally add some flags
 
@@ -818,6 +831,25 @@
   fi
 fi
 
+# Check for darwin at the very end and set up the Objective C compiler
+# We do this here so that we get the full CFLAGS into OBJCFLAGS
+case "${host}" in
+  *-*-darwin* | *-*-rhapsody*)
+	OBJC="cc"
+	OBJCFLAGS="$CFLAGS"
+	OBJCDEPMODE="$CCDEPMODE"
+	AC_SUBST(OBJC)
+	AC_SUBST(OBJCFLAGS)
+	AC_SUBST(OBJCDEPMODE)
+	os_darwin=yes
+	;;
+  *)
+	os_darwin=no
+	;;
+esac
+AM_CONDITIONAL(OS_DARWIN, test "$os_darwin" = "yes" )
+
+
 dnl ========================================================================
 dnl Write output
 
@@ -902,6 +934,7 @@
 input/pcjoy/Makefile
 input/lk201/Makefile
 input/kii/Makefile
+input/cocoa/Makefile
 filter/Makefile
 filter/mouse/Makefile
 filter/keytrans/Makefile
diff -uNr --exclude=CVS libgii/demos/.gdb_history libgii.macosx/demos/.gdb_history
--- libgii/demos/.gdb_history	Thu Jan  1 01:00:00 1970
+++ libgii.macosx/demos/.gdb_history	Mon Oct  7 00:08:04 2002
@@ -0,0 +1,2 @@
+run
+quit
diff -uNr --exclude=CVS libgii/demos/Makefile.in libgii.macosx/demos/Makefile.in
--- libgii/demos/Makefile.in	Thu Nov 28 01:10:23 2002
+++ libgii.macosx/demos/Makefile.in	Thu Nov 28 02:00:08 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
Binary files libgii/demos/evlog and libgii.macosx/demos/evlog differ
diff -uNr --exclude=CVS libgii/dist/Makefile.in libgii.macosx/dist/Makefile.in
--- libgii/dist/Makefile.in	Thu Nov 28 01:10:23 2002
+++ libgii.macosx/dist/Makefile.in	Thu Nov 28 02:00:08 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/dist/rpm/Makefile.in libgii.macosx/dist/rpm/Makefile.in
--- libgii/dist/rpm/Makefile.in	Thu Nov 28 01:10:23 2002
+++ libgii.macosx/dist/rpm/Makefile.in	Thu Nov 28 02:00:08 2002
@@ -96,6 +96,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/doc/Makefile.in libgii.macosx/doc/Makefile.in
--- libgii/doc/Makefile.in	Thu Nov 28 01:10:23 2002
+++ libgii.macosx/doc/Makefile.in	Thu Nov 28 02:00:09 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/doc/man/Makefile.in libgii.macosx/doc/man/Makefile.in
--- libgii/doc/man/Makefile.in	Thu Nov 28 01:10:24 2002
+++ libgii.macosx/doc/man/Makefile.in	Thu Nov 28 02:00:09 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/filter/Makefile.in libgii.macosx/filter/Makefile.in
--- libgii/filter/Makefile.in	Thu Nov 28 01:10:24 2002
+++ libgii.macosx/filter/Makefile.in	Thu Nov 28 02:00:09 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/filter/keytrans/Makefile.in libgii.macosx/filter/keytrans/Makefile.in
--- libgii/filter/keytrans/Makefile.in	Thu Nov 28 01:10:25 2002
+++ libgii.macosx/filter/keytrans/Makefile.in	Thu Nov 28 02:00:10 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/filter/mouse/Makefile.in libgii.macosx/filter/mouse/Makefile.in
--- libgii/filter/mouse/Makefile.in	Thu Nov 28 01:10:25 2002
+++ libgii.macosx/filter/mouse/Makefile.in	Thu Nov 28 02:00:10 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/filter/save/Makefile.in libgii.macosx/filter/save/Makefile.in
--- libgii/filter/save/Makefile.in	Thu Nov 28 01:10:26 2002
+++ libgii.macosx/filter/save/Makefile.in	Thu Nov 28 02:00:11 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/filter/tcp/Makefile.in libgii.macosx/filter/tcp/Makefile.in
--- libgii/filter/tcp/Makefile.in	Thu Nov 28 01:10:26 2002
+++ libgii.macosx/filter/tcp/Makefile.in	Thu Nov 28 02:00:11 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/gg/Makefile.in libgii.macosx/gg/Makefile.in
--- libgii/gg/Makefile.in	Thu Nov 28 01:10:27 2002
+++ libgii.macosx/gg/Makefile.in	Thu Nov 28 02:00:12 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/gii/Makefile.in libgii.macosx/gii/Makefile.in
--- libgii/gii/Makefile.in	Thu Nov 28 01:10:27 2002
+++ libgii.macosx/gii/Makefile.in	Thu Nov 28 02:00:12 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/include/Makefile.in libgii.macosx/include/Makefile.in
--- libgii/include/Makefile.in	Thu Nov 28 01:10:27 2002
+++ libgii.macosx/include/Makefile.in	Thu Nov 28 02:00:12 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/include/ggi/Makefile.in libgii.macosx/include/ggi/Makefile.in
--- libgii/include/ggi/Makefile.in	Thu Nov 28 01:10:28 2002
+++ libgii.macosx/include/ggi/Makefile.in	Thu Nov 28 02:00:13 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/include/ggi/input/Makefile.am libgii.macosx/include/ggi/input/Makefile.am
--- libgii/include/ggi/input/Makefile.am	Sun May 13 01:00:14 2001
+++ libgii.macosx/include/ggi/input/Makefile.am	Mon Nov  4 16:39:34 2002
@@ -1,2 +1,2 @@
 inputincludedir = ${includedir}/ggi/input
-inputinclude_HEADERS = lin_kbd.h xwin.h
+inputinclude_HEADERS = lin_kbd.h xwin.h cocoa.h
diff -uNr --exclude=CVS libgii/include/ggi/input/Makefile.in libgii.macosx/include/ggi/input/Makefile.in
--- libgii/include/ggi/input/Makefile.in	Thu Nov 28 01:10:28 2002
+++ libgii.macosx/include/ggi/input/Makefile.in	Thu Nov 28 02:00:13 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -116,7 +119,7 @@
 static_libdir = @static_libdir@
 static_sysconfdir = @static_sysconfdir@
 inputincludedir = ${includedir}/ggi/input
-inputinclude_HEADERS = lin_kbd.h xwin.h
+inputinclude_HEADERS = lin_kbd.h xwin.h cocoa.h
 subdir = include/ggi/input
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = $(top_builddir)/config.h
diff -uNr --exclude=CVS libgii/include/ggi/input/cocoa.h libgii.macosx/include/ggi/input/cocoa.h
--- libgii/include/ggi/input/cocoa.h	Thu Jan  1 01:00:00 1970
+++ libgii.macosx/include/ggi/input/cocoa.h	Tue Nov  5 14:45:09 2002
@@ -0,0 +1,48 @@
+/* $Id: xwin.h,v 1.1.1.1 2001/05/12 23:00:14 cegger Exp $
+******************************************************************************
+
+   Cocoa Input Header
+
+   Copyright (C) 2002 Christoph Egger
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+   THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+******************************************************************************
+*/
+
+#ifndef _GII_INPUT_COCOA_H
+#define _GII_INPUT_COCOA_H
+
+#include <ApplicationServices/ApplicationServices.h>
+#include <Cocoa/Cocoa.h>
+
+@interface GGIApplication : NSApplication
+@end
+
+@interface GGIObject : NSObject
+@end
+
+ 
+typedef struct {
+	GGIApplication *GGIApp;
+	NSWindow *window;
+	void *gglock;		/* locking mutex */
+} gii_inputcocoa_arg;
+        
+
+#endif /* _GII_INPUT_COCOA_H */
diff -uNr --exclude=CVS libgii/include/ggi/internal/Makefile.in libgii.macosx/include/ggi/internal/Makefile.in
--- libgii/include/ggi/internal/Makefile.in	Thu Nov 28 01:10:29 2002
+++ libgii.macosx/include/ggi/internal/Makefile.in	Thu Nov 28 02:00:13 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/Makefile.am libgii.macosx/input/Makefile.am
--- libgii/input/Makefile.am	Mon Jul 29 18:04:28 2002
+++ libgii.macosx/input/Makefile.am	Mon Nov  4 16:37:43 2002
@@ -2,4 +2,4 @@
 
 DIST_SUBDIRS = directx fdselect file kii linux_joy linux_kbd linux_mouse \
 	linux_evdev lk201 mouse null pcjoy spaceorb stdin tcp vgl x xwin \
-	ipaq_touchscreen touchscreen
+	ipaq_touchscreen touchscreen cocoa
diff -uNr --exclude=CVS libgii/input/Makefile.in libgii.macosx/input/Makefile.in
--- libgii/input/Makefile.in	Thu Nov 28 01:10:29 2002
+++ libgii.macosx/input/Makefile.in	Thu Nov 28 02:00:14 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
@@ -119,7 +122,7 @@
 
 DIST_SUBDIRS = directx fdselect file kii linux_joy linux_kbd linux_mouse \
 	linux_evdev lk201 mouse null pcjoy spaceorb stdin tcp vgl x xwin \
-	ipaq_touchscreen touchscreen
+	ipaq_touchscreen touchscreen cocoa
 
 subdir = input
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff -uNr --exclude=CVS libgii/input/cocoa/.cvsignore libgii.macosx/input/cocoa/.cvsignore
--- libgii/input/cocoa/.cvsignore	Thu Jan  1 01:00:00 1970
+++ libgii.macosx/input/cocoa/.cvsignore	Mon Nov  4 16:42:07 2002
@@ -0,0 +1 @@
+Makefile.in
diff -uNr --exclude=CVS libgii/input/cocoa/EXPSYMS libgii.macosx/input/cocoa/EXPSYMS
--- libgii/input/cocoa/EXPSYMS	Thu Jan  1 01:00:00 1970
+++ libgii.macosx/input/cocoa/EXPSYMS	Tue Oct 29 08:29:55 2002
@@ -0,0 +1 @@
+GIIdlinit
diff -uNr --exclude=CVS libgii/input/cocoa/Makefile.am libgii.macosx/input/cocoa/Makefile.am
--- libgii/input/cocoa/Makefile.am	Thu Jan  1 01:00:00 1970
+++ libgii.macosx/input/cocoa/Makefile.am	Mon Nov  4 16:42:45 2002
@@ -0,0 +1,13 @@
+INCLUDES = -I${top_srcdir}/include -I${top_builddir}/include ${extra_includes}
+cocoa_la_LIBADD = ${top_builddir}/gii/libgii.la ${top_builddir}/gg/libgg.la
+
+inputlib_LTLIBRARIES = cocoa.la
+
+cocoa_la_SOURCES = input.m cocoa.m
+cocoa_la_LDFLAGS = ${extra_libraries} -module -avoid-version -export-symbols ${srcdir}/EXPSYMS
+
+inputlibdir = ${libdir}/${ggi_subdir}/input
+
+EXTRA_DIST = EXPSYMS keysyms.h
+AM_CPPFLAGS = -no-cpp-precomp -I/System/Library/Frameworks
+AM_LDFLAGS = -Xlinker -framework -Xlinker ApplicationServices -Xlinker -framework -Xlinker Cocoa
diff -uNr --exclude=CVS libgii/input/cocoa/Makefile.in libgii.macosx/input/cocoa/Makefile.in
--- libgii/input/cocoa/Makefile.in	Thu Jan  1 01:00:00 1970
+++ libgii.macosx/input/cocoa/Makefile.in	Thu Nov 28 02:00:14 2002
@@ -0,0 +1,384 @@
+# Makefile.in generated by automake 1.6.1 from Makefile.am.
+# @configure_input@
+
+# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002
+# Free Software Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+SHELL = @SHELL@
+
+srcdir = @srcdir@
+top_srcdir = @top_srcdir@
+VPATH = @srcdir@
+prefix = @prefix@
+exec_prefix = @exec_prefix@
+
+bindir = @bindir@
+sbindir = @sbindir@
+libexecdir = @libexecdir@
+datadir = @datadir@
+sysconfdir = @sysconfdir@
+sharedstatedir = @sharedstatedir@
+localstatedir = @localstatedir@
+libdir = @libdir@
+infodir = @infodir@
+mandir = @mandir@
+includedir = @includedir@
+oldincludedir = /usr/include
+pkgdatadir = $(datadir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+top_builddir = ../..
+
+ACLOCAL = @ACLOCAL@
+AUTOCONF = @AUTOCONF@
+AUTOMAKE = @AUTOMAKE@
+AUTOHEADER = @AUTOHEADER@
+
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+INSTALL = @INSTALL@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_DATA = @INSTALL_DATA@
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = @program_transform_name@
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+host_alias = @host_alias@
+host_triplet = @host@
+
+EXEEXT = @EXEEXT@
+OBJEXT = @OBJEXT@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+AMTAR = @AMTAR@
+AS = @AS@
+AWK = @AWK@
+CC = @CC@
+CPP = @CPP@
+DEMOS = @DEMOS@
+DEPDIR = @DEPDIR@
+DLLEXT = @DLLEXT@
+DLLTOOL = @DLLTOOL@
+ECHO = @ECHO@
+FILTERSUBDIRS = @FILTERSUBDIRS@
+GGDLLIBS = @GGDLLIBS@
+GGI_16 = @GGI_16@
+GGI_32 = @GGI_32@
+GGI_64 = @GGI_64@
+GGI_8 = @GGI_8@
+GGI_DEFINE_INT64 = @GGI_DEFINE_INT64@
+GGI_ENDIAN = @GGI_ENDIAN@
+GG_ATEXIT = @GG_ATEXIT@
+GG_CURTIME = @GG_CURTIME@
+GG_USLEEP = @GG_USLEEP@
+INCLTDL = @INCLTDL@
+INPUTSUBDIRS = @INPUTSUBDIRS@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LIBADD_DL = @LIBADD_DL@
+LIBLTDL = @LIBLTDL@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+MAINT = @MAINT@
+NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
+OBJDUMP = @OBJDUMP@
+PACKAGE = @PACKAGE@
+RANLIB = @RANLIB@
+SELECTLIBS = @SELECTLIBS@
+STRIP = @STRIP@
+TIMEVAL_INCLUDE = @TIMEVAL_INCLUDE@
+USLEEP_INCLUDE1 = @USLEEP_INCLUDE1@
+USLEEP_INCLUDE2 = @USLEEP_INCLUDE2@
+VERSION = @VERSION@
+X_CFLAGS = @X_CFLAGS@
+X_EXTRA_LIBS = @X_EXTRA_LIBS@
+X_LIBS = @X_LIBS@
+X_PRE_LIBS = @X_PRE_LIBS@
+am__include = @am__include@
+am__quote = @am__quote@
+extra_includes = @extra_includes@
+extra_libraries = @extra_libraries@
+ggi_subdir = @ggi_subdir@
+install_sh = @install_sh@
+static_libdir = @static_libdir@
+static_sysconfdir = @static_sysconfdir@
+INCLUDES = -I${top_srcdir}/include -I${top_builddir}/include ${extra_includes}
+cocoa_la_LIBADD = ${top_builddir}/gii/libgii.la ${top_builddir}/gg/libgg.la
+
+inputlib_LTLIBRARIES = cocoa.la
+
+cocoa_la_SOURCES = input.m cocoa.m
+cocoa_la_LDFLAGS = ${extra_libraries} -module -avoid-version -export-symbols ${srcdir}/EXPSYMS
+
+inputlibdir = ${libdir}/${ggi_subdir}/input
+
+EXTRA_DIST = EXPSYMS keysyms.h
+AM_CPPFLAGS = -no-cpp-precomp -I/System/Library/Frameworks
+AM_LDFLAGS = -Xlinker -framework -Xlinker ApplicationServices -Xlinker -framework -Xlinker Cocoa
+subdir = input/cocoa
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+LTLIBRARIES = $(inputlib_LTLIBRARIES)
+
+cocoa_la_DEPENDENCIES = ${top_builddir}/gii/libgii.la \
+	${top_builddir}/gg/libgg.la
+am_cocoa_la_OBJECTS = input.lo cocoa.lo
+cocoa_la_OBJECTS = $(am_cocoa_la_OBJECTS)
+
+DEFS = @DEFS@
+DEFAULT_INCLUDES =  -I. -I$(srcdir) -I$(top_builddir)
+CPPFLAGS = @CPPFLAGS@
+LDFLAGS = @LDFLAGS@
+LIBS = @LIBS@
+depcomp = $(SHELL) $(top_srcdir)/depcomp
+am__depfiles_maybe = depfiles
+@AMDEP_TRUE@DEP_FILES = ./$(DEPDIR)/cocoa.Plo ./$(DEPDIR)/input.Plo
+OBJCCOMPILE = $(OBJC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_OBJCFLAGS) $(OBJCFLAGS)
+LTOBJCCOMPILE = $(LIBTOOL) --mode=compile $(OBJC) $(DEFS) \
+	$(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+	$(AM_OBJCFLAGS) $(OBJCFLAGS)
+OBJCLD = $(OBJC)
+OBJCLINK = $(LIBTOOL) --mode=link $(OBJCLD) $(AM_OBJCFLAGS) $(OBJCFLAGS) \
+	$(AM_LDFLAGS) $(LDFLAGS) -o $@
+DIST_SOURCES = $(cocoa_la_SOURCES)
+DIST_COMMON = Makefile.am Makefile.in
+SOURCES = $(cocoa_la_SOURCES)
+
+all: all-am
+
+.SUFFIXES:
+.SUFFIXES: .lo .m .o .obj
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
+	cd $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu  input/cocoa/Makefile
+Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in  $(top_builddir)/config.status
+	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
+inputlibLTLIBRARIES_INSTALL = $(INSTALL)
+install-inputlibLTLIBRARIES: $(inputlib_LTLIBRARIES)
+	@$(NORMAL_INSTALL)
+	$(mkinstalldirs) $(DESTDIR)$(inputlibdir)
+	@list='$(inputlib_LTLIBRARIES)'; for p in $$list; do \
+	  if test -f $$p; then \
+	    f="`echo $$p | sed -e 's|^.*/||'`"; \
+	    echo " $(LIBTOOL) --mode=install $(inputlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(inputlibdir)/$$f"; \
+	    $(LIBTOOL) --mode=install $(inputlibLTLIBRARIES_INSTALL) $(INSTALL_STRIP_FLAG) $$p $(DESTDIR)$(inputlibdir)/$$f; \
+	  else :; fi; \
+	done
+
+uninstall-inputlibLTLIBRARIES:
+	@$(NORMAL_UNINSTALL)
+	@list='$(inputlib_LTLIBRARIES)'; for p in $$list; do \
+	    p="`echo $$p | sed -e 's|^.*/||'`"; \
+	  echo " $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(inputlibdir)/$$p"; \
+	  $(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(inputlibdir)/$$p; \
+	done
+
+clean-inputlibLTLIBRARIES:
+	-test -z "$(inputlib_LTLIBRARIES)" || rm -f $(inputlib_LTLIBRARIES)
+cocoa.la: $(cocoa_la_OBJECTS) $(cocoa_la_DEPENDENCIES) 
+	$(OBJCLINK) -rpath $(inputlibdir) $(cocoa_la_LDFLAGS) $(cocoa_la_OBJECTS) $(cocoa_la_LIBADD) $(LIBS)
+
+mostlyclean-compile:
+	-rm -f *.$(OBJEXT) core *.core
+
+distclean-compile:
+	-rm -f *.tab.c
+
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/cocoa.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/input.Plo@am__quote@
+
+distclean-depend:
+	-rm -rf ./$(DEPDIR)
+
+.m.o:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(OBJCCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+.m.obj:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(OBJCCOMPILE) -c -o $@ `cygpath -w $<`
+
+.m.lo:
+@AMDEP_TRUE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
+@AMDEP_TRUE@	depfile='$(DEPDIR)/$*.Plo' tmpdepfile='$(DEPDIR)/$*.TPlo' @AMDEPBACKSLASH@
+@AMDEP_TRUE@	$(OBJCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+	$(LTOBJCCOMPILE) -c -o $@ `test -f '$<' || echo '$(srcdir)/'`$<
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+
+distclean-libtool:
+	-rm -f libtool
+uninstall-info-am:
+
+ETAGS = etags
+ETAGSFLAGS =
+
+tags: TAGS
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	mkid -fID $$unique
+
+TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
+		$(TAGS_FILES) $(LISP)
+	tags=; \
+	here=`pwd`; \
+	list='$(SOURCES) $(HEADERS)  $(LISP) $(TAGS_FILES)'; \
+	unique=`for i in $$list; do \
+	    if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+	  done | \
+	  $(AWK) '    { files[$$0] = 1; } \
+	       END { for (i in files) print i; }'`; \
+	test -z "$(ETAGS_ARGS)$$tags$$unique" \
+	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+	     $$tags $$unique
+
+GTAGS:
+	here=`$(am__cd) $(top_builddir) && pwd` \
+	  && cd $(top_srcdir) \
+	  && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+
+top_distdir = ../..
+distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
+
+distdir: $(DISTFILES)
+	@for file in $(DISTFILES); do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
+	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
+	    dir="/$$dir"; \
+	    $(mkinstalldirs) "$(distdir)$$dir"; \
+	  else \
+	    dir=''; \
+	  fi; \
+	  if test -d $$d/$$file; then \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
+	    fi; \
+	    cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
+	  else \
+	    test -f $(distdir)/$$file \
+	    || cp -p $$d/$$file $(distdir)/$$file \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(LTLIBRARIES)
+
+installdirs:
+	$(mkinstalldirs) $(DESTDIR)$(inputlibdir)
+
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	  INSTALL_STRIP_FLAG=-s \
+	  `test -z '$(STRIP)' || \
+	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-rm -f Makefile $(CONFIG_CLEAN_FILES) stamp-h stamp-h[0-9]*
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-inputlibLTLIBRARIES clean-libtool \
+	mostlyclean-am
+
+distclean: distclean-am
+
+distclean-am: clean-am distclean-compile distclean-depend \
+	distclean-generic distclean-libtool distclean-tags
+
+dvi: dvi-am
+
+dvi-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-inputlibLTLIBRARIES
+
+install-exec-am:
+
+install-info: install-info-am
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-compile mostlyclean-generic \
+	mostlyclean-libtool
+
+uninstall-am: uninstall-info-am uninstall-inputlibLTLIBRARIES
+
+.PHONY: GTAGS all all-am check check-am clean clean-generic \
+	clean-inputlibLTLIBRARIES clean-libtool distclean \
+	distclean-compile distclean-depend distclean-generic \
+	distclean-libtool distclean-tags distdir dvi dvi-am info \
+	info-am install install-am install-data install-data-am \
+	install-exec install-exec-am install-info install-info-am \
+	install-inputlibLTLIBRARIES install-man install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-compile \
+	mostlyclean-generic mostlyclean-libtool tags uninstall \
+	uninstall-am uninstall-info-am uninstall-inputlibLTLIBRARIES
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -uNr --exclude=CVS libgii/input/cocoa/cocoa.h libgii.macosx/input/cocoa/cocoa.h
--- libgii/input/cocoa/cocoa.h	Thu Jan  1 01:00:00 1970
+++ libgii.macosx/input/cocoa/cocoa.h	Wed Nov 13 20:02:08 2002
@@ -0,0 +1,55 @@
+/* $Id: xwin.h,v 1.1.1.1 2001/05/12 23:00:14 cegger Exp $
+******************************************************************************
+
+   Cocoa Input
+
+   Copyright (C) 2002 Christoph Egger
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+   THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+******************************************************************************
+*/
+
+#ifndef _GII_INPUT_INT_COCOA_H
+#define _GII_INPUT_INT_COCOA_H
+
+#include <ApplicationServices/ApplicationServices.h>
+#include <Cocoa/Cocoa.h>
+
+
+@interface GIIObject : NSObject
+- (void)runeventloop:(id)anObject;
+@end
+
+typedef struct {
+	NSApplication *GIIApp;
+	GIIObject *giiobject;
+	NSWindow *window;
+} cocoa_priv;
+        
+#define COCOA_PRIV(inp) ((cocoa_priv *)inp->priv)
+
+
+int CocoaInit(cocoa_priv *priv);
+int CocoaFinishLaunch(cocoa_priv *priv);
+int CocoaExit(cocoa_priv *priv);
+NSEvent *CocoaNextEvent(cocoa_priv *priv);
+void CocoaPrintEvent(cocoa_priv *priv, FILE *f, NSEvent *e);
+
+
+#endif /* _GII_INPUT_INT_COCOA_H */
diff -uNr --exclude=CVS libgii/input/cocoa/cocoa.m libgii.macosx/input/cocoa/cocoa.m
--- libgii/input/cocoa/cocoa.m	Thu Jan  1 01:00:00 1970
+++ libgii.macosx/input/cocoa/cocoa.m	Tue Nov 19 08:46:12 2002
@@ -0,0 +1,141 @@
+/* $Id: input.c,v 1.3 2002/10/05 17:22:23 fspacek Exp $
+******************************************************************************
+
+   Cocoa: Input driver
+
+   Copyright (C) 2002 Christoph Egger
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+   THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+******************************************************************************
+*/
+
+
+#include <stdlib.h>
+#include <stdio.h>
+#include <string.h>
+
+#include <ggi/internal/gii-dl.h>
+#include <ggi/internal/gii_debug.h>
+
+#include "cocoa.h"
+
+
+@implementation GIIObject
+- (void)runeventloop:(id)anObject
+{
+	NSAutoreleasePool *pool;
+
+	pool = [ [ NSAutoreleasePool alloc ] init ];
+
+	fprintf(stderr, "GIIObject: Start event loop\n");
+
+	/* Start the main event loop */
+	[ anObject run ];
+
+	fprintf(stderr, "GIIObject: event loop stopped\n");
+
+	[ pool release ];
+	[ NSThread exit ];
+}
+@end
+
+
+
+int CocoaInit(cocoa_priv *priv)
+{
+	if (NULL == priv) {
+		return GGI_EARGINVAL;
+	}	/* if */
+
+	fprintf(stderr, "CocoaInit: leave!\n");
+
+	return GGI_OK;
+}	/* CocoaInit */
+
+
+int CocoaFinishLaunch(cocoa_priv *priv)
+{
+	NSApplication *GIIApp;
+
+	GIIApp = priv->GIIApp;
+
+	priv->giiobject = [ [ GIIObject alloc ] init ];
+
+	[ GIIApp setDelegate:priv->giiobject ];
+
+	[ NSThread detachNewThreadSelector:@selector(runeventloop:) toTarget:priv->giiobject withObject:GIIApp ];
+
+	fprintf(stderr, "CocoaFinishLaunch: leave!\n");
+
+	return GGI_OK;
+}	/* CocoaFinishLaunch */
+
+
+int CocoaExit(cocoa_priv *priv)
+{
+	NSApplication *GIIApp;
+	NSAutoreleasePool *pool;
+
+	pool = [ [ NSAutoreleasePool alloc ] init ];
+
+	GIIApp = priv->GIIApp;
+
+	[ GIIApp stop:priv->giiobject ];
+	[ priv->giiobject release ];
+
+	[ pool release ];
+
+	return 0;
+}	/* CocoaExit */
+
+
+NSEvent *CocoaNextEvent(cocoa_priv *priv)
+{
+	NSDate *distantPast;
+	NSEvent *event;
+	NSAutoreleasePool *pool;
+
+	pool = [ [ NSAutoreleasePool alloc ] init ];
+
+	distantPast = [ NSDate distantPast ];
+
+	/* Poll for an event. This will not block */
+	event = [ priv->GIIApp nextEventMatchingMask:NSAnyEventMask
+			untilDate:distantPast
+			inMode: NSDefaultRunLoopMode dequeue:YES ];
+
+	[ pool release ];
+
+	return event;
+}	/* CocoaNextEvent */
+
+
+void CocoaPrintEvent(cocoa_priv *priv, FILE *f, NSEvent *ev)
+{
+	if (ev == nil) {
+		fprintf(f, "no event\n");
+		return;
+	}	/* if */
+
+	fprintf(f, "event: type %i, scancode %i, unicode %i, modifiers %i\n",
+		[ ev type ], [ ev keyCode ], [ [ ev characters ] intValue ],
+		[ ev modifierFlags ]);
+
+	return;
+}	/* CocoaPrintEvent */
diff -uNr --exclude=CVS libgii/input/cocoa/input.m libgii.macosx/input/cocoa/input.m
--- libgii/input/cocoa/input.m	Thu Jan  1 01:00:00 1970
+++ libgii.macosx/input/cocoa/input.m	Wed Nov 20 00:06:32 2002
@@ -0,0 +1,872 @@
+/* $Id: input.c,v 1.3 2002/10/05 17:22:23 fspacek Exp $
+******************************************************************************
+
+   Cocoa: Input driver
+      
+   Copyright (C) 2002 Christoph Egger
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+   THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+******************************************************************************
+*/
+
+#include <stdlib.h>
+#include "config.h"
+#include <ggi/internal/gii-dl.h>
+#include <ggi/internal/gii_debug.h>
+
+#include <ggi/input/cocoa.h>
+#include "cocoa.h"
+#include "keysyms.h"
+
+
+static gii_cmddata_getdevinfo devinfo =
+{
+	"Cocoa Input Driver",			/* long name */
+	"CID",					/* short name */
+	emKey | emPtrButton | emPtrRelative,	/* targetcan */
+#if 0
+	emAll,					/* targetcan */
+#endif
+	GII_NUM_UNKNOWN,			/* num buttons */
+	GII_NUM_UNKNOWN				/* num axes */
+};
+
+
+static gii_event_mask GII_cocoa_handle_key(gii_input *inp, gii_event *ge,
+			NSEvent *ev)
+{
+	NSEventType type;
+	NSString *chars;
+	unsigned int modifiers;
+	unsigned short scancode;
+	unsigned short sym;
+
+	type = [ ev type ];
+	modifiers = [ ev modifierFlags ];
+	chars = [ ev characters ];	/* unicode chars! */
+	scancode = [ ev keyCode ];	/* device dependent key number */
+//	sym = keymap[ scancode ];
+	sym = scancode;
+
+	_giiEventBlank(ge, sizeof(gii_key_event));
+	ge->any.size = sizeof(gii_key_event);
+	ge->any.origin = inp->origin;
+
+	GIIDPRINT_LIBS("keyboard event, sym: 0x%.8x, label: 0x%.8x, scancode: 0x%.8x, modifier: 0x%.8x\n",
+		sym, [chars intValue], scancode, modifiers);
+
+	/* Button number is the scancode */
+	ge->key.button = scancode;
+
+	if (modifiers & NSAlphaShiftKeyMask) {
+		ge->key.modifiers |= GII_MOD_CAPS;
+		fprintf(stderr, "handle_key: modifier: NSAlphaShiftKeyMask - GII_MOD_CAPS\n");
+	}	/* if */
+	if (modifiers & NSShiftKeyMask) {
+		ge->key.modifiers |= GII_MOD_SHIFT;
+		fprintf(stderr, "handle_key: modifier NSShiftKeyMask - GII_MOD_SHIFT\n");
+	}	/* if */
+	if (modifiers & NSControlKeyMask) {
+		ge->key.modifiers |= GII_MOD_CTRL;
+		fprintf(stderr, "handle_key: modifier NSControlKeyMask - GII_MOD_CTRL\n");
+	}	/* if */
+	if (modifiers & NSAlternateKeyMask) {
+		ge->key.modifiers |= GII_MOD_ALT;
+		fprintf(stderr, "handle_key: modifier NSAlternateKeyMask - GII_MOD_ALT\n");
+	}	/* if */
+	if (modifiers & NSCommandKeyMask) {
+		ge->key.modifiers |= GII_MOD_META;
+		fprintf(stderr, "handle_key: modifier NSCommandKeyMask - GII_MOD_META\n");
+	}	/* if */
+	if (modifiers & NSNumericPadKeyMask) {
+		ge->key.modifiers |= GII_MOD_NUM;
+		fprintf(stderr, "handle_key: modifier NSNumericPadKeyMask - GII_MOD_NUM\n");
+	}	/* if */
+
+
+	/* FIXME: Are those really symbols or are
+	 * they labels?
+	 */
+	switch ([ chars intValue ]) {
+	case NSUpArrowFunctionKey:
+		ge->key.sym = GIIK_Up;
+		fprintf(stderr, "symbol or label: NSUpArrowFunctionKey - GIIK_Up\n");
+		break;
+	case NSDownArrowFunctionKey:
+		ge->key.sym = GIIK_Down;
+		fprintf(stderr, "symbol or label: NSDownArrowFunctionKey - GIIK_Down\n");
+		break;
+	case NSLeftArrowFunctionKey:
+		ge->key.sym = GIIK_Left;
+		fprintf(stderr, "symbol or label: NSLeftArrowFunctionKey - GIIK_Left\n");
+		break;
+	case NSRightArrowFunctionKey:
+		ge->key.sym = GIIK_Right;
+		fprintf(stderr, "symbol or label: NSRightArrowFunctionKey - GIIK_Right\n");
+		break;
+
+	case NSF1FunctionKey:
+		ge->key.sym = GIIK_F1;
+		fprintf(stderr, "symbol or label: NSF1FunctionKey - GIIK_F1\n");
+		break;
+	case NSF2FunctionKey:
+		ge->key.sym = GIIK_F2;
+		fprintf(stderr, "symbol or label: NSF2FunctionKey - GIIK_F2\n");
+		break;
+	case NSF3FunctionKey:
+		ge->key.sym = GIIK_F3;
+		fprintf(stderr, "symbol or label: NSF3FunctionKey - GIIK_F3\n");
+		break;
+	case NSF4FunctionKey:
+		ge->key.sym = GIIK_F4;
+		fprintf(stderr, "symbol or label: NSF4FunctionKey - GIIK_F4\n");
+		break;
+	case NSF5FunctionKey:
+		ge->key.sym = GIIK_F5;
+		fprintf(stderr, "symbol or label: NSF5FunctionKey - GIIK_F5\n");
+		break;
+	case NSF6FunctionKey:
+		ge->key.sym = GIIK_F6;
+		fprintf(stderr, "symbol or label: NSF6FunctionKey - GIIK_F6\n");
+		break;
+	case NSF7FunctionKey:
+		ge->key.sym = GIIK_F7;
+		fprintf(stderr, "symbol or label: NSF7FunctionKey - GIIK_F7\n");
+		break;
+	case NSF8FunctionKey:
+		ge->key.sym = GIIK_F8;
+		fprintf(stderr, "symbol or label: NSF8FunctionKey - GIIK_F8\n");
+		break;
+	case NSF9FunctionKey:
+		ge->key.sym = GIIK_F9;
+		fprintf(stderr, "symbol or label: NSF9FunctionKey - GIIK_F9\n");
+		break;
+	case NSF10FunctionKey:
+		ge->key.sym = GIIK_F10;
+		fprintf(stderr, "symbol or label: NSF10FunctionKey - GIIK_F10\n");
+		break;
+	case NSF11FunctionKey:
+		ge->key.sym = GIIK_F11;
+		fprintf(stderr, "symbol or label: NSF11FunctionKey - GIIK_F11\n");
+		break;
+	case NSF12FunctionKey:
+		ge->key.sym = GIIK_F12;
+		fprintf(stderr, "symbol or label: NSF12FunctionKey - GIIK_F12\n");
+		break;
+	case NSF13FunctionKey:
+		ge->key.sym = GIIK_F13;
+		fprintf(stderr, "symbol or label: NSF13FunctionKey - GIIK_F13\n");
+		break;
+	case NSF14FunctionKey:
+		ge->key.sym = GIIK_F14;
+		fprintf(stderr, "symbol or label: NSF14FunctionKey - GIIK_F14\n");
+		break;
+	case NSF15FunctionKey:
+		ge->key.sym = GIIK_F15;
+		fprintf(stderr, "symbol or label: NSF15FunctionKey - GIIK_F15\n");
+		break;
+	case NSF16FunctionKey:
+		ge->key.sym = GIIK_F16;
+		fprintf(stderr, "symbol or label: NSF16FunctionKey - GIIK_F16\n");
+		break;
+	case NSF17FunctionKey:
+		ge->key.sym = GIIK_F17;
+		fprintf(stderr, "symbol or label: NSF17FunctionKey - GIIK_F17\n");
+		break;
+	case NSF18FunctionKey:
+		ge->key.sym = GIIK_F18;
+		fprintf(stderr, "symbol or label: NSF18FunctionKey - GIIK_F18\n");
+		break;
+	case NSF19FunctionKey:
+		ge->key.sym = GIIK_F19;
+		fprintf(stderr, "symbol or label: NSF19FunctionKey - GIIK_F19\n");
+		break;
+	case NSF20FunctionKey:
+		ge->key.sym = GIIK_F20;
+		fprintf(stderr, "symbol or label: NSF20FunctionKey - GIIK_F20\n");
+		break;
+	case NSF21FunctionKey:
+		ge->key.sym = GIIK_F21;
+		fprintf(stderr, "symbol or label: NSF21FunctionKey - GIIK_F21\n");
+		break;
+	case NSF22FunctionKey:
+		ge->key.sym = GIIK_F22;
+		fprintf(stderr, "symbol or label: NSF22FunctionKey - GIIK_F22\n");
+		break;
+	case NSF23FunctionKey:
+		ge->key.sym = GIIK_F23;
+		fprintf(stderr, "symbol or label: NSF23FunctionKey - GIIK_F23\n");
+		break;
+	case NSF24FunctionKey:
+		ge->key.sym = GIIK_F24;
+		fprintf(stderr, "symbol or label: NSF24FunctionKey - GIIK_F24\n");
+		break;
+	case NSF25FunctionKey:
+		ge->key.sym = GIIK_F25;
+		fprintf(stderr, "symbol or label: NSF25FunctionKey - GIIK_F25\n");
+		break;
+	case NSF26FunctionKey:
+		ge->key.sym = GIIK_F26;
+		fprintf(stderr, "symbol or label: NSF26FunctionKey - GIIK_F26\n");
+		break;
+	case NSF27FunctionKey:
+		ge->key.sym = GIIK_F27;
+		fprintf(stderr, "symbol or label: NSF27FunctionKey - GIIK_F27\n");
+		break;
+	case NSF28FunctionKey:
+		ge->key.sym = GIIK_F28;
+		fprintf(stderr, "symbol or label: NSF28FunctionKey - GIIK_F28\n");
+		break;
+	case NSF29FunctionKey:
+		ge->key.sym = GIIK_F29;
+		fprintf(stderr, "symbol or label: NSF29FunctionKey - GIIK_F29\n");
+		break;
+	case NSF30FunctionKey:
+		ge->key.sym = GIIK_F30;
+		fprintf(stderr, "symbol or label: NSF30FunctionKey - GIIK_F30\n");
+		break;
+	case NSF31FunctionKey:
+		ge->key.sym = GIIK_F31;
+		fprintf(stderr, "symbol or label: NSF31FunctionKey - GIIK_F31\n");
+		break;
+	case NSF32FunctionKey:
+		ge->key.sym = GIIK_F32;
+		fprintf(stderr, "symbol or label: NSF32FunctionKey - GIIK_F32\n");
+		break;
+	case NSF33FunctionKey:
+		ge->key.sym = GIIK_F33;
+		fprintf(stderr, "symbol or label: NSF33FunctionKey - GIIK_F33\n");
+		break;
+	case NSF34FunctionKey:
+		ge->key.sym = GIIK_F34;
+		fprintf(stderr, "symbol or label: NSF34FunctionKey - GIIK_F34\n");
+		break;
+	case NSF35FunctionKey:
+		ge->key.sym = GIIK_F35;
+		fprintf(stderr, "symbol or label: NSF35FunctionKey - GIIK_F35\n");
+		break;
+
+	case NSInsertFunctionKey:
+		ge->key.sym = GIIK_Insert;
+		fprintf(stderr, "symbol or label: NSInsertFunctionKey - GIIK_Insert\n");
+		break;
+	case NSDeleteFunctionKey:
+		ge->key.sym = GIIK_Delete;
+		fprintf(stderr, "symbol or label: NSDeleteFunctionKey - GIIK_Delete\n");
+		break;
+	case NSHomeFunctionKey:
+		ge->key.sym = GIIK_Home;
+		fprintf(stderr, "symbol or label: NSHomeFunctionKey - GIIK_Home\n");
+		break;
+	case NSBeginFunctionKey:
+		ge->key.sym = GIIK_Begin;
+		fprintf(stderr, "symbol or label: NSBeginFunctionKey - GIIK_Begin\n");
+		break;
+	case NSEndFunctionKey:
+		ge->key.sym = GIIK_End;
+		fprintf(stderr, "symbol or label: NSEndFunctionKey - GIIK_End\n");
+		break;
+	case NSPageUpFunctionKey:
+		ge->key.sym = GIIK_PageUp;
+		fprintf(stderr, "symbol or label: NSPageUpFunctionKey - GIIK_PageUp\n");
+		break;
+	case NSPageDownFunctionKey:
+		ge->key.sym = GIIK_PageDown;
+		fprintf(stderr, "symbol or label: NSPageDownFunctionKey - GIIK_PageDown\n");
+		break;
+	case NSPrintScreenFunctionKey:
+		ge->key.sym = GIIK_PrintScreen;
+		fprintf(stderr, "symbol or label: NSPrintScreenFunctionKey - GIIK_PrintScreen\n");
+		break;
+	case NSPauseFunctionKey:
+		ge->key.sym = GIIK_Pause;
+		fprintf(stderr, "symbol or label: NSPauseFunctionKey - GIIK_Pause\n");
+		break;
+	case NSSysReqFunctionKey:
+		ge->key.sym = GIIK_SysRq;
+		fprintf(stderr, "symbol or label: NSSysReqFunctionKey - GIIK_SysRq\n");
+		break;
+	case NSBreakFunctionKey:
+		ge->key.sym = GIIK_Break;
+		fprintf(stderr, "symbol or label: NSBreakFunctionKey - GIIK_Break\n");
+		break;
+	case NSResetFunctionKey:
+		fprintf(stderr, "NSResetFunctionKey not supported!\n");
+		fprintf(stderr, "symbol or label: NSResetFunctionKey -\n");
+		break;
+	case NSStopFunctionKey:
+		ge->key.sym = GIIK_Stop;
+		fprintf(stderr, "symbol or label: NSStopFunctionKey - GIIK_Stop\n");
+		break;
+	case NSMenuFunctionKey:
+		ge->key.sym = GIIK_Menu;
+		fprintf(stderr, "symbol or label: NSMenuFunctionKey - GIIK_Menu\n");
+		break;
+	case NSUserFunctionKey:
+		fprintf(stderr, "NSUserFunctionKey not supported!\n");
+		fprintf(stderr, "symbol or label: NSUserFunctionKey -\n");
+		break;
+	case NSSystemFunctionKey:
+		fprintf(stderr, "NSSystemFunctionKey not supported!\n");
+		fprintf(stderr, "symbol or label: NSSystemFunctionKey -\n");
+		break;
+	case NSPrintFunctionKey:
+		fprintf(stderr, "NSPrintFunctionKey not supported!\n");
+		fprintf(stderr, "symbol or label: NSPrintFunctionKey -\n");
+		break;
+	case NSClearLineFunctionKey:
+		ge->key.sym = GIIK_Clear;
+		fprintf(stderr, "symbol or label: NSClearLineFunctionKey - GIIK_Clear\n");
+		break;
+	case NSClearDisplayFunctionKey:
+		ge->key.sym = GIIK_Clear;
+		fprintf(stderr, "symbol or label: NSClearDisplayFunctionKey - GIIK_Clear\n");
+		break;
+	case NSInsertLineFunctionKey:
+		ge->key.sym = GIIK_Insert;
+		fprintf(stderr, "symbol or label: NSInsertLineFunctionKey - GIIK_Insert\n");
+		break;
+	case NSDeleteLineFunctionKey:
+		ge->key.sym = GIIK_Delete;
+		fprintf(stderr, "symbol or label: NSDeleteLineFunctionKey - GIIK_Delete\n");
+		break;
+	case NSInsertCharFunctionKey:
+		ge->key.sym = GIIK_Insert;
+		fprintf(stderr, "symbol or label: NSInsertCharFunctionKey - GIIK_Insert\n");
+		break;
+	case NSDeleteCharFunctionKey:
+		ge->key.sym = GIIK_Delete;
+		fprintf(stderr, "symbol or label: NSDeleteCharFunctionKey - GIIK_Delete\n");
+		break;
+	case NSPrevFunctionKey:
+		ge->key.sym = GIIK_Prior;
+		fprintf(stderr, "symbol or label: NSPrevFunctionKey - GIIK_Prior\n");
+		break;
+	case NSNextFunctionKey:
+		ge->key.sym = GIIK_Next;
+		fprintf(stderr, "symbol or label: NSNextFunctionKey - GIIK_Next\n");
+		break;
+	case NSSelectFunctionKey:
+		ge->key.sym = GIIK_Select;
+		fprintf(stderr, "symbol or label: NSSelectFunctionKey - GIIK_Select\n");
+		break;
+	case NSExecuteFunctionKey:
+		ge->key.sym = GIIK_Execute;
+		fprintf(stderr, "symbol or label: NSExecuteFunctionKey - GIIK_Execute\n");
+		break;
+	case NSUndoFunctionKey:
+		ge->key.sym = GIIK_Undo;
+		fprintf(stderr, "symbol or label: NSUndoFunctionKey - GIIK_Undo\n");
+		break;
+	case NSRedoFunctionKey:
+		ge->key.sym = GIIK_Redo;
+		fprintf(stderr, "symbol or label: NSRedoFunctionKey - GIIK_Redo\n");
+		break;
+	case NSFindFunctionKey:
+		ge->key.sym = GIIK_Find;
+		fprintf(stderr, "symbol or label: NSFindFunctionKey - GIIK_Find\n");
+		break;
+	case NSHelpFunctionKey:
+		ge->key.sym = GIIK_Help;
+		fprintf(stderr, "symbol or label: NSHelpFunctionKey - GIIK_Help\n");
+		break;
+	case NSModeSwitchFunctionKey:
+		ge->key.sym = GIIK_ModeSwitch;
+		fprintf(stderr, "symbol or label: NSModeSwitchFunctionKey - GIIK_ModeSwitch\n");
+		break;
+
+
+	/* labels */
+	case NSScrollLockFunctionKey:
+		ge->key.label = GIIK_ScrollLock;
+		fprintf(stderr, "label: NSScrollLockFunctionKey - GIIK_ScrollLock\n");
+		break;
+
+
+	default:
+		fprintf(stderr, "symbol or label: unhandeld symbol or label: %i\n",
+			[ chars intValue ]);
+		break;
+	}	/* switch */
+
+
+
+	switch (sym) {
+
+	/* keys on numeric keypad */
+	case NSSymKeypad_1:
+		ge->key.sym = GIIK_P1;
+		fprintf(stderr, "symbol: NSSymKeypad_1 - GIIK_P1\n");
+		break;
+	case NSSymKeypad_2:
+		ge->key.sym = GIIK_P2;
+		fprintf(stderr, "symbol: NSSymKeypad_2 - GIIK_P2\n");
+		break;
+	case NSSymKeypad_3:
+		ge->key.sym = GIIK_P3;
+		fprintf(stderr, "symbol: NSSymKeypad_3 - GIIK_P3\n");
+		break;
+	case NSSymKeypad_4:
+		ge->key.sym = GIIK_P4;
+		fprintf(stderr, "symbol: NSSymKeypad_4 - GIIK_P4\n");
+		break;
+	case NSSymKeypad_5:
+		ge->key.sym = GIIK_P5;
+		fprintf(stderr, "symbol: NSSymKeypad_5 - GIIK_P5\n");
+		break;
+	case NSSymKeypad_6:
+		ge->key.sym = GIIK_P6;
+		fprintf(stderr, "symbol: NSSymKeypad_6 - GIIK_P6\n");
+		break;
+	case NSSymKeypad_7:
+		ge->key.sym = GIIK_P7;
+		fprintf(stderr, "symbol: NSSymKeypad_7 - GIIK_P7\n");
+		break;
+	case NSSymKeypad_8:
+		ge->key.sym = GIIK_P8;
+		fprintf(stderr, "symbol: NSSymKeypad_8 - GIIK_P8\n");
+		break;
+	case NSSymKeypad_9:
+		ge->key.sym = GIIK_P9;
+		fprintf(stderr, "symbol: NSSymKeypad_9 - GIIK_P9\n");
+		break;
+	case NSSymKeypad_0:
+		ge->key.sym = GIIK_P0;
+		fprintf(stderr, "symbol: NSSymKeypad_0 - GIIK_P0\n");
+		break;
+
+	case NSSymKeypadEquals:
+		ge->key.sym = GIIK_PEqual;
+		fprintf(stderr, "symbol: NSSymKeypadEquals - GIIK_PEqual\n");
+		break;
+	case NSSymKeypadDivide:
+		ge->key.sym = GIIK_PSlash;
+		fprintf(stderr, "symbol: NSSymKeypadDivide - GIIK_PSlash\n");
+		break;
+	case NSSymKeypadMultiply:
+		ge->key.sym = GIIK_PAsterisk;
+		fprintf(stderr, "symbol: NSSymKeypadMultiply - GIIK_PAsterik\n");
+		break;
+	case NSSymKeypadMinus:
+		ge->key.sym = GIIK_PMinus;
+		fprintf(stderr, "symbol: NSSymKeypadMinus - GIIK_PMinus\n");
+		break;
+	case NSSymKeypadPlus:
+		ge->key.sym = GIIK_PPlus;
+		fprintf(stderr, "symbol: NSSymKeypadPlus - GIIK_PPlus\n");
+		break;
+	case NSSymKeypadEnter:
+		ge->key.sym = GIIK_PEnter;
+		fprintf(stderr, "symbol: NSSymKeypadEnter - GIIK_PEnter\n");
+		break;
+	case NSSymKeypadPeriod:
+		ge->key.sym = GIIK_PTab;	/* Is this corect? */
+		fprintf(stderr, "symbol: NSSymKeypadPeriod - GIIK_PTab\n");
+		break;
+
+
+	/* modifier keys */
+	case NSSymShiftL:
+		ge->key.sym = GIIK_Shift;
+		fprintf(stderr, "symbol: NSSymShiftL - GIIK_Shift\n");
+		break;
+	case NSSymControlL:
+		ge->key.sym = GIIK_Ctrl;
+		fprintf(stderr, "symbol: NSSymControlL - GIIK_Ctrl\n");
+		break;
+	case NSSymAltL:
+		ge->key.sym = GIIK_Alt;
+		fprintf(stderr, "symbol: NSSymAltL - GIIK_Alt\n");
+		break;
+	case NSSymMetaL:
+		ge->key.sym = GIIK_Meta;
+		fprintf(stderr, "symbol: NSSymMetaL - GIIK_Meta\n");
+		break;
+	case NSSymCapslock:
+		ge->key.sym = GIIK_Caps;
+		fprintf(stderr, "symbol: NSSymCapsLock - GIIK_Caps\n");
+		break;
+	case NSSymNumLock:
+		ge->key.sym = GIIK_Num;
+		fprintf(stderr, "symbol: NSSymNumLock - GIIK_Num\n");
+		break;
+	case NSSymScrollLock:
+		ge->key.sym = GIIK_Scroll;
+		fprintf(stderr, "symbol: NSSymScrollLock - GIIK_Scroll\n");
+		break;
+
+	default:
+		if (sym < 0x80) {
+			ge->key.sym = sym;
+			fprintf(stderr, "symbol (< 0x80) = %X\n", sym);
+		} else {
+			return emZero;
+		}	/* if */
+		break;
+	}	/* switch */
+
+	/* Event types */
+	switch (type) {
+	case NSKeyDown:
+		if ([ ev isARepeat ]) {
+			ge->any.type = evKeyRepeat;
+			fprintf(stderr, "key event type: evKeyRepeat\n");
+		} else {
+			ge->any.type = evKeyPress;
+			fprintf(stderr, "key event type: evKeyPress\n");
+		}	/* if */
+		break;
+
+	case NSKeyUp:
+		ge->any.type = evKeyRelease;
+		fprintf(stderr, "key event type: evKeyUp\n");
+		break;
+
+	default:
+		fprintf(stderr, "non-handled event type: %X\n",
+			type);
+		ge->any.type = emZero;
+		break;
+	}	/* switch */
+
+	/* FIXME: Do labels */
+	ge->key.label = ge->key.sym;
+
+	_giiEvQueueAdd(inp, ge);
+
+	return (1 << ge->any.type);
+}	/* GII_cocoa_handle_kbd */
+
+
+static gii_event_mask GII_cocoa_handle_ptr(gii_input *inp, gii_event *ge,
+					NSEvent *ev)
+{
+#if 0
+	NSPoint *point;
+#endif
+
+	switch ([ ev type ]) {
+	case NSMouseMoved:
+
+		fprintf(stderr, "mouse move event\n");
+
+		_giiEventBlank(ge, sizeof(gii_pmove_event));
+
+#if 0
+		/* This is the code to report absolute
+		 * mouse movement events.
+		 * Unfortunately, I see currently no
+		 * way how to distinguish between
+		 * relative and absolute movements.
+		 * I leave this code, in case that
+		 * this is possible someday...
+		 */
+
+		ge->any.type = evPtrAbsolute;
+
+		point = [ ev mouseLocation ];
+
+		ge->any.origin = inp->origin;
+		ge->any.size = sizeof(gii_pmove_event);
+		ge->pmove.x = (sint32)point->x;
+		ge->pmove.y = (sint32)point->y;
+#endif
+
+		ge->any.type = evPtrRelative;
+
+		ge->any.origin = inp->origin;
+		ge->any.size = sizeof(gii_pmove_event);
+		ge->pmove.x = (sint32)[ ev deltaX ];
+		ge->pmove.y = (sint32)[ ev deltaY ];
+		ge->pmove.z = (sint32)[ ev deltaZ ];
+
+		_giiEvQueueAdd(inp, ge);
+		break;
+
+	case NSScrollWheel:
+		/* pointer move event */
+		_giiEventBlank(ge, sizeof(gii_pmove_event));
+
+		fprintf(stderr, "mouse scrollwheel event\n");
+
+		ge->any.type = evPtrRelative;
+
+		ge->any.origin = inp->origin;
+		ge->any.size = sizeof(gii_pmove_event);
+		ge->pmove.x = [ ev deltaX ];
+		ge->pmove.y = [ ev deltaY ];
+		ge->pmove.z = [ ev deltaZ ];
+		ge->pmove.wheel = [ ev deltaZ ];
+
+		_giiEvQueueAdd(inp, ge);
+		break;
+
+	case NSLeftMouseDown:
+	case NSRightMouseDown:
+	case NSOtherMouseDown:
+
+		fprintf(stderr, "mouse button (%i) down event\n", [ ev buttonNumber]);
+
+		_giiEventBlank(ge, sizeof(gii_pbutton_event));
+		ge->any.type = evPtrButtonPress;
+
+		ge->any.origin = inp->origin;
+		ge->any.size = sizeof(gii_pbutton_event);
+
+		ge->pbutton.button = [ ev buttonNumber ];
+		_giiEvQueueAdd(inp, ge);
+		break;
+
+	case NSLeftMouseUp:
+	case NSRightMouseUp:
+	case NSOtherMouseUp:
+
+		fprintf(stderr, "mouse button (%i) up event\n", [ ev buttonNumber]);
+
+		_giiEventBlank(ge, sizeof(gii_pbutton_event));
+		ge->any.type = evPtrButtonRelease;
+
+		ge->any.origin = inp->origin;
+		ge->any.size = sizeof(gii_pbutton_event);
+
+		ge->pbutton.button = [ ev buttonNumber ];
+		_giiEvQueueAdd(inp, ge);
+		break;
+
+	default:
+		fprintf(stderr, "unknown mouse event = %i\n", [ev type]);
+
+		return emZero;
+	}	/* switch */
+
+	return (1 << ge->any.type);
+}	/* GGI_cocoa_handle_ptr */
+
+
+
+static gii_event_mask GII_cocoa_poll(gii_input *inp, void *arg)
+{
+	cocoa_priv *priv;
+	NSEvent *ev;
+	NSEventType type;
+	gii_event_mask em;
+	gii_event ge;
+
+	priv = COCOA_PRIV(inp);
+
+	em = emZero;
+	for (;;) {
+		ev = CocoaNextEvent(priv);
+		if (ev == nil) break;
+
+		type = [ ev type ];
+
+		switch (type) {
+		case NSKeyDown:
+		case NSKeyUp:
+		case NSFlagsChanged:
+			em |= GII_cocoa_handle_key(inp, &ge, ev);
+			break;
+
+		case NSLeftMouseDown:
+		case NSLeftMouseUp:
+		case NSLeftMouseDragged:
+		case NSRightMouseDown:
+		case NSRightMouseUp:
+		case NSRightMouseDragged:
+		case NSOtherMouseDown:
+		case NSOtherMouseUp:
+		case NSOtherMouseDragged:
+		case NSMouseMoved:
+		case NSScrollWheel:
+			em |= GII_cocoa_handle_ptr(inp, &ge, ev);
+			break;
+
+		case NSMouseEntered:
+		case NSMouseExited:
+		case NSCursorUpdate:
+			em |= emZero;
+			break;
+
+		case NSAppKitDefined:
+			switch ([ ev subtype ]) {
+			case NSWindowExposedEventType:
+				fprintf(stderr, "NSAppKitDefined event: NSWindowExposedEventType\n");
+				break;
+
+			case NSApplicationActivatedEventType:
+				fprintf(stderr, "NSAppKitDefined event: NSApplicationActivatedEventType\n");
+				break;
+
+			case NSApplicationDeactivatedEventType:
+				fprintf(stderr, "NSAppKitDefined event: NSApplicationDeactivatedEventType\n");
+				break;
+
+			case NSWindowMovedEventType:
+				fprintf(stderr, "NSAppKitDefined event: NSWindowMovedEventType\n");
+				break;
+
+			case NSScreenChangedEventType:
+				fprintf(stderr, "NSAppKitDefined event: NSScreenChangedEventType\n");
+				break;
+
+			case NSAWTEventType:
+				fprintf(stderr, "NSAppKitDefined event: NSAWTEventType\n");
+				break;
+
+			default:
+				fprintf(stderr, "unknown NSAppKitDefined event: %i\n",
+					[ ev subtype ]);
+				break;
+
+			}	/* switch */
+			break;
+
+		case NSSystemDefined:
+			switch ([ ev subtype ]) {
+			case NSPowerOffEventType:
+				fprintf(stderr, "NSSystemDefined event: NSPowerOffEventType\n");
+				break;
+
+			default:
+				fprintf(stderr, "unkown NSSystemDefined event: %i\n",
+					[ ev subtype ]);
+				break;					
+			}	/* switch */
+			break;
+
+		default:
+			fprintf(stderr, "non-handled event: %i\n", type);
+			break;
+
+		}	/* switch */
+	}	/* for */
+
+	return em;
+}	/* GII_cocoa_poll */
+
+
+static void send_devinfo(gii_input *inp)
+{
+	gii_event ev;
+	gii_cmddata_getdevinfo *dinfo;
+	int size = sizeof(gii_cmd_nodata_event)+sizeof(gii_cmddata_getdevinfo);
+	
+	_giiEventBlank(&ev, size);
+	
+	ev.any.size = size;
+	ev.any.type = evCommand;
+	ev.any.origin = inp->origin;
+	ev.cmd.code = GII_CMDCODE_GETDEVINFO;
+	
+	dinfo = (gii_cmddata_getdevinfo *)&ev.cmd.data;
+	*dinfo = devinfo;
+	
+	_giiEvQueueAdd(inp, &ev);
+}	/* send_devinfo */
+
+
+static int GII_cocoa_send_event(gii_input *inp, gii_event *ev)
+{
+	if (ev->any.target != inp->origin &&
+	    ev->any.target != GII_EV_TARGET_ALL)
+	{
+		return GGI_EEVNOTARGET;
+	}	/* if */
+	
+	if (ev->any.type != evCommand) {	
+		return GGI_EEVUNKNOWN;
+	}	/* if */
+	
+	if (ev->cmd.code == GII_CMDCODE_GETDEVINFO) {	
+		send_devinfo(inp);
+		return 0;
+	}	/* if */
+	
+	return GGI_EEVUNKNOWN;
+}	/* GGI_cocoa_send_event */
+
+
+static int GII_cocoa_close(gii_input *inp)
+{
+	cocoa_priv *priv = COCOA_PRIV(inp);
+
+	CocoaExit(priv);
+	free(priv);
+
+	GIIDPRINT_MISC("cocoa: exit OK.\n");
+
+	return 0;
+}	/* GII_cocoa_close */
+
+
+int GIIdlinit(gii_input *inp, const char *args, void *argptr)
+{
+	int rc = 0;
+	NSAutoreleasePool *pool;
+	gii_inputcocoa_arg *cocoaarg = argptr;
+	cocoa_priv *priv;
+
+	GIIDPRINT_MISC("cocoa input starting. (args=%s,argptr=%p)\n",
+			args, argptr);
+
+	if ((priv = inp->priv = malloc(sizeof(cocoa_priv))) == NULL) {
+		rc = GGI_ENOMEM;
+		goto err0;
+	}	/* if */
+
+	priv->GIIApp = cocoaarg->GGIApp;
+	priv->window = cocoaarg->window;
+
+	if (_giiRegisterDevice(inp, &devinfo, NULL) == 0) {
+		rc = GGI_ENOMEM;
+		goto err1;
+	}	/* if */
+
+	if (GGI_OK != CocoaInit(priv)) {
+		rc = GGI_ENODEVICE;
+		goto err2;
+	}	/* if */
+
+	inp->targetcan = emKey | emPtrButton | emPtrRelative;
+	inp->curreventmask = emKey | emPtrButton | emPtrRelative;
+	inp->maxfd = 1;
+
+	inp->GIIsendevent = GII_cocoa_send_event;
+	inp->GIIeventpoll = GII_cocoa_poll;
+	inp->GIIclose     = GII_cocoa_close;
+
+	inp->GIIseteventmask(inp, inp->targetcan);
+
+
+	if (GGI_OK != CocoaFinishLaunch(priv)) {
+		rc = GGI_ENODEVICE;
+		goto err2;
+	}	/* if */
+
+	GIIDPRINT_MISC("cocoa input fully up\n");
+
+	return GGI_OK;
+
+err2:
+err1:
+	free(priv);
+err0:
+	return rc;
+}	/* GIIdlinit */
diff -uNr --exclude=CVS libgii/input/cocoa/keysyms.h libgii.macosx/input/cocoa/keysyms.h
--- libgii/input/cocoa/keysyms.h	Thu Jan  1 01:00:00 1970
+++ libgii.macosx/input/cocoa/keysyms.h	Thu Oct 31 18:57:20 2002
@@ -0,0 +1,58 @@
+/* $Id: input.c,v 1.3 2002/10/05 17:22:23 fspacek Exp $
+******************************************************************************
+
+   Input-Quartz: Keyboard symbol definition
+      
+   Copyright (C) 2002 Christoph Egger
+
+   Permission is hereby granted, free of charge, to any person obtaining a
+   copy of this software and associated documentation files (the "Software"),
+   to deal in the Software without restriction, including without limitation
+   the rights to use, copy, modify, merge, publish, distribute, sublicense,
+   and/or sell copies of the Software, and to permit persons to whom the
+   Software is furnished to do so, subject to the following conditions:
+
+   The above copyright notice and this permission notice shall be included in
+   all copies or substantial portions of the Software.
+
+   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+   THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+******************************************************************************
+*/
+
+
+#define NSSymKeypad_0		0x7C
+#define NSSymKeypad_1		0x53
+#define NSSymKeypad_2		0x54
+#define NSSymKeypad_3		0x55
+#define NSSymKeypad_4		0x56
+#define NSSymKeypad_5		0x57
+#define NSSymKeypad_6		0x58
+#define NSSymKeypad_7		0x59
+#define NSSymKeypad_8		0x5B
+#define NSSymKeypad_9		0x5C
+
+#define NSSymKeypadDivide	0x4B
+#define NSSymKeypadMultiply	0x43
+#define NSSymKeypadMinus	0x4E
+#define NSSymKeypadPlus		0x45
+#define NSSymKeypadEnter	0x4C
+#define NSSymKeypadPeriod	0x41
+#define NSSymKeypadEquals	0x51
+
+#define NSSymShiftL		0x38
+#define NSSymShiftR		0x38
+#define NSSymControlL		0x3B
+#define NSSymControlR		0x3B
+#define NSSymAltL		0x3A
+#define NSSymAltR		0x3A
+#define NSSymMetaL		0x37
+#define NSSymMetaR		0x37
+#define NSSymCapslock		0x39
+#define NSSymNumLock		0x47
+#define NSSymScrollLock		0x6B
diff -uNr --exclude=CVS libgii/input/directx/Makefile.in libgii.macosx/input/directx/Makefile.in
--- libgii/input/directx/Makefile.in	Thu Nov 28 01:10:30 2002
+++ libgii.macosx/input/directx/Makefile.in	Thu Nov 28 02:00:15 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/fdselect/Makefile.in libgii.macosx/input/fdselect/Makefile.in
--- libgii/input/fdselect/Makefile.in	Thu Nov 28 01:10:30 2002
+++ libgii.macosx/input/fdselect/Makefile.in	Thu Nov 28 02:00:15 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/file/Makefile.in libgii.macosx/input/file/Makefile.in
--- libgii/input/file/Makefile.in	Thu Nov 28 01:10:31 2002
+++ libgii.macosx/input/file/Makefile.in	Thu Nov 28 02:00:15 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/ipaq_touchscreen/Makefile.in libgii.macosx/input/ipaq_touchscreen/Makefile.in
--- libgii/input/ipaq_touchscreen/Makefile.in	Thu Nov 28 01:10:31 2002
+++ libgii.macosx/input/ipaq_touchscreen/Makefile.in	Thu Nov 28 02:00:16 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/kii/Makefile.in libgii.macosx/input/kii/Makefile.in
--- libgii/input/kii/Makefile.in	Thu Nov 28 01:10:32 2002
+++ libgii.macosx/input/kii/Makefile.in	Thu Nov 28 02:00:16 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/linux_evdev/Makefile.in libgii.macosx/input/linux_evdev/Makefile.in
--- libgii/input/linux_evdev/Makefile.in	Thu Nov 28 01:10:32 2002
+++ libgii.macosx/input/linux_evdev/Makefile.in	Thu Nov 28 02:00:17 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/linux_joy/Makefile.in libgii.macosx/input/linux_joy/Makefile.in
--- libgii/input/linux_joy/Makefile.in	Thu Nov 28 01:10:33 2002
+++ libgii.macosx/input/linux_joy/Makefile.in	Thu Nov 28 02:00:17 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/linux_kbd/Makefile.in libgii.macosx/input/linux_kbd/Makefile.in
--- libgii/input/linux_kbd/Makefile.in	Thu Nov 28 01:10:33 2002
+++ libgii.macosx/input/linux_kbd/Makefile.in	Thu Nov 28 02:00:18 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/linux_mouse/Makefile.in libgii.macosx/input/linux_mouse/Makefile.in
--- libgii/input/linux_mouse/Makefile.in	Thu Nov 28 01:10:34 2002
+++ libgii.macosx/input/linux_mouse/Makefile.in	Thu Nov 28 02:00:18 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/lk201/Makefile.in libgii.macosx/input/lk201/Makefile.in
--- libgii/input/lk201/Makefile.in	Thu Nov 28 01:10:34 2002
+++ libgii.macosx/input/lk201/Makefile.in	Thu Nov 28 02:00:19 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/mouse/Makefile.in libgii.macosx/input/mouse/Makefile.in
--- libgii/input/mouse/Makefile.in	Thu Nov 28 01:10:35 2002
+++ libgii.macosx/input/mouse/Makefile.in	Thu Nov 28 02:00:19 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/null/Makefile.in libgii.macosx/input/null/Makefile.in
--- libgii/input/null/Makefile.in	Thu Nov 28 01:10:35 2002
+++ libgii.macosx/input/null/Makefile.in	Thu Nov 28 02:00:20 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/pcjoy/Makefile.in libgii.macosx/input/pcjoy/Makefile.in
--- libgii/input/pcjoy/Makefile.in	Thu Nov 28 01:10:36 2002
+++ libgii.macosx/input/pcjoy/Makefile.in	Thu Nov 28 02:00:20 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/spaceorb/Makefile.in libgii.macosx/input/spaceorb/Makefile.in
--- libgii/input/spaceorb/Makefile.in	Thu Nov 28 01:10:36 2002
+++ libgii.macosx/input/spaceorb/Makefile.in	Thu Nov 28 02:00:20 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/stdin/Makefile.in libgii.macosx/input/stdin/Makefile.in
--- libgii/input/stdin/Makefile.in	Thu Nov 28 01:10:37 2002
+++ libgii.macosx/input/stdin/Makefile.in	Thu Nov 28 02:00:21 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/tcp/Makefile.in libgii.macosx/input/tcp/Makefile.in
--- libgii/input/tcp/Makefile.in	Thu Nov 28 01:10:37 2002
+++ libgii.macosx/input/tcp/Makefile.in	Thu Nov 28 02:00:21 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/touchscreen/Makefile.in libgii.macosx/input/touchscreen/Makefile.in
--- libgii/input/touchscreen/Makefile.in	Thu Nov 28 01:10:38 2002
+++ libgii.macosx/input/touchscreen/Makefile.in	Thu Nov 28 02:00:22 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/vgl/Makefile.in libgii.macosx/input/vgl/Makefile.in
--- libgii/input/vgl/Makefile.in	Thu Nov 28 01:10:38 2002
+++ libgii.macosx/input/vgl/Makefile.in	Thu Nov 28 02:00:22 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/x/Makefile.in libgii.macosx/input/x/Makefile.in
--- libgii/input/x/Makefile.in	Thu Nov 28 01:10:39 2002
+++ libgii.macosx/input/x/Makefile.in	Thu Nov 28 02:00:23 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/xwin/Makefile.in libgii.macosx/input/xwin/Makefile.in
--- libgii/input/xwin/Makefile.in	Thu Nov 28 01:10:39 2002
+++ libgii.macosx/input/xwin/Makefile.in	Thu Nov 28 02:00:23 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@
diff -uNr --exclude=CVS libgii/input/xwin/xev.c libgii.macosx/input/xwin/xev.c
--- libgii/input/xwin/xev.c	Fri Feb 22 22:51:13 2002
+++ libgii.macosx/input/xwin/xev.c	Thu Jan  1 01:00:00 1970
@@ -1,790 +0,0 @@
-/* $Id: xev.c,v 1.2 2002/02/22 21:51:13 soyt Exp $
-******************************************************************************
-
-   X to GII event conversion - implementation
-
-   Copyright (C) 1998	   Steve Cheng		[steve@ggi-project.org]
-   Copyright (C) 1998-1999 Marcus Sundberg	[marcus@ggi-project.org]
-
-   Permission is hereby granted, free of charge, to any person obtaining a
-   copy of this software and associated documentation files (the "Software"),
-   to deal in the Software without restriction, including without limitation
-   the rights to use, copy, modify, merge, publish, distribute, sublicense,
-   and/or sell copies of the Software, and to permit persons to whom the
-   Software is furnished to do so, subject to the following conditions:
-
-   The above copyright notice and this permission notice shall be included in
-   all copies or substantial portions of the Software.
-
-   THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-   IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-   FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-   THE AUTHOR(S) BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-   IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-   CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-******************************************************************************
-*/
-
-#include "config.h"
-#include "xev.h"
-#include <X11/keysym.h>
-#include <X11/Xutil.h>
-
-#include <ctype.h>
-
-static uint32 basic_trans(KeySym sym, int islabel)
-{
-	if (sym < 256) {  /* Latin1 - map through */
-		if (islabel &&
-		    ((sym >= 'a' && sym <= 'z') ||
-		     (sym >= GIIUC_agrave && sym <= GIIUC_ydiaeresis &&
-		      sym !=  GIIUC_Division))) {
-			return (sym - 0x20);
-		}
-		return sym;
-	}
-		
-	switch(sym) { 
-	case XK_VoidSymbol : return GIIK_VOID;
-
-	case XK_space      : return GIIUC_Space;
-	case XK_BackSpace  : return GIIUC_BackSpace;
-	case XK_Tab        : return GIIUC_Tab;
-	case XK_Clear	   : return GIIK_Clear;
-	case XK_Linefeed   : return GIIUC_Linefeed;
-	case XK_Return     : return GIIUC_Return;
-	case XK_Pause	   : return GIIK_Pause;
-	case XK_Scroll_Lock: return GIIK_ScrollLock;
-	case XK_Sys_Req    : return GIIK_SysRq;
-	case XK_Escape     : return GIIUC_Escape;
-	case XK_Delete     : return GIIUC_Delete;
-
-		/* Japanese Language shifts not yet */
-
-		/* Cursor control & motion */
-	case XK_Home	: return GIIK_Home;
-	case XK_Left    : return GIIK_Left;
-	case XK_Up      : return GIIK_Up;
-	case XK_Right   : return GIIK_Right;
-	case XK_Down    : return GIIK_Down;
-	case XK_Prior	: return GIIK_PageUp;
-	case XK_Next	: return GIIK_PageDown;
-	case XK_End	: return GIIK_End;
-	case XK_Begin	: return GIIK_Begin;
-
-	/* Misc Functions */
-	case XK_Select	: return GIIK_Select;
-	case XK_Print	: return GIIK_PrintScreen;
-	case XK_Execute	: return GIIK_Execute;
-	case XK_Insert	: return GIIK_Insert;
-	case XK_Undo	: return GIIK_Undo;
-	case XK_Redo	: return GIIK_Redo;
-	case XK_Menu	: return GIIK_Menu;
-	case XK_Cancel	: return GIIK_Cancel;
-	case XK_Find	: return GIIK_Find;
-	case XK_Help	: return GIIK_Help;
-	case XK_Break	: return GIIK_Break;
-	case XK_Num_Lock: return GIIK_NumLock;
-	case XK_Multi_key   : return GIIK_Compose;
-
-	case XK_Mode_switch :
-		/* Is this true in all cases? */
-		if (islabel) return GIIK_AltR;
-		else return GIIK_AltGr;
-
-	/* Keypad Functions */
-	case XK_KP_Insert: 
-		if (islabel) return GIIK_P0;
-		else return GIIK_Insert;
-	case XK_KP_End:
-		if (islabel) return GIIK_P1;
-		else return GIIK_End;
-	case XK_KP_Down:
-		if (islabel) return GIIK_P2;
-		else return GIIK_Down;
-	case XK_KP_Page_Down:
-		if (islabel) return GIIK_P3;
-		else return GIIK_PageDown;
-	case XK_KP_Left:
-		if (islabel) return GIIK_P4;
-		else return GIIK_Left;
-	case XK_KP_Begin:
-		if (islabel) return GIIK_P5;
-		else return GIIK_Begin;
-	case XK_KP_Right:
-		if (islabel) return GIIK_P6;
-		else return GIIK_Right;
-	case XK_KP_Home:
-		if (islabel) return GIIK_P7;
-		else return GIIK_Home;
-	case XK_KP_Up:
-		if (islabel) return GIIK_P8;
-		else return GIIK_Up;
-	case XK_KP_Page_Up :
-		if (islabel) return GIIK_P9;
-		else return GIIK_PageUp;
-	case XK_KP_Decimal:
-		if (islabel) return GIIK_PDecimal;
-		else return '.';
-	case XK_KP_Separator:
-		if (islabel) return GIIK_PSeparator;
-		else return ',';
-	case XK_KP_Delete: /* Hmm... */
-		if (islabel) return GIIK_PDecimal;
-		else return GIIUC_Delete;
-
-	case XK_KP_0	: return GIIK_P0;
-	case XK_KP_1	: return GIIK_P1;
-	case XK_KP_2	: return GIIK_P2;
-	case XK_KP_3	: return GIIK_P3;
-	case XK_KP_4	: return GIIK_P4;
-	case XK_KP_5	: return GIIK_P5;
-	case XK_KP_6	: return GIIK_P6;
-	case XK_KP_7	: return GIIK_P7;
-	case XK_KP_8	: return GIIK_P8;
-	case XK_KP_9	: return GIIK_P9;
-
-	case XK_KP_F1	 : return GIIK_PF1;
-	case XK_KP_F2	 : return GIIK_PF2;
-	case XK_KP_F3	 : return GIIK_PF3;
-	case XK_KP_F4	 : return GIIK_PF4;
-
-	case XK_KP_Space : return GIIK_PSpace;
-	case XK_KP_Tab	 : return GIIK_PTab;
-	case XK_KP_Enter : return GIIK_PEnter;
-
-	case XK_KP_Equal : return GIIK_PEqual;
-	case XK_KP_Multiply : return GIIK_PStar;
-	case XK_KP_Add	    : return GIIK_PPlus;
-	case XK_KP_Subtract : return GIIK_PMinus;
-	case XK_KP_Divide: return GIIK_PSlash;
-
-		/* function keys */
-	case XK_F1	: return GIIK_F1;
-	case XK_F2	: return GIIK_F2;
-	case XK_F3	: return GIIK_F3;
-	case XK_F4	: return GIIK_F4;
-	case XK_F5	: return GIIK_F5;
-	case XK_F6	: return GIIK_F6;
-	case XK_F7	: return GIIK_F7;
-	case XK_F8	: return GIIK_F8;
-	case XK_F9	: return GIIK_F9;
-	case XK_F10	: return GIIK_F10;
-	case XK_F11	: return GIIK_F11;
-	case XK_F12	: return GIIK_F12;
-	case XK_F13	: return GIIK_F13;
-	case XK_F14	: return GIIK_F14;
-	case XK_F15	: return GIIK_F15;
-	case XK_F16	: return GIIK_F16;
-	case XK_F17	: return GIIK_F17;
-	case XK_F18	: return GIIK_F18;
-	case XK_F19	: return GIIK_F19;
-	case XK_F20	: return GIIK_F20;
-	case XK_F21	: return GIIK_F21;
-	case XK_F22	: return GIIK_F22;
-	case XK_F23	: return GIIK_F23;
-	case XK_F24	: return GIIK_F24;
-	case XK_F25	: return GIIK_F25;
-	case XK_F26	: return GIIK_F26;
-	case XK_F27	: return GIIK_F27;
-	case XK_F28	: return GIIK_F28;
-	case XK_F29	: return GIIK_F29;
-	case XK_F30	: return GIIK_F30;
-	case XK_F31	: return GIIK_F31;
-	case XK_F32	: return GIIK_F32;
-	case XK_F33	: return GIIK_F33;
-	case XK_F34	: return GIIK_F34;
-	case XK_F35	: return GIIK_F35;
-		
-		/* Modifiers */
-
-	case XK_Shift_L   : return GIIK_ShiftL;
-	case XK_Shift_R   : return GIIK_ShiftR;
-	case XK_Control_L : return GIIK_CtrlL;
-	case XK_Control_R : return GIIK_CtrlR;
-	case XK_Caps_Lock : return GIIK_CapsLock;
-	case XK_Shift_Lock: return GIIK_CapsLock;  /* FIXME (in ggi/keyboard.h)*/
-
-	case XK_Meta_L : return GIIK_MetaL;
-	case XK_Meta_R : return GIIK_MetaR;
-	case XK_Alt_L  : return GIIK_AltL;
-	case XK_Alt_R  : return GIIK_AltR;
-	case XK_Super_L: return GIIK_SuperL;
-	case XK_Super_R: return GIIK_SuperR;
-	case XK_Hyper_L: return GIIK_HyperL;
-	case XK_Hyper_R: return GIIK_HyperR;
-
-#ifdef XK_XKB_KEYS
-	/* Most of theISO 9995 Function and Modifier Keys missing */
-	case XK_dead_grave:		return GIIK_DeadGrave;
-	case XK_dead_acute:		return GIIK_DeadAcute;
-	case XK_dead_circumflex:	return GIIK_DeadCircumflex;
-	case XK_dead_tilde:		return GIIK_DeadTilde;
-	case XK_dead_macron:		return GIIK_DeadMacron;
-	case XK_dead_breve:		return GIIK_DeadBreve;
-	case XK_dead_abovedot:		return GIIK_DeadAboveDot;
-	case XK_dead_diaeresis:		return GIIK_DeadDiaeresis;
-	case XK_dead_abovering:		return GIIK_DeadRing;
-	case XK_dead_doubleacute:	return GIIK_DeadDoubleAcute;
-	case XK_dead_caron:		return GIIK_DeadCaron;
-	case XK_dead_cedilla:		return GIIK_DeadCedilla;
-	case XK_dead_ogonek:		return GIIK_DeadOgonek;
-	case XK_dead_iota:		return GIIK_DeadIota;
-	case XK_dead_voiced_sound:	return GIIK_DeadVoicedSound;
-	case XK_dead_semivoiced_sound:	return GIIK_DeadSemiVoicedSound;
-#ifdef XK_dead_belowdot
-	case XK_dead_belowdot:		return GIIK_DeadBelowDot;
-#endif
-#endif
-
-	/* 3270 Terminal Keys missing */
-
-#ifdef XK_LATIN2
-	case XK_Aogonek		: return 0x0104;
-	case XK_breve		: return 0x02D8;
-	case XK_Lstroke		: return 0x0141;
-	case XK_Lcaron		: return 0x013D;
-	case XK_Sacute		: return 0x015A;
-	case XK_Scaron		: return 0x0160;
-	case XK_Scedilla	: return 0x015E;
-	case XK_Tcaron		: return 0x0164;
-	case XK_Zacute		: return 0x0179;
-	case XK_Zcaron		: return 0x017D;
-	case XK_Zabovedot	: return 0x017B;
-	case XK_aogonek		: return 0x0105;
-	case XK_ogonek		: return 0x02DB;
-	case XK_lstroke		: return 0x0142;
-	case XK_lcaron		: return 0x013E;
-	case XK_sacute		: return 0x015B;
-	case XK_caron		: return 0x02C7;
-	case XK_scaron		: return 0x0161;
-	case XK_scedilla	: return 0x015F;
-	case XK_tcaron		: return 0x0165;
-	case XK_zacute		: return 0x017A;
-	case XK_doubleacute	: return 0x02DD;
-	case XK_zcaron		: return 0x017E;
-	case XK_zabovedot	: return 0x017C;
-	case XK_Racute		: return 0x0154;
-	case XK_Abreve		: return 0x0102;
-	case XK_Lacute		: return 0x0139;
-	case XK_Cacute		: return 0x0106;
-	case XK_Ccaron		: return 0x010C;
-	case XK_Eogonek		: return 0x0118;
-	case XK_Ecaron		: return 0x011A;
-	case XK_Dcaron		: return 0x010E;
-	case XK_Dstroke		: return 0x0110;
-	case XK_Nacute		: return 0x0143;
-	case XK_Ncaron		: return 0x0147;
-	case XK_Odoubleacute	: return 0x0150;
-	case XK_Rcaron		: return 0x0158;
-	case XK_Uring		: return 0x016E;
-	case XK_Udoubleacute	: return 0x0170;
-	case XK_Tcedilla	: return 0x0162;
-	case XK_racute		: return 0x0155;
-	case XK_abreve		: return 0x0103;
-	case XK_lacute		: return 0x013A;
-	case XK_cacute		: return 0x0107;
-	case XK_ccaron		: return 0x010D;
-	case XK_eogonek		: return 0x0119;
-	case XK_ecaron		: return 0x011B;
-	case XK_dcaron		: return 0x010F;
-	case XK_dstroke		: return 0x0111;
-	case XK_nacute		: return 0x0144;
-	case XK_ncaron		: return 0x0148;
-	case XK_odoubleacute	: return 0x0151;
-	case XK_udoubleacute	: return 0x0171;
-	case XK_rcaron		: return 0x0159;
-	case XK_uring		: return 0x016F;
-	case XK_tcedilla	: return 0x0163;
-	case XK_abovedot	: return 0x02D9;
-#endif /* XK_LATIN2 */
-
-#ifdef XK_LATIN3
-	case XK_Hstroke		: return 0x0126;
-	case XK_Hcircumflex	: return 0x0124;
-	case XK_Iabovedot	: return 0x0130;
-	case XK_Gbreve		: return 0x011E;
-	case XK_Jcircumflex	: return 0x0134;
-	case XK_hstroke		: return 0x0127;
-	case XK_hcircumflex	: return 0x0125;
-	case XK_idotless	: return 0x0131;
-	case XK_gbreve		: return 0x011F;
-	case XK_jcircumflex	: return 0x0135;
-	case XK_Cabovedot	: return 0x010A;
-	case XK_Ccircumflex	: return 0x0108;
-	case XK_Gabovedot	: return 0x0120;
-	case XK_Gcircumflex	: return 0x011C;
-	case XK_Ubreve		: return 0x016C;
-	case XK_Scircumflex	: return 0x015C;
-	case XK_cabovedot	: return 0x010B;
-	case XK_ccircumflex	: return 0x0109;
-	case XK_gabovedot	: return 0x0121;
-	case XK_gcircumflex	: return 0x011D;
-	case XK_ubreve		: return 0x016D;
-	case XK_scircumflex	: return 0x015D;
-#endif /* XK_LATIN3 */
-
-#ifdef XK_LATIN4
-	case XK_kra		: return 0x0138;
-	case XK_Rcedilla	: return 0x0156;
-	case XK_Itilde		: return 0x0128;
-	case XK_Lcedilla	: return 0x013B;
-	case XK_Emacron		: return 0x0112;
-	case XK_Gcedilla	: return 0x0122;
-	case XK_Tslash		: return 0x0166;
-	case XK_rcedilla	: return 0x0157;
-	case XK_itilde		: return 0x0129;
-	case XK_lcedilla	: return 0x013C;
-	case XK_emacron		: return 0x0113;
-	case XK_gcedilla	: return 0x0123;
-	case XK_tslash		: return 0x0167;
-	case XK_ENG		: return 0x014A;
-	case XK_eng		: return 0x014B;
-	case XK_Amacron		: return 0x0100;
-	case XK_Iogonek		: return 0x012E;
-	case XK_Eabovedot	: return 0x0116;
-	case XK_Imacron		: return 0x012A;
-	case XK_Ncedilla	: return 0x0145;
-	case XK_Omacron		: return 0x014C;
-	case XK_Kcedilla	: return 0x0136;
-	case XK_Uogonek		: return 0x0172;
-	case XK_Utilde		: return 0x0168;
-	case XK_Umacron		: return 0x016A;
-	case XK_amacron		: return 0x0101;
-	case XK_iogonek		: return 0x012F;
-	case XK_eabovedot	: return 0x0117;
-	case XK_imacron		: return 0x012B;
-	case XK_ncedilla	: return 0x0146;
-	case XK_omacron		: return 0x014D;
-	case XK_kcedilla	: return 0x0137;
-	case XK_uogonek		: return 0x0173;
-	case XK_utilde		: return 0x0169;
-	case XK_umacron		: return 0x016B;
-#endif /* XK_LATIN4 */
-
-#ifdef XK_KATAKANA
-	case XK_overline		: break;
-	case XK_kana_fullstop		: break;
-	case XK_kana_openingbracket	: break;
-	case XK_kana_closingbracket	: break;
-	case XK_kana_comma		: break;
-	case XK_kana_conjunctive	: return 0x30FB;
-	case XK_kana_WO			: return 0x30F2;
-	case XK_kana_a			: return 0x30A1;
-	case XK_kana_i			: return 0x30A3;
-	case XK_kana_u			: return 0x30A5;
-	case XK_kana_e			: return 0x30A7;
-	case XK_kana_o			: return 0x30A9;
-	case XK_kana_ya			: return 0x30E3;
-	case XK_kana_yu			: return 0x30E5;
-	case XK_kana_yo			: return 0x30E7;
-	case XK_kana_tsu		: return 0x30C3;
-	case XK_prolongedsound		: return 0x30FC;
-	case XK_kana_A			: return 0x30A2;
-	case XK_kana_I			: return 0x30A4;
-	case XK_kana_U			: return 0x30A6;
-	case XK_kana_E			: return 0x30A8;
-	case XK_kana_O			: return 0x30AA;
-	case XK_kana_KA			: return 0x30AB;
-	case XK_kana_KI			: return 0x30AD;
-	case XK_kana_KU			: return 0x30AF;
-	case XK_kana_KE			: return 0x30B1;
-	case XK_kana_KO			: return 0x30B3;
-	case XK_kana_SA			: return 0x30B5;
-	case XK_kana_SHI		: break;
-	case XK_kana_SU			: return 0x30B9;
-	case XK_kana_SE			: return 0x30BB;
-	case XK_kana_SO			: return 0x30BD;
-	case XK_kana_TA			: return 0x30BF;
-	case XK_kana_CHI		: return 0x30C1;
-	case XK_kana_TSU		: return 0x30C4;
-	case XK_kana_TE			: return 0x30C6;
-	case XK_kana_TO			: return 0x30C8;
-	case XK_kana_NA			: return 0x30CA;
-	case XK_kana_NI			: return 0x30CB;
-	case XK_kana_NU			: return 0x30CC;
-	case XK_kana_NE			: return 0x30CD;
-	case XK_kana_NO			: return 0x30CE;
-	case XK_kana_HA			: return 0x30CF;
-	case XK_kana_HI			: return 0x30D2;
-	case XK_kana_FU			: return 0x30D5;
-	case XK_kana_HE			: return 0x30D8;
-	case XK_kana_HO			: return 0x30DB;
-	case XK_kana_MA			: return 0x30DE;
-	case XK_kana_MI			: return 0x30DF;
-	case XK_kana_MU			: return 0x30E0;
-	case XK_kana_ME			: return 0x30E1;
-	case XK_kana_MO			: return 0x30E2;
-	case XK_kana_YA			: return 0x30E4;
-	case XK_kana_YU			: return 0x30E6;
-	case XK_kana_YO			: return 0x30E8;
-	case XK_kana_RA			: return 0x30E9;
-	case XK_kana_RI			: return 0x30EA;
-	case XK_kana_RU			: return 0x30EB;
-	case XK_kana_RE			: return 0x30EC;
-	case XK_kana_RO			: return 0x30ED;
-	case XK_kana_WA			: return 0x30EF;
-	case XK_kana_N			: return 0x30F3;
-	case XK_voicedsound		: return 0x309B;
-	case XK_semivoicedsound		: return 0x309C;
-		/* case XK_kana_switch          0xFF7E  Alias for mode_switch */
-#endif /* XK_KATAKANA */
-
-#ifdef XK_ARABIC
-	case XK_Arabic_comma		: return 0x060C;
-	case XK_Arabic_semicolon	: return 0x061B;
-	case XK_Arabic_question_mark	: return 0x061F;
-	case XK_Arabic_hamza		: return 0x0621;
-	case XK_Arabic_maddaonalef	: return 0x0622;
-	case XK_Arabic_hamzaonalef	: return 0x0623;
-	case XK_Arabic_hamzaonwaw	: return 0x0624;
-	case XK_Arabic_hamzaunderalef	: return 0x0625;
-	case XK_Arabic_hamzaonyeh	: return 0x0626;
-	case XK_Arabic_alef		: return 0x0627;
-	case XK_Arabic_beh		: return 0x0628;
-	case XK_Arabic_tehmarbuta	: return 0x0629;
-	case XK_Arabic_teh		: return 0x062a;
-	case XK_Arabic_theh		: return 0x062b;
-	case XK_Arabic_jeem		: return 0x062c;
-	case XK_Arabic_hah		: return 0x062d;
-	case XK_Arabic_khah		: return 0x062e;
-	case XK_Arabic_dal		: return 0x062f;
-	case XK_Arabic_thal		: return 0x0630;
-	case XK_Arabic_ra		: return 0x0631;
-	case XK_Arabic_zain		: return 0x0632;
-	case XK_Arabic_seen		: return 0x0633;
-	case XK_Arabic_sheen		: return 0x0634;
-	case XK_Arabic_sad		: return 0x0635;
-	case XK_Arabic_dad		: return 0x0636;
-	case XK_Arabic_tah		: return 0x0637;
-	case XK_Arabic_zah		: return 0x0638;
-	case XK_Arabic_ain		: return 0x0639;
-	case XK_Arabic_ghain		: return 0x063A;
-	case XK_Arabic_tatweel		: return 0x0640;
-	case XK_Arabic_feh		: return 0x0641;
-	case XK_Arabic_qaf		: return 0x0642;
-	case XK_Arabic_kaf		: return 0x0643;
-	case XK_Arabic_lam		: return 0x0644;
-	case XK_Arabic_meem		: return 0x0645;
-	case XK_Arabic_noon		: return 0x0646;
-	case XK_Arabic_ha		: return 0x0647;
-	case XK_Arabic_waw		: return 0x0648;
-	case XK_Arabic_alefmaksura	: return 0x0649;
-	case XK_Arabic_yeh		: return 0x064A;
-	case XK_Arabic_fathatan		: return 0x064B;
-	case XK_Arabic_dammatan		: return 0x064C;
-	case XK_Arabic_kasratan		: return 0x064D;
-	case XK_Arabic_fatha		: return 0x064E;
-	case XK_Arabic_damma		: return 0x064F;
-	case XK_Arabic_kasra		: return 0x0650;
-	case XK_Arabic_shadda		: return 0x0651;
-	case XK_Arabic_sukun		: return 0x0652;
-		/* case XK_Arabic_switch        0xFF7E  Alias for mode_switch */
-#endif /* XK_ARABIC */
-
-#ifdef XK_CYRILLIC
-	case XK_Serbian_dje	: return 0x0452;
-	case XK_Macedonia_gje	: return 0x0453;
-	case XK_Cyrillic_io	: return 0x0451;
-	case XK_Ukrainian_ie	: return 0x0458;
-	case XK_Macedonia_dse	: return 0x0455;
-	case XK_Ukrainian_i	: return 0x0456;
-	case XK_Ukrainian_yi	: return 0x0457;
-	case XK_Cyrillic_je	: return 0x0454;
-	case XK_Cyrillic_lje	: return 0x0459;
-	case XK_Cyrillic_nje	: return 0x045A;
-	case XK_Serbian_tshe	: return 0x045B;
-	case XK_Macedonia_kje	: return 0x045C;
-	case XK_Byelorussian_shortu : return 0x045E;
-	case XK_Cyrillic_dzhe	: return 0x045F;
-	case XK_numerosign	: return 0x2116;
-	case XK_Serbian_DJE	: return 0x0402;
-	case XK_Macedonia_GJE	: return 0x0403;
-	case XK_Cyrillic_IO	: return 0x042E;
-	case XK_Ukrainian_IE	: return 0x0404;
-	case XK_Macedonia_DSE	: return 0x0405;
-	case XK_Ukrainian_I	: return 0x0406;
-	case XK_Ukrainian_YI	: return 0x0407;
-	case XK_Cyrillic_JE	: return 0x0408;
-	case XK_Cyrillic_LJE	: return 0x0409;
-	case XK_Cyrillic_NJE	: return 0x040A;
-	case XK_Serbian_TSHE	: return 0x040B;
-	case XK_Macedonia_KJE	: return 0x040C;
-	case XK_Byelorussian_SHORTU	: return 0x040E;
-	case XK_Cyrillic_DZHE	: return 0x040F;
-	case XK_Cyrillic_yu	: return 0x044E;
-	case XK_Cyrillic_a	: return 0x0430;
-	case XK_Cyrillic_be	: return 0x0431;
-	case XK_Cyrillic_tse	: return 0x0446;
-	case XK_Cyrillic_de	: return 0x0434;
-	case XK_Cyrillic_ie	: return 0x0435;
-	case XK_Cyrillic_ef	: return 0x0444;
-	case XK_Cyrillic_ghe	: return 0x0433;
-	case XK_Cyrillic_ha	: return 0x0445;
-	case XK_Cyrillic_i	: return 0x0438;
-	case XK_Cyrillic_shorti	: return 0x0439;
-	case XK_Cyrillic_ka	: return 0x043A;
-	case XK_Cyrillic_el	: return 0x043B;
-	case XK_Cyrillic_em	: return 0x043C;
-	case XK_Cyrillic_en	: return 0x043D;
-	case XK_Cyrillic_o	: return 0x043E;
-	case XK_Cyrillic_pe	: return 0x043F;
-	case XK_Cyrillic_ya	: return 0x044F;
-	case XK_Cyrillic_er	: return 0x0440;
-	case XK_Cyrillic_es	: return 0x0441;
-	case XK_Cyrillic_te	: return 0x0442;
-	case XK_Cyrillic_u	: return 0x0443;
-	case XK_Cyrillic_zhe	: return 0x0436;
-	case XK_Cyrillic_ve	: return 0x0432;
-	case XK_Cyrillic_softsign	: return 0x044C;
-	case XK_Cyrillic_yeru	: return 0x044B;
-	case XK_Cyrillic_ze	: return 0x0437;
-	case XK_Cyrillic_sha	: return 0x0448;
-	case XK_Cyrillic_e	: return 0x044D;
-	case XK_Cyrillic_shcha	: return 0x0449;
-	case XK_Cyrillic_che	: return 0x0447;
-	case XK_Cyrillic_hardsign	: return 0x044A;
-
-	case XK_Cyrillic_YU	: return 0x0401;
-	case XK_Cyrillic_A	: return 0x0410;
-	case XK_Cyrillic_BE	: return 0x0411;
-	case XK_Cyrillic_TSE	: return 0x0426;
-	case XK_Cyrillic_DE	: return 0x0414;
-	case XK_Cyrillic_IE	: return 0x0415;
-	case XK_Cyrillic_EF	: return 0x0424;
-	case XK_Cyrillic_GHE	: return 0x0413;
-	case XK_Cyrillic_HA	: return 0x0425;
-	case XK_Cyrillic_I	: return 0x0418;
-	case XK_Cyrillic_SHORTI	: return 0x0419;
-	case XK_Cyrillic_KA	: return 0x041A;
-	case XK_Cyrillic_EL	: return 0x041B;
-	case XK_Cyrillic_EM	: return 0x041C;
-	case XK_Cyrillic_EN	: return 0x041D;
-	case XK_Cyrillic_O	: return 0x041E;
-	case XK_Cyrillic_PE	: return 0x041F;
-	case XK_Cyrillic_YA	: return 0x042F;
-	case XK_Cyrillic_ER	: return 0x0420;
-	case XK_Cyrillic_ES	: return 0x0421;
-	case XK_Cyrillic_TE	: return 0x0422;
-	case XK_Cyrillic_U	: return 0x0423;
-	case XK_Cyrillic_ZHE	: return 0x0416;
-	case XK_Cyrillic_VE	: return 0x0412;
-	case XK_Cyrillic_SOFTSIGN	: return 0x042C;
-	case XK_Cyrillic_YERU	: return 0x042B;
-	case XK_Cyrillic_ZE	: return 0x0417;
-	case XK_Cyrillic_SHA	: return 0x0428;
-	case XK_Cyrillic_E	: return 0x042D;
-	case XK_Cyrillic_SHCHA	: return 0x0429;
-	case XK_Cyrillic_CHE	: return 0x0427;
-	case XK_Cyrillic_HARDSIGN	: return 0x042A;
-#endif
-
-		/* Technical, Special missing*/
-
-	case XK_Greek_ALPHAaccent	: return 0x0386;
-	case XK_Greek_EPSILONaccent	: return 0x0388;
-	case XK_Greek_ETAaccent		: return 0x0389;
-	case XK_Greek_IOTAaccent	: return 0x038A;
-	case XK_Greek_IOTAdiaeresis	: return 0x03AA;
-	case XK_Greek_OMICRONaccent	: return 0x038C;
-	case XK_Greek_UPSILONaccent	: return 0x038E;
-	case XK_Greek_UPSILONdieresis	: return 0x03AB;
-	case XK_Greek_OMEGAaccent	: return 0x038F;
-	case XK_Greek_accentdieresis	: return 0x0385;
-	case XK_Greek_horizbar		: return 0x2015;
-	case XK_Greek_alphaaccent	: return 0x03AC;
-	case XK_Greek_epsilonaccent	: return 0x03AD;
-	case XK_Greek_etaaccent		: return 0x03AE;
-	case XK_Greek_iotaaccent	: return 0x03AF;
-	case XK_Greek_iotadieresis	: return 0x03CA;
-	case XK_Greek_iotaaccentdieresis: return 0x0390;
-	case XK_Greek_omicronaccent	: return 0x03CC;
-	case XK_Greek_upsilonaccent	: return 0x03CD;
-	case XK_Greek_upsilondieresis	: return 0x03CB;
-	case XK_Greek_upsilonaccentdieresis: return 0x03B0;
-	case XK_Greek_omegaaccent	: return 0x03CE;
-	case XK_Greek_ALPHA		: return 0x0391;
-	case XK_Greek_BETA		: return 0x0392;
-	case XK_Greek_GAMMA		: return 0x0393;
-	case XK_Greek_DELTA		: return 0x0394;
-	case XK_Greek_EPSILON		: return 0x0395;
-	case XK_Greek_ZETA		: return 0x0396;
-	case XK_Greek_ETA		: return 0x0397;
-	case XK_Greek_THETA		: return 0x0398;
-	case XK_Greek_IOTA		: return 0x0399;
-	case XK_Greek_KAPPA		: return 0x039A;
-	case XK_Greek_LAMBDA		: return 0x039B;
-	case XK_Greek_MU		: return 0x039C;
-	case XK_Greek_NU		: return 0x039D;
-	case XK_Greek_XI		: return 0x039E;
-	case XK_Greek_OMICRON		: return 0x039F;
-	case XK_Greek_PI		: return 0x03A0;
-	case XK_Greek_RHO		: return 0x03A1;
-	case XK_Greek_SIGMA		: return 0x03A3;
-	case XK_Greek_TAU		: return 0x03A4;
-	case XK_Greek_UPSILON		: return 0x03A5;
-	case XK_Greek_PHI		: return 0x03A6;
-	case XK_Greek_CHI		: return 0x03A7;
-	case XK_Greek_PSI		: return 0x03A8;
-	case XK_Greek_OMEGA		: return 0x03A9;
-	case XK_Greek_alpha		: return 0x03B1;
-	case XK_Greek_beta		: return 0x03B2;
-	case XK_Greek_gamma		: return 0x03B3;
-	case XK_Greek_delta		: return 0x03B4;
-	case XK_Greek_epsilon		: return 0x03B5;
-	case XK_Greek_zeta		: return 0x03B6;
-	case XK_Greek_eta		: return 0x03B7;
-	case XK_Greek_theta		: return 0x03B8;
-	case XK_Greek_iota		: return 0x03B9;
-	case XK_Greek_kappa		: return 0x03BA;
-	case XK_Greek_lambda		: return 0x03BB;
-	case XK_Greek_mu		: return 0x03BC;
-	case XK_Greek_nu		: return 0x03BD;
-	case XK_Greek_xi		: return 0x03BE;
-	case XK_Greek_omicron		: return 0x03BF;
-	case XK_Greek_pi		: return 0x03C0;
-	case XK_Greek_rho		: return 0x03C1;
-	case XK_Greek_sigma		: return 0x03C3;
-	case XK_Greek_finalsmallsigma	: return 0x03C2;
-	case XK_Greek_tau		: return 0x03C4;
-	case XK_Greek_upsilon		: return 0x03C5;
-	case XK_Greek_phi		: return 0x03C6;
-	case XK_Greek_chi		: return 0x03C7;
-	case XK_Greek_psi		: return 0x03C8;
-	case XK_Greek_omega		: return 0x03C9;
-		/* case XK_Greek_switch         0xFF7E  Alias for mode_switch */
-
-		/* Publishing, APL missing*/
-
-#ifdef XK_HEBREW
-	case XK_hebrew_doublelowline: return 0x2017;
-	case XK_hebrew_aleph	: return 0x05D0;
-	case XK_hebrew_bet     	: return 0x05D1;
-	case XK_hebrew_gimel	: return 0x05D2;
-	case XK_hebrew_dalet	: return 0x05D3;
-	case XK_hebrew_he	: return 0x05D4;
-	case XK_hebrew_waw	: return 0x05D5;
-	case XK_hebrew_zain	: return 0x05D6;
-	case XK_hebrew_chet	: return 0x05D7;
-	case XK_hebrew_tet	: return 0x05D8;
-	case XK_hebrew_yod	: return 0x05D9;
-	case XK_hebrew_finalkaph: return 0x05DA;
-	case XK_hebrew_kaph	: return 0x05DB;
-	case XK_hebrew_lamed	: return 0x05DC;
-	case XK_hebrew_finalmem	: return 0x05DD;
-	case XK_hebrew_mem	: return 0x05DE;
-	case XK_hebrew_finalnun	: return 0x05DF;
-	case XK_hebrew_nun	: return 0x05E0;
-	case XK_hebrew_samech	: return 0x05E1;
-	case XK_hebrew_ayin	: return 0x05E2;
-	case XK_hebrew_finalpe	: return 0x05E3;
-	case XK_hebrew_pe	: return 0x05E4;
-	case XK_hebrew_finalzade: return 0x05E5;
-	case XK_hebrew_zade	: return 0x05E6;
-	case XK_hebrew_qoph	: return 0x05E7;
-	case XK_hebrew_resh	: return 0x05E8;
-	case XK_hebrew_shin	: return 0x05E9;
-	case XK_hebrew_taw	: return 0x05EA;
-		/* case XK_Hebrew_switch 0xFF7E  Alias for mode_switch */
-#endif
-		/* Thai, Korean missing*/
-	}
-
-	return GIIK_VOID;
-}
-
-
-int _gii_xev_trans(XKeyEvent *xev, gii_key_event *giiev,
-		   XComposeStatus *compose_status, XIC xic,
-		   unsigned int *oldcode)
-{
-	KeySym xsym;
-	uint32 label, sym = GIIK_VOID, modifiers = 0;
-
-	if (xic) {
-		Status status;
-		char buf[32];
-		int n;
-
-		n = XmbLookupString(xic, xev, buf, 32, &xsym, &status);
-		switch (status) {
-		case XLookupKeySym:
-		case XLookupBoth:
-			sym = basic_trans(xsym, 0);
-			break;
-		case XLookupChars:
-			sym = *buf;
-			break;
-		}
-	} else {
-		XLookupString(xev, NULL, 0, &xsym, compose_status);
-		sym = basic_trans(xsym, 0);
-	}
-
-	if (xev->keycode == 0 && oldcode && *oldcode) {
-		/* Composed key */
-		xev->keycode = *oldcode;
-		giiev->button = *oldcode - 8;
-		*oldcode = 0;
-	}
-	label = basic_trans(XLookupKeysym(xev, 0), 1);
-	
-	if (xev->state & ShiftMask) modifiers |= GII_MOD_SHIFT;
-	if (xev->state & LockMask)  modifiers |= GII_MOD_CAPS;
-	if (xev->state & ControlMask) {
-		modifiers |= GII_MOD_CTRL;
-
-		/* Translate control charactrers */
-		if (sym >= '@' && sym <= '_') {
-			sym -= '@';
-		} else if (sym >= 'a' && sym <= 'z') {
-			sym -= ('a'-1);
-		}
-	}
-	if (xev->state & Mod1Mask) {
-		modifiers |= GII_MOD_ALT;
-		modifiers |= GII_MOD_META;
-	}
-	if (xev->state & Mod2Mask) modifiers |= GII_MOD_NUM;
-	if (xev->state & Mod3Mask) modifiers |= GII_MOD_ALTGR;
-	if (xev->state & Mod5Mask) modifiers |= GII_MOD_SCROLL;
-	
-	if (GII_KTYP(sym) == GII_KT_MOD) {
-		sym &= ~GII_KM_RIGHT;
-	} else if (GII_KTYP(sym) == GII_KT_PAD) {
-		if (GII_KVAL(sym) < 0x80) {
-			sym = GII_KVAL(sym);
-		}
-	} else if (GII_KTYP(sym) == GII_KT_DEAD) {
-		sym = GIIK_VOID;
-	}
-
-	giiev->label = label;
-	giiev->sym = sym;
-	giiev->modifiers = modifiers;
-
-	return 0;
-}
-
-
-uint32 _gii_xev_buttontrans(unsigned int button)
-{
-	switch(button) {
-	/* X assumes a middle button, while GGI goes in order
-	   of availability. */
-	case Button1:
-		return GII_PBUTTON_LEFT;
-	case Button2:
-		return GII_PBUTTON_MIDDLE;
-	case Button3:
-		return GII_PBUTTON_RIGHT;
-	case Button4:
-		return GII_PBUTTON_(4);
-	case Button5:
-		return GII_PBUTTON_(5);
-	}
-
-	return GII_PBUTTON_(button);
-}
-
Binary files libgii/libgii-0.8.2-rc3.tar.bz2 and libgii.macosx/libgii-0.8.2-rc3.tar.bz2 differ
diff -uNr --exclude=CVS libgii/libgii.conf.in libgii.macosx/libgii.conf.in
--- libgii/libgii.conf.in	Sat Oct  5 19:22:23 2002
+++ libgii.macosx/libgii.conf.in	Mon Nov  4 16:39:03 2002
@@ -21,6 +21,7 @@
 input-ipaq-touchscreen		input/ipaq_touchscreen.@DLLEXT@
 input-zaurus-touchscreen	input/zaurus.@DLLEXT@
 input-kii			input/kii.@DLLEXT@
+input-cocoa			input/cocoa.@DLLEXT@
 
 # Aliases
 null				input/null.@DLLEXT@
@@ -41,6 +42,7 @@
 ipaq-ts                         input/ipaq_touchscreen.@DLLEXT@
 zaurus-ts                       input/zaurus.@DLLEXT@
 kii				input/kii.@DLLEXT@
+cocoa				input/cocoa.@DLLEXT@
 
 
 #
diff -uNr --exclude=CVS libgii/m4/Makefile.in libgii.macosx/m4/Makefile.in
--- libgii/m4/Makefile.in	Thu Nov 28 01:10:40 2002
+++ libgii.macosx/m4/Makefile.in	Thu Nov 28 02:00:23 2002
@@ -94,6 +94,9 @@
 LN_S = @LN_S@
 MAINT = @MAINT@
 NETLIBS = @NETLIBS@
+OBJC = @OBJC@
+OBJCDEPMODE = @OBJCDEPMODE@
+OBJCFLAGS = @OBJCFLAGS@
 OBJDUMP = @OBJDUMP@
 PACKAGE = @PACKAGE@
 RANLIB = @RANLIB@