Refactoring configuration for version 5.2.

Perry Werneck
1 parent 197dc506
Showing 22 changed files with 1063 additions and 4594 deletions Show diff stats
.gitignore
autogen.sh
configure.ac
scripts/config.guess
scripts/config.sub
scripts/install-sh
src/actions.cc
src/config.h.in
src/core/actions.cc
src/core/get.cc
src/core/init.cc
src/core/misc.cc
src/core/py3270.cc
src/core/set.cc
src/get.cc
src/include/config.h.in
src/include/py3270.h
src/init.cc
src/misc.cc
src/private.h
@@ -21,4 +21,5 @@ rpm/RPMS
 rpm/SOURCES
 rpm/SPECS
 rpm/SRPMS
-
+scripts
+*.[0-9]
 #!/bin/bash
  
-APPLEVEL="0"
-
 test -n "$srcdir" || srcdir=`dirname "$0"`
 test -n "$srcdir" || srcdir=.
  
 olddir=`pwd`
 cd "$srcdir"
  
-if test -e revision ; then
-	. revision
-fi
-
-touch ChangeLog
-
-# Inicia com os defaults
-TEMPFILE=autogen.tmp
-
-if [ -d .svn ]; then
-
-	# Tenta detectar a versão
-	SVNVERSION=$(which svnversion 2> /dev/null)
-	if test -x "${SVNVERSION}" ; then
-		svnversion | cut -d: -f2 | sed 's@[M|m]@@g' > ${TEMPFILE} 2> /dev/null
-		if [ "$?" == "0" ]; then
-			PACKAGE_REVISION=$(cat ${TEMPFILE})
-		fi
-	fi
-
-	# Tenta detectar a URL
-	SVN=$(which svn 2> /dev/null)
-	if test -x "${SVN}" ; then
-
-		LANG="EN_US" "${SVN}" info > ${TEMPFILE} 2>&1
-		if [ "$?" == "0" ]; then
-			PACKAGE_SOURCE=$(cat ${TEMPFILE} | grep "^URL: " | cut -d" " -f2)
-		fi
-
-	fi
-
-elif [ -d .git ]; then
-
-	# Obtém revisão via git
-	# Referência: http://stackoverflow.com/questions/4120001/what-is-the-git-equivalent-for-revision-number
-
-	# Obtém URL via git
-	PACKAGE_SOURCE=$(git config --get remote.origin.url)
-
-	# Obtém número total de commits
-	PACKAGE_REVISION=$(git rev-list HEAD --count)
-
-fi
-
-
-rm -f $TEMPFILE
-
-if test -z ${PACKAGE_REVISION} ; then
-	echo "Can´t detect package revision, using current date"
-	PACKAGE_REVISION=`date +%y%m%d`
-fi
-
-if test -z ${PACKAGE_SOURCE} ; then
-	echo "Can´t detect package source"
-	exit -1
-fi
-
-#echo "PACKAGE_REVISION=${PACKAGE_REVISION}" > $srcdir/revision
-#echo "PACKAGE_SOURCE=${PACKAGE_SOURCE}" >> $srcdir/revision
-#echo "PACKAGE_LEVEL=${APPLEVEL}" >> $srcdir/revision
-
-#echo "m4_define([SVN_REVISION], ${PACKAGE_REVISION})" > $srcdir/revision.m4
-#echo "m4_define([SVN_URL], ${PACKAGE_SOURCE})" >> $srcdir/revision.m4
-#echo "m4_define([APP_LEVEL], ${APPLEVEL})" >> $srcdir/revision.m4
-
 aclocal
 if test $? != 0 ; then
 	echo "aclocal failed."
@@ -85,10 +18,12 @@ if test $? != 0 ; then
 	exit -1
 fi
  
+mkdir -p scripts
+automake --add-missing 2> /dev/null | true
+
 cd "$olddir"
 test -n "$NOCONFIGURE" || "$srcdir/configure" "$@"
  
-echo "Package set to revision $PACKAGE_REVISION and source $PACKAGE_SOURCE"
  
  
  
@@ -27,11 +27,11 @@ dnl
 dnl Process this file with autoconf to produce a configure script.
  
 dnl The minimum version of autoconf required.
-AC_PREREQ(2.59)
+AC_PREREQ(2.61)
  
 dnl Initialise automake with the package name, version and
 dnl bug-reporting address.
-AC_INIT([python-pw3270], [5.1], [perry.werneck@gmail.com])
+AC_INIT([py3270], [5.2], [perry.werneck@gmail.com])
  
 dnl Place auxilliary scripts here.
 AC_CONFIG_AUX_DIR([scripts])
@@ -40,7 +40,7 @@ dnl Compute the canonical host-system type
 AC_CANONICAL_HOST
  
 dnl Put macro definitions here (though they aren't used).
-AC_CONFIG_HEADER([src/config.h])
+AC_CONFIG_HEADER([src/include/config.h])
  
 dnl Initialise automake stuff.
 AM_INIT_AUTOMAKE
@@ -49,8 +49,8 @@ dnl Check for iconv
 AM_ICONV
  
 dnl Checks for programs.
-AC_PROG_CXX
 AC_PROG_CC
+AC_PROG_CXX
 AC_PROG_SED
 AC_PROG_LN_S
  
@@ -59,123 +59,114 @@ AC_LANG([C++])
 dnl ---------------------------------------------------------------------------
 dnl Initialize defaults
 dnl ---------------------------------------------------------------------------
-DLLFLAGS="-shared -Wl,-soname,\$(@F)"
-DBG_CFLAGS="-DDEBUG=1"
+
+DBG_CFLAGS="-g -fstack-check -DDEBUG=1"
 RLS_CFLAGS="-DNDEBUG=1"
+PLUGINS=""
+APP_RESOURCES=""
+APP_LDFLAGS=""
+DLL_LDFLAGS="-shared -Wl,-soname,\$(@F)"
+DEPENDS=""
  
 dnl ---------------------------------------------------------------------------
-dnl Check for OS specifics
+dnl Version info
 dnl ---------------------------------------------------------------------------
  
-case "$host" in
-	*-mingw32)
-
-		EXEEXT=".exe"
-		DLLPREFIX=""
-		DLLEXT=".dll"
-
-		CFLAGS="$CFLAGS -Wall -Werror -D_WIN32_WINNT=0x0600"
-		LIBS="$LIBS -lws2_32 -lntdll -lwtsapi32"
-
-		;;
+AC_SUBST(PACKAGE_DESCRIPTION,"Python binding for pw3270/lib3270")
  
- 	*)
-		EXEEXT=""
+app_vrs_major=$(echo $VERSION | cut -d. -f1)
+app_vrs_minor=$(echo $VERSION | cut -d. -f2)
  
-		DLLEXT=".so"
+AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_VERSION, $app_vrs_major)
+AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor)
  
-		CFLAGS="$CFLAGS -Wall -Werror"
+AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)
+AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
  
-		# LIBS="-Wl,--no-allow-shlib-undefined,--as-needed,--no-undefined -pthread $LIBS"
-		LIBS="-pthread $LIBS"
+AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%-y`.`date +%-m`.`date +%-d`" ])
  
-esac
+app_rls_major=$(echo $app_cv_release.0.0 | cut -d. -f1)
+app_rls_minor=$(echo $app_cv_release.0.0 | cut -d. -f2)
  
-AC_SUBST(LIBS)
+AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, $app_cv_release)
+AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_RELEASE, $app_rls_major)
+AC_DEFINE_UNQUOTED(PACKAGE_MINOR_RELEASE, $app_rls_minor)
  
-AC_SUBST(DBG_CFLAGS)
-AC_SUBST(RLS_CFLAGS)
+AC_SUBST(PACKAGE_RELEASE,$app_cv_release)
+AC_SUBST(PACKAGE_MAJOR_RELEASE,$app_rls_major)
+AC_SUBST(PACKAGE_MINOR_RELEASE,$app_rls_minor)
  
-AC_SUBST(DBG_LDFLAGS)
-AC_SUBST(RLS_LDFLAGS)
+AC_ARG_WITH([application-datadir], [AS_HELP_STRING([--with-application-datadir], [Set path for configuration file])], [ app_cv_source_appdatadir="$withval" ],[ app_cv_source_appdatadir="\$(datarootdir)/\$(PACKAGE_NAME)" ])
  
-AC_SUBST(EXEEXT)
-AC_SUBST(DLLEXT)
-AC_SUBST(DLLPREFIX)
+AC_DEFINE_UNQUOTED(APPDATADIR, $app_cv_source_appdatadir)
+AC_SUBST(APPDATADIR,$app_cv_source_appdatadir)
  
 dnl ---------------------------------------------------------------------------
-dnl Check for other programs
-dnl ---------------------------------------------------------------------------
-AC_PATH_TOOL([STRIP], [strip])
-AC_PATH_TOOL([RPMBUILD], [rpmbuild], [no])
-AC_PATH_TOOL([MAKENSIS], [makensis], [no])
-AC_PATH_TOOL([VALGRIND], [valgrind], [no])
-AC_PATH_TOOL([WINDRES], [windres], [no])
-AC_PATH_TOOL([ZIP], [zip], [zip])
-AC_PATH_TOOL([FIND], [find], [find])
-AC_PATH_TOOL([AR], [ar], [ar])
-
-PKG_CHECK_EXISTS
-
-dnl ---------------------------------------------------------------------------
-dnl Version info
+dnl Check for OS specifics
 dnl ---------------------------------------------------------------------------
  
-app_vrs_major=$(echo $VERSION | cut -d. -f1)
-app_vrs_minor=$(echo $VERSION | cut -d. -f2)
-
-AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)
-AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
-
-AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_VERSION, $app_vrs_major)
-AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor)
+case "$host" in
+	*-mingw32|*-pc-msys)
+		app_cv_osname="windows"
  
-AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)
-AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
+		CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600"
+		LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32"
+		DLLEXT=".dll"
  
-app_cv_description="Python binding for pw3270/lib3270"
+		app_win32_revision=$(date +%-y.%-m.%-d.%-H)
+		AC_SUBST(WIN32_VERSION,$app_win32_revision)
  
-AC_DEFINE_UNQUOTED(PACKAGE_DESCRIPTION,"$app_cv_description")
-AC_SUBST(PACKAGE_DESCRIPTION,"$app_cv_description")
+		app_win32_file_version=$(date +%-y,%-m,%-d,%-H)
+		AC_SUBST(WIN32_FILE_VERSION,$app_win32_file_version)
  
-dnl ---------------------------------------------------------------------------
-dnl Check for Python
-dnl ---------------------------------------------------------------------------
+dnl		AC_CONFIG_FILES(src/core/windows/resources.rc)
+dnl		AC_CONFIG_FILES(win/py3270.nsi)
  
-PKG_CHECK_MODULES( [PYTHON], [python], AC_DEFINE(HAVE_PYTHON))
+		if test "$host_cpu" = "x86_64"; then
+			app_cv_programfiles="PROGRAMFILES64"
+			app_cv_winarch="64"
+		else
+			app_cv_programfiles="PROGRAMFILES"
+			app_cv_winarch="32"
+		fi
  
-AC_SUBST(PYTHON_LIBS)
-AC_SUBST(PYTHON_CFLAGS)
+		AC_SUBST(PROGRAMFILES,$app_cv_programfiles)
+		AC_SUBST(WINARCH,$app_cv_winarch)
+                AC_SUBST(SONAME,py3270.dll)
  
-dnl ---------------------------------------------------------------------------
-dnl Check for D-Bus
-dnl ---------------------------------------------------------------------------
+		;;
  
-PKG_CHECK_MODULES( [DBUS], [dbus-1], AC_DEFINE(HAVE_DBUS), AC_MSG_NOTICE([ No DBUS support.]) )
-AC_SUBST(DBUS_LIBS)
-AC_SUBST(DBUS_CFLAGS)
+ 	*)
+		CFLAGS="$CFLAGS -pthread"
+		LDFLAGS="$LDFLAGS -pthread"
+		app_cv_datadir="/usr/share"
+		app_cv_confdir="/etc"
+		app_cv_osname="linux"
+		LOGDIR="/var/log"
+		DLLEXT=".so"
+                AC_SUBST(SONAME,py3270.so.$app_vrs_major.$app_vrs_minor)
  
-dnl ---------------------------------------------------------------------------
-dnl Check for integer types & library functions
-dnl ---------------------------------------------------------------------------
+esac
  
-AC_CHECK_TYPES([pid_t, uint8_t, uint16_t, uint32_t, int32_t, uint64_t, int64_t])
-AC_CHECK_FUNCS(srandom random getopt asprintf vasprintf)
-AC_CHECK_FUNCS(getaddrinfo sendfile poll eventfd statfs64)
+AC_SUBST(DATADIR,$app_cv_datadir)
+AC_SUBST(CONFDIR,$app_cv_confdir)
+AC_SUBST(OSNAME,$app_cv_osname)
+AC_SUBST(LIBS)
+AC_SUBST(LOGDIR)
+AC_SUBST(DLLEXT)
+AC_SUBST(DLLPREFIX)
+AC_SUBST(LDFLAGS)
+AC_SUBST(DLL_LDFLAGS)
  
 dnl ---------------------------------------------------------------------------
-dnl Check for libintl
+dnl Check for other programs
 dnl ---------------------------------------------------------------------------
  
-AC_PATH_TOOL([XGETTEXT], [xgettext], [no])
-AC_PATH_TOOL([MSGCAT], [msgcat], [no])
-AC_PATH_TOOL([MSGINIT], [msginit], [no])
-AC_PATH_TOOL([MSGMERGE], [msgmerge], [no])
-AC_PATH_TOOL([MSGFMT], [msgfmt], [no])
+AC_PATH_TOOL([AR], [ar], [ar])
+AC_PATH_TOOL([WINDRES], [windres], [no])
+AC_PATH_TOOL([VALGRIND], [valgrind], [no])
  
-AC_CHECK_HEADER(libintl.h, [
-	AC_DEFINE(HAVE_LIBINTL, 1)
-])
+PKG_CHECK_EXISTS
  
 dnl ---------------------------------------------------------------------------
 dnl Check for C++ 2011 support
@@ -199,118 +190,95 @@ AS_VAR_POPDEF([CACHEVAR])dnl
 AX_CHECK_COMPILE_FLAG([-std=gnu++11], [CFLAGS="$CFLAGS -std=gnu++11"])
  
 dnl ---------------------------------------------------------------------------
-dnl Check for ELF symbol visibility support
+dnl Check for IPC3270
 dnl ---------------------------------------------------------------------------
-m4_define([GLIB_CHECK_COMPILE_WARNINGS],
-[m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])dnl
-rm -f conftest.$ac_objext
-glib_ac_compile_save="$ac_compile"
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext'
-AS_IF([_AC_EVAL_STDERR($ac_compile) &&
-         AC_TRY_COMMAND([(if test -s conftest.err; then false ; else true; fi)])],
-      [$2],
-      [echo "$as_me: failed program was:" >&AS_MESSAGE_LOG_FD
-cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD
-m4_ifvaln([$3],[$3])dnl])
-ac_compile="$glib_ac_compile_save"
-rm -f conftest.$ac_objext conftest.err m4_ifval([$1], [conftest.$ac_ext])[]dnl
-])# GLIB_CHECK_COMPILE_WARNINGS
-
-AC_MSG_CHECKING(for GNUC visibility attribute)
-GLIB_CHECK_COMPILE_WARNINGS([
-void
-__attribute__ ((visibility ("hidden")))
-     f_hidden (void)
-{
-}
-void
-__attribute__ ((visibility ("internal")))
-     f_internal (void)
-{
-}
-void
-__attribute__ ((visibility ("protected")))
-     f_protected (void)
-{
-}
-void
-__attribute__ ((visibility ("default")))
-     f_default (void)
-{
-}
-int main (int argc, char **argv)
-{
-        f_hidden();
-        f_internal();
-        f_protected();
-        f_default();
-        return 0;
-}
-],g_have_gnuc_visibility=yes,g_have_gnuc_visibility=no)
-AC_MSG_RESULT($g_have_gnuc_visibility)
-if test x$g_have_gnuc_visibility = xyes; then
-  AC_DEFINE(HAVE_GNUC_VISIBILITY, 1, [supports GCC visibility attributes])
+
+AC_ARG_WITH([static-ipc3270],
+        [AS_HELP_STRING([--with-static-ipc3270], [Uses static version of ipc3270])],
+[
+	app_cv_static_ipc3270=$withval
+],[
+	app_cv_static_ipc3270="auto"
+])
+
+if test "$app_cv_static_ipc3270" == "auto"; then
+	case "$host" in
+	*-mingw32|*-pc-msys)
+		app_cv_static_ipc3270="yes"
+		;;
+
+	*)
+		app_cv_static_ipc3270="no"
+
+	esac
+
+fi
+
+if test "$app_cv_static_ipc3270" == "yes"; then
+	LDFLAGS="-static -static-libgcc -static-libstdc++ $LDFLAGS"
+	PKG_CHECK_MODULES( [IPC3270], [ipc3270-static], AC_DEFINE(USING_STATIC_IPC3270), AC_MSG_ERROR([IPC3270 not present.]))
+else
+	PKG_CHECK_MODULES( [IPC3270], [ipc3270], AC_DEFINE(USING_SHARED_IPC3270), AC_MSG_ERROR([IPC3270 not present.]))
 fi
  
+AC_SUBST(IPC3270_LIBS)
+AC_SUBST(IPC3270_CFLAGS)
+
+AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product name])], [ app_cv_product="$withval" ],[ app_cv_product=`pkg-config --variable=product_name ipc3270` ])
+AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product)
+AC_SUBST(PRODUCT_NAME,$app_cv_product)
+
 dnl ---------------------------------------------------------------------------
-dnl Check for compiler visibility flag
+dnl Check for Python
 dnl ---------------------------------------------------------------------------
-dnl AC_MSG_CHECKING(whether $CC accepts -fvisibility=hidden)
-dnl AC_CACHE_VAL(app_cv_fvisibility_ok,
-dnl [ac_save_cc="$CC"
-dnl CC="$CC -fvisibility=hidden"
-dnl AC_TRY_RUN([int main() { return 0; }],
-dnl   app_cv_fvisibility_ok=yes,
-dnl   app_cv_fvisibility_ok=no,
-dnl   app_cv_fvisibility_ok=no)
-dnl CC="$ac_save_cc"])
-dnl AC_MSG_RESULT($app_cv_fvisibility_ok)
-dnl if test $app_cv_fvisibility_ok = yes; then
-dnl   CFLAGS="$CFLAGS -fvisibility=hidden"
-dnl fi
+
+PKG_CHECK_MODULES( [PYTHON], [python], AC_DEFINE(HAVE_PYTHON), AC_MSG_ERROR([Python devel is unavailable]))
+
+AC_SUBST(PYTHON_LIBS)
+AC_SUBST(PYTHON_CFLAGS)
+
  
 dnl ---------------------------------------------------------------------------
 dnl Check for pic
 dnl ---------------------------------------------------------------------------
+
 AC_ARG_ENABLE([pic],
 	[AS_HELP_STRING([--disable-pic], [disable support for PIC libraries (required to compile on 64bits)])],
 [
 	app_cv_pic="$enableval"
 ],[
  
-	case "$host" in
-		*-mingw32)
-			app_cv_pic="no"
-			;;
+	case "$host_cpu" in
+	x86_64)
+		app_cv_pic="yes"
+		;;
+
+	aarch64)
+		app_cv_pic="yes"
+		;;
  
 	*)
-		if test "$host_cpu" = "x86_64"; then
-			app_cv_pic="yes"
-		else
-			app_cv_pic="no"
-		fi
+		app_cv_pic="no"
 	esac
+
 ])
  
 if test "$app_cv_pic" == "yes"; then
 	CFLAGS="$CFLAGS -fPIC"
+	CXXFLAGS="$CXXFLAGS -fPIC"
 fi
  
 dnl ---------------------------------------------------------------------------
-dnl Output config
-dnl ---------------------------------------------------------------------------
-
-AC_SUBST(BASEDIR,$ac_pwd)
-
-dnl ---------------------------------------------------------------------------
 dnl Configure which files to generate.
 dnl ---------------------------------------------------------------------------
  
-AC_CONFIG_FILES(Makefile)
+# AC_CONFIG_FILES(Makefile)
  
 dnl ---------------------------------------------------------------------------
 dnl Output the generated config.status script.
 dnl ---------------------------------------------------------------------------
+AC_SUBST(BASEDIR,$ac_pwd)
+
 AC_OUTPUT
  
  
@@ -1,1526 +0,0 @@
-#! /bin/sh
-# Attempt to guess a canonical system name.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
-
-timestamp='2008-01-23'
-
-# This file is free software; you can redistribute it and/or modify it
-# under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Originally written by Per Bothner <per@bothner.com>.
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# This script attempts to guess a canonical system name similar to
-# config.sub.  If it succeeds, it prints the system name on stdout, and
-# exits with 0.  Otherwise, it exits with 1.
-#
-# The plan is that this can be called by configure scripts if you
-# don't specify an explicit build system type.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION]
-
-Output the configuration name of the system \`$me' is run on.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.guess ($timestamp)
-
-Originally written by Per Bothner.
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help" >&2
-       exit 1 ;;
-    * )
-       break ;;
-  esac
-done
-
-if test $# != 0; then
-  echo "$me: too many arguments$help" >&2
-  exit 1
-fi
-
-trap 'exit 1' 1 2 15
-
-# CC_FOR_BUILD -- compiler used by this script. Note that the use of a
-# compiler to aid in system detection is discouraged as it requires
-# temporary files to be created and, as you can see below, it is a
-# headache to deal with in a portable fashion.
-
-# Historically, `CC_FOR_BUILD' used to be named `HOST_CC'. We still
-# use `HOST_CC' if defined, but it is deprecated.
-
-# Portable tmp directory creation inspired by the Autoconf team.
-
-set_cc_for_build='
-trap "exitcode=\$?; (rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null) && exit \$exitcode" 0 ;
-trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
-: ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
- { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
- { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
- { echo "$me: cannot create a temporary directory in $TMPDIR" >&2 ; exit 1 ; } ;
-dummy=$tmp/dummy ;
-tmpfiles="$dummy.c $dummy.o $dummy.rel $dummy" ;
-case $CC_FOR_BUILD,$HOST_CC,$CC in
- ,,)    echo "int x;" > $dummy.c ;
-	for c in cc gcc c89 c99 ; do
-	  if ($c -c -o $dummy.o $dummy.c) >/dev/null 2>&1 ; then
-	     CC_FOR_BUILD="$c"; break ;
-	  fi ;
-	done ;
-	if test x"$CC_FOR_BUILD" = x ; then
-	  CC_FOR_BUILD=no_compiler_found ;
-	fi
-	;;
- ,,*)   CC_FOR_BUILD=$CC ;;
- ,*,*)  CC_FOR_BUILD=$HOST_CC ;;
-esac ; set_cc_for_build= ;'
-
-# This is needed to find uname on a Pyramid OSx when run in the BSD universe.
-# (ghazi@noc.rutgers.edu 1994-08-24)
-if (test -f /.attbin/uname) >/dev/null 2>&1 ; then
-	PATH=$PATH:/.attbin ; export PATH
-fi
-
-UNAME_MACHINE=`(uname -m) 2>/dev/null` || UNAME_MACHINE=unknown
-UNAME_RELEASE=`(uname -r) 2>/dev/null` || UNAME_RELEASE=unknown
-UNAME_SYSTEM=`(uname -s) 2>/dev/null`  || UNAME_SYSTEM=unknown
-UNAME_VERSION=`(uname -v) 2>/dev/null` || UNAME_VERSION=unknown
-
-# Note: order is significant - the case branches are not exclusive.
-
-case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
-    *:NetBSD:*:*)
-	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
-	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
-	# switched to ELF, *-*-netbsd* would select the old
-	# object file format.  This provides both forward
-	# compatibility and a consistent mechanism for selecting the
-	# object file format.
-	#
-	# Note: NetBSD doesn't particularly care about the vendor
-	# portion of the name.  We always set it to "unknown".
-	sysctl="sysctl -n hw.machine_arch"
-	UNAME_MACHINE_ARCH=`(/sbin/$sysctl 2>/dev/null || \
-	    /usr/sbin/$sysctl 2>/dev/null || echo unknown)`
-	case "${UNAME_MACHINE_ARCH}" in
-	    armeb) machine=armeb-unknown ;;
-	    arm*) machine=arm-unknown ;;
-	    sh3el) machine=shl-unknown ;;
-	    sh3eb) machine=sh-unknown ;;
-	    sh5el) machine=sh5le-unknown ;;
-	    *) machine=${UNAME_MACHINE_ARCH}-unknown ;;
-	esac
-	# The Operating System including object format, if it has switched
-	# to ELF recently, or will in the future.
-	case "${UNAME_MACHINE_ARCH}" in
-	    arm*|i386|m68k|ns32k|sh3*|sparc|vax)
-		eval $set_cc_for_build
-		if echo __ELF__ | $CC_FOR_BUILD -E - 2>/dev/null \
-			| grep __ELF__ >/dev/null
-		then
-		    # Once all utilities can be ECOFF (netbsdecoff) or a.out (netbsdaout).
-		    # Return netbsd for either.  FIX?
-		    os=netbsd
-		else
-		    os=netbsdelf
-		fi
-		;;
-	    *)
-	        os=netbsd
-		;;
-	esac
-	# The OS release
-	# Debian GNU/NetBSD machines have a different userland, and
-	# thus, need a distinct triplet. However, they do not need
-	# kernel version information, so it can be replaced with a
-	# suitable tag, in the style of linux-gnu.
-	case "${UNAME_VERSION}" in
-	    Debian*)
-		release='-gnu'
-		;;
-	    *)
-		release=`echo ${UNAME_RELEASE}|sed -e 's/[-_].*/\./'`
-		;;
-	esac
-	# Since CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM:
-	# contains redundant information, the shorter form:
-	# CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM is used.
-	echo "${machine}-${os}${release}"
-	exit ;;
-    *:OpenBSD:*:*)
-	UNAME_MACHINE_ARCH=`arch | sed 's/OpenBSD.//'`
-	echo ${UNAME_MACHINE_ARCH}-unknown-openbsd${UNAME_RELEASE}
-	exit ;;
-    *:ekkoBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
-	exit ;;
-    *:SolidBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
-	exit ;;
-    macppc:MirBSD:*:*)
-	echo powerpc-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    *:MirBSD:*:*)
-	echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
-	exit ;;
-    alpha:OSF1:*:*)
-	case $UNAME_RELEASE in
-	*4.0)
-		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
-		;;
-	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
-		;;
-	esac
-	# According to Compaq, /usr/sbin/psrinfo has been available on
-	# OSF/1 and Tru64 systems produced since 1995.  I hope that
-	# covers most systems running today.  This code pipes the CPU
-	# types through head -n 1, so we only detect the type of CPU 0.
-	ALPHA_CPU_TYPE=`/usr/sbin/psrinfo -v | sed -n -e 's/^  The alpha \(.*\) processor.*$/\1/p' | head -n 1`
-	case "$ALPHA_CPU_TYPE" in
-	    "EV4 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV4.5 (21064)")
-		UNAME_MACHINE="alpha" ;;
-	    "LCA4 (21066/21068)")
-		UNAME_MACHINE="alpha" ;;
-	    "EV5 (21164)")
-		UNAME_MACHINE="alphaev5" ;;
-	    "EV5.6 (21164A)")
-		UNAME_MACHINE="alphaev56" ;;
-	    "EV5.6 (21164PC)")
-		UNAME_MACHINE="alphapca56" ;;
-	    "EV5.7 (21164PC)")
-		UNAME_MACHINE="alphapca57" ;;
-	    "EV6 (21264)")
-		UNAME_MACHINE="alphaev6" ;;
-	    "EV6.7 (21264A)")
-		UNAME_MACHINE="alphaev67" ;;
-	    "EV6.8CB (21264C)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8AL (21264B)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.8CX (21264D)")
-		UNAME_MACHINE="alphaev68" ;;
-	    "EV6.9A (21264/EV69A)")
-		UNAME_MACHINE="alphaev69" ;;
-	    "EV7 (21364)")
-		UNAME_MACHINE="alphaev7" ;;
-	    "EV7.9 (21364A)")
-		UNAME_MACHINE="alphaev79" ;;
-	esac
-	# A Pn.n version is a patched version.
-	# A Vn.n version is a released version.
-	# A Tn.n version is a released field test version.
-	# A Xn.n version is an unreleased experimental baselevel.
-	# 1.2 uses "1.2" for uname -r.
-	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
-    Alpha\ *:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# Should we change UNAME_MACHINE based on the output of uname instead
-	# of the specific Alpha model?
-	echo alpha-pc-interix
-	exit ;;
-    21064:Windows_NT:50:3)
-	echo alpha-dec-winnt3.5
-	exit ;;
-    Amiga*:UNIX_System_V:4.0:*)
-	echo m68k-unknown-sysv4
-	exit ;;
-    *:[Aa]miga[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-amigaos
-	exit ;;
-    *:[Mm]orph[Oo][Ss]:*:*)
-	echo ${UNAME_MACHINE}-unknown-morphos
-	exit ;;
-    *:OS/390:*:*)
-	echo i370-ibm-openedition
-	exit ;;
-    *:z/VM:*:*)
-	echo s390-ibm-zvmoe
-	exit ;;
-    *:OS400:*:*)
-        echo powerpc-ibm-os400
-	exit ;;
-    arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
-	echo arm-acorn-riscix${UNAME_RELEASE}
-	exit ;;
-    arm:riscos:*:*|arm:RISCOS:*:*)
-	echo arm-unknown-riscos
-	exit ;;
-    SR2?01:HI-UX/MPP:*:* | SR8000:HI-UX/MPP:*:*)
-	echo hppa1.1-hitachi-hiuxmpp
-	exit ;;
-    Pyramid*:OSx*:*:* | MIS*:OSx*:*:* | MIS*:SMP_DC-OSx*:*:*)
-	# akee@wpdis03.wpafb.af.mil (Earle F. Ake) contributed MIS and NILE.
-	if test "`(/bin/universe) 2>/dev/null`" = att ; then
-		echo pyramid-pyramid-sysv3
-	else
-		echo pyramid-pyramid-bsd
-	fi
-	exit ;;
-    NILE*:*:*:dcosx)
-	echo pyramid-pyramid-svr4
-	exit ;;
-    DRS?6000:unix:4.0:6*)
-	echo sparc-icl-nx6
-	exit ;;
-    DRS?6000:UNIX_SV:4.2*:7* | DRS?6000:isis:4.2*:7*)
-	case `/usr/bin/uname -p` in
-	    sparc) echo sparc-icl-nx7; exit ;;
-	esac ;;
-    sun4H:SunOS:5.*:*)
-	echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*)
-	echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    i86pc:SunOS:5.*:* | i86xen:SunOS:5.*:*)
-	echo i386-pc-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:6*:*)
-	# According to config.sub, this is the proper way to canonicalize
-	# SunOS6.  Hard to guess exactly what SunOS6 will be like, but
-	# it's likely to be more like Solaris than SunOS4.
-	echo sparc-sun-solaris3`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    sun4*:SunOS:*:*)
-	case "`/usr/bin/arch -k`" in
-	    Series*|S4*)
-		UNAME_RELEASE=`uname -v`
-		;;
-	esac
-	# Japanese Language versions have a version number like `4.1.3-JL'.
-	echo sparc-sun-sunos`echo ${UNAME_RELEASE}|sed -e 's/-/_/'`
-	exit ;;
-    sun3*:SunOS:*:*)
-	echo m68k-sun-sunos${UNAME_RELEASE}
-	exit ;;
-    sun*:*:4.2BSD:*)
-	UNAME_RELEASE=`(sed 1q /etc/motd | awk '{print substr($5,1,3)}') 2>/dev/null`
-	test "x${UNAME_RELEASE}" = "x" && UNAME_RELEASE=3
-	case "`/bin/arch`" in
-	    sun3)
-		echo m68k-sun-sunos${UNAME_RELEASE}
-		;;
-	    sun4)
-		echo sparc-sun-sunos${UNAME_RELEASE}
-		;;
-	esac
-	exit ;;
-    aushp:SunOS:*:*)
-	echo sparc-auspex-sunos${UNAME_RELEASE}
-	exit ;;
-    # The situation for MiNT is a little confusing.  The machine name
-    # can be virtually everything (everything which is not
-    # "atarist" or "atariste" at least should have a processor
-    # > m68000).  The system name ranges from "MiNT" over "FreeMiNT"
-    # to the lowercase version "mint" (or "freemint").  Finally
-    # the system name "TOS" denotes a system which is actually not
-    # MiNT.  But MiNT is downward compatible to TOS, so this should
-    # be no problem.
-    atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
-	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
-    *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
-	exit ;;
-    milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
-    hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
-    *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
-    m68k:machten:*:*)
-	echo m68k-apple-machten${UNAME_RELEASE}
-	exit ;;
-    powerpc:machten:*:*)
-	echo powerpc-apple-machten${UNAME_RELEASE}
-	exit ;;
-    RISC*:Mach:*:*)
-	echo mips-dec-mach_bsd4.3
-	exit ;;
-    RISC*:ULTRIX:*:*)
-	echo mips-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    VAX*:ULTRIX*:*:*)
-	echo vax-dec-ultrix${UNAME_RELEASE}
-	exit ;;
-    2020:CLIX:*:* | 2430:CLIX:*:*)
-	echo clipper-intergraph-clix${UNAME_RELEASE}
-	exit ;;
-    mips:*:*:UMIPS | mips:*:*:RISCos)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-#ifdef __cplusplus
-#include <stdio.h>  /* for printf() prototype */
-	int main (int argc, char *argv[]) {
-#else
-	int main (argc, argv) int argc; char *argv[]; {
-#endif
-	#if defined (host_mips) && defined (MIPSEB)
-	#if defined (SYSTYPE_SYSV)
-	  printf ("mips-mips-riscos%ssysv\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_SVR4)
-	  printf ("mips-mips-riscos%ssvr4\n", argv[1]); exit (0);
-	#endif
-	#if defined (SYSTYPE_BSD43) || defined(SYSTYPE_BSD)
-	  printf ("mips-mips-riscos%sbsd\n", argv[1]); exit (0);
-	#endif
-	#endif
-	  exit (-1);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c &&
-	  dummyarg=`echo "${UNAME_RELEASE}" | sed -n 's/\([0-9]*\).*/\1/p'` &&
-	  SYSTEM_NAME=`$dummy $dummyarg` &&
-	    { echo "$SYSTEM_NAME"; exit; }
-	echo mips-mips-riscos${UNAME_RELEASE}
-	exit ;;
-    Motorola:PowerMAX_OS:*:*)
-	echo powerpc-motorola-powermax
-	exit ;;
-    Motorola:*:4.3:PL8-*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:*:*:PowerMAX_OS | Synergy:PowerMAX_OS:*:*)
-	echo powerpc-harris-powermax
-	exit ;;
-    Night_Hawk:Power_UNIX:*:*)
-	echo powerpc-harris-powerunix
-	exit ;;
-    m88k:CX/UX:7*:*)
-	echo m88k-harris-cxux7
-	exit ;;
-    m88k:*:4*:R4*)
-	echo m88k-motorola-sysv4
-	exit ;;
-    m88k:*:3*:R3*)
-	echo m88k-motorola-sysv3
-	exit ;;
-    AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
-	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
-	then
-	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
-	       [ ${TARGET_BINARY_INTERFACE}x = x ]
-	    then
-		echo m88k-dg-dgux${UNAME_RELEASE}
-	    else
-		echo m88k-dg-dguxbcs${UNAME_RELEASE}
-	    fi
-	else
-	    echo i586-dg-dgux${UNAME_RELEASE}
-	fi
- 	exit ;;
-    M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
-	echo m88k-dolphin-sysv3
-	exit ;;
-    M88*:*:R3*:*)
-	# Delta 88k system running SVR3
-	echo m88k-motorola-sysv3
-	exit ;;
-    XD88*:*:*:*) # Tektronix XD88 system running UTekV (SVR3)
-	echo m88k-tektronix-sysv3
-	exit ;;
-    Tek43[0-9][0-9]:UTek:*:*) # Tektronix 4300 system running UTek (BSD)
-	echo m68k-tektronix-bsd
-	exit ;;
-    *:IRIX*:*:*)
-	echo mips-sgi-irix`echo ${UNAME_RELEASE}|sed -e 's/-/_/g'`
-	exit ;;
-    ????????:AIX?:[12].1:2)   # AIX 2.2.1 or AIX 2.1.1 is RT/PC AIX.
-	echo romp-ibm-aix     # uname -m gives an 8 hex-code CPU id
-	exit ;;               # Note that: echo "'`uname -s`'" gives 'AIX '
-    i*86:AIX:*:*)
-	echo i386-ibm-aix
-	exit ;;
-    ia64:AIX:*:*)
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${UNAME_MACHINE}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:2:3)
-	if grep bos325 /usr/include/stdio.h >/dev/null 2>&1; then
-		eval $set_cc_for_build
-		sed 's/^		//' << EOF >$dummy.c
-		#include <sys/systemcfg.h>
-
-		main()
-			{
-			if (!__power_pc())
-				exit(1);
-			puts("powerpc-ibm-aix3.2.5");
-			exit(0);
-			}
-EOF
-		if $CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy`
-		then
-			echo "$SYSTEM_NAME"
-		else
-			echo rs6000-ibm-aix3.2.5
-		fi
-	elif grep bos324 /usr/include/stdio.h >/dev/null 2>&1; then
-		echo rs6000-ibm-aix3.2.4
-	else
-		echo rs6000-ibm-aix3.2
-	fi
-	exit ;;
-    *:AIX:*:[456])
-	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
-	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
-		IBM_ARCH=rs6000
-	else
-		IBM_ARCH=powerpc
-	fi
-	if [ -x /usr/bin/oslevel ] ; then
-		IBM_REV=`/usr/bin/oslevel`
-	else
-		IBM_REV=${UNAME_VERSION}.${UNAME_RELEASE}
-	fi
-	echo ${IBM_ARCH}-ibm-aix${IBM_REV}
-	exit ;;
-    *:AIX:*:*)
-	echo rs6000-ibm-aix
-	exit ;;
-    ibmrt:4.4BSD:*|romp-ibm:BSD:*)
-	echo romp-ibm-bsd4.4
-	exit ;;
-    ibmrt:*BSD:*|romp-ibm:BSD:*)            # covers RT/PC BSD and
-	echo romp-ibm-bsd${UNAME_RELEASE}   # 4.3 with uname added to
-	exit ;;                             # report: romp-ibm BSD 4.3
-    *:BOSX:*:*)
-	echo rs6000-bull-bosx
-	exit ;;
-    DPX/2?00:B.O.S.:*:*)
-	echo m68k-bull-sysv3
-	exit ;;
-    9000/[34]??:4.3bsd:1.*:*)
-	echo m68k-hp-bsd
-	exit ;;
-    hp300:4.4BSD:*:* | 9000/[34]??:4.3bsd:2.*:*)
-	echo m68k-hp-bsd4.4
-	exit ;;
-    9000/[34678]??:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	case "${UNAME_MACHINE}" in
-	    9000/31? )            HP_ARCH=m68000 ;;
-	    9000/[34]?? )         HP_ARCH=m68k ;;
-	    9000/[678][0-9][0-9])
-		if [ -x /usr/bin/getconf ]; then
-		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
-			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
-		fi
-		if [ "${HP_ARCH}" = "" ]; then
-		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
-
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
-EOF
-		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
-		    test -z "$HP_ARCH" && HP_ARCH=hppa
-		fi ;;
-	esac
-	if [ ${HP_ARCH} = "hppa2.0w" ]
-	then
-	    eval $set_cc_for_build
-
-	    # hppa2.0w-hp-hpux* has a 64-bit kernel and a compiler generating
-	    # 32-bit code.  hppa64-hp-hpux* has the same kernel and a compiler
-	    # generating 64-bit code.  GNU and HP use different nomenclature:
-	    #
-	    # $ CC_FOR_BUILD=cc ./config.guess
-	    # => hppa2.0w-hp-hpux11.23
-	    # $ CC_FOR_BUILD="cc +DA2.0w" ./config.guess
-	    # => hppa64-hp-hpux11.23
-
-	    if echo __LP64__ | (CCOPTS= $CC_FOR_BUILD -E - 2>/dev/null) |
-		grep __LP64__ >/dev/null
-	    then
-		HP_ARCH="hppa2.0w"
-	    else
-		HP_ARCH="hppa64"
-	    fi
-	fi
-	echo ${HP_ARCH}-hp-hpux${HPUX_REV}
-	exit ;;
-    ia64:HP-UX:*:*)
-	HPUX_REV=`echo ${UNAME_RELEASE}|sed -e 's/[^.]*.[0B]*//'`
-	echo ia64-hp-hpux${HPUX_REV}
-	exit ;;
-    3050*:HI-UX:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <unistd.h>
-	int
-	main ()
-	{
-	  long cpu = sysconf (_SC_CPU_VERSION);
-	  /* The order matters, because CPU_IS_HP_MC68K erroneously returns
-	     true for CPU_PA_RISC1_0.  CPU_IS_PA_RISC returns correct
-	     results, however.  */
-	  if (CPU_IS_PA_RISC (cpu))
-	    {
-	      switch (cpu)
-		{
-		  case CPU_PA_RISC1_0: puts ("hppa1.0-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC1_1: puts ("hppa1.1-hitachi-hiuxwe2"); break;
-		  case CPU_PA_RISC2_0: puts ("hppa2.0-hitachi-hiuxwe2"); break;
-		  default: puts ("hppa-hitachi-hiuxwe2"); break;
-		}
-	    }
-	  else if (CPU_IS_HP_MC68K (cpu))
-	    puts ("m68k-hitachi-hiuxwe2");
-	  else puts ("unknown-hitachi-hiuxwe2");
-	  exit (0);
-	}
-EOF
-	$CC_FOR_BUILD -o $dummy $dummy.c && SYSTEM_NAME=`$dummy` &&
-		{ echo "$SYSTEM_NAME"; exit; }
-	echo unknown-hitachi-hiuxwe2
-	exit ;;
-    9000/7??:4.3bsd:*:* | 9000/8?[79]:4.3bsd:*:* )
-	echo hppa1.1-hp-bsd
-	exit ;;
-    9000/8??:4.3bsd:*:*)
-	echo hppa1.0-hp-bsd
-	exit ;;
-    *9??*:MPE/iX:*:* | *3000*:MPE/iX:*:*)
-	echo hppa1.0-hp-mpeix
-	exit ;;
-    hp7??:OSF1:*:* | hp8?[79]:OSF1:*:* )
-	echo hppa1.1-hp-osf
-	exit ;;
-    hp8??:OSF1:*:*)
-	echo hppa1.0-hp-osf
-	exit ;;
-    i*86:OSF1:*:*)
-	if [ -x /usr/sbin/sysversion ] ; then
-	    echo ${UNAME_MACHINE}-unknown-osf1mk
-	else
-	    echo ${UNAME_MACHINE}-unknown-osf1
-	fi
-	exit ;;
-    parisc*:Lites*:*:*)
-	echo hppa1.1-hp-lites
-	exit ;;
-    C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
-	echo c1-convex-bsd
-        exit ;;
-    C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-        exit ;;
-    C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
-	echo c34-convex-bsd
-        exit ;;
-    C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
-	echo c38-convex-bsd
-        exit ;;
-    C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
-	echo c4-convex-bsd
-        exit ;;
-    CRAY*Y-MP:*:*:*)
-	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*[A-Z]90:*:*:*)
-	echo ${UNAME_MACHINE}-cray-unicos${UNAME_RELEASE} \
-	| sed -e 's/CRAY.*\([A-Z]90\)/\1/' \
-	      -e y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/ \
-	      -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*TS:*:*:*)
-	echo t90-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*T3E:*:*:*)
-	echo alphaev5-cray-unicosmk${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    CRAY*SV1:*:*:*)
-	echo sv1-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    *:UNICOS/mp:*:*)
-	echo craynv-cray-unicosmp${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
-	exit ;;
-    F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
-	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
-    5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-	exit ;;
-    i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
-	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
-	exit ;;
-    sparc*:BSD/OS:*:*)
-	echo sparc-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:BSD/OS:*:*)
-	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
-	exit ;;
-    *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    amd64)
-		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
-	esac
-	exit ;;
-    i*:CYGWIN*:*)
-	echo ${UNAME_MACHINE}-pc-cygwin
-	exit ;;
-    *:MINGW*:*)
-	echo ${UNAME_MACHINE}-pc-mingw32
-	exit ;;
-    i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
-	exit ;;
-    i*:PW*:*)
-	echo ${UNAME_MACHINE}-pc-pw32
-	exit ;;
-    *:Interix*:[3456]*)
-    	case ${UNAME_MACHINE} in
-	    x86)
-		echo i586-pc-interix${UNAME_RELEASE}
-		exit ;;
-	    EM64T | authenticamd)
-		echo x86_64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	    IA64)
-		echo ia64-unknown-interix${UNAME_RELEASE}
-		exit ;;
-	esac ;;
-    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
-	echo i${UNAME_MACHINE}-pc-mks
-	exit ;;
-    i*:Windows_NT*:* | Pentium*:Windows_NT*:*)
-	# How do we know it's Interix rather than the generic POSIX subsystem?
-	# It also conflicts with pre-2.0 versions of AT&T UWIN. Should we
-	# UNAME_MACHINE based on the output of uname instead of i386?
-	echo i586-pc-interix
-	exit ;;
-    i*:UWIN*:*)
-	echo ${UNAME_MACHINE}-pc-uwin
-	exit ;;
-    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
-	echo x86_64-unknown-cygwin
-	exit ;;
-    p*:CYGWIN*:*)
-	echo powerpcle-unknown-cygwin
-	exit ;;
-    prep*:SunOS:5.*:*)
-	echo powerpcle-unknown-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'`
-	exit ;;
-    *:GNU:*:*)
-	# the GNU system
-	echo `echo ${UNAME_MACHINE}|sed -e 's,[-/].*$,,'`-unknown-gnu`echo ${UNAME_RELEASE}|sed -e 's,/.*$,,'`
-	exit ;;
-    *:GNU/*:*:*)
-	# other systems with GNU libc and userland
-	echo ${UNAME_MACHINE}-unknown-`echo ${UNAME_SYSTEM} | sed 's,^[^/]*/,,' | tr '[A-Z]' '[a-z]'``echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`-gnu
-	exit ;;
-    i*86:Minix:*:*)
-	echo ${UNAME_MACHINE}-pc-minix
-	exit ;;
-    arm*:Linux:*:*)
-	eval $set_cc_for_build
-	if echo __ARM_EABI__ | $CC_FOR_BUILD -E - 2>/dev/null \
-	    | grep -q __ARM_EABI__
-	then
-	    echo ${UNAME_MACHINE}-unknown-linux-gnu
-	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
-	fi
-	exit ;;
-    avr32*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    cris:Linux:*:*)
-	echo cris-axis-linux-gnu
-	exit ;;
-    crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
-	exit ;;
-    frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
-	exit ;;
-    ia64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m32r*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    m68*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    mips:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips
-	#undef mipsel
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mipsel
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    mips64:Linux:*:*)
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#undef CPU
-	#undef mips64
-	#undef mips64el
-	#if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || defined(MIPSEL)
-	CPU=mips64el
-	#else
-	#if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || defined(MIPSEB)
-	CPU=mips64
-	#else
-	CPU=
-	#endif
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^CPU/{
-		s: ::g
-		p
-	    }'`"
-	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
-	;;
-    or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
-	exit ;;
-    ppc:Linux:*:*)
-	echo powerpc-unknown-linux-gnu
-	exit ;;
-    ppc64:Linux:*:*)
-	echo powerpc64-unknown-linux-gnu
-	exit ;;
-    alpha:Linux:*:*)
-	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
-	  EV5)   UNAME_MACHINE=alphaev5 ;;
-	  EV56)  UNAME_MACHINE=alphaev56 ;;
-	  PCA56) UNAME_MACHINE=alphapca56 ;;
-	  PCA57) UNAME_MACHINE=alphapca56 ;;
-	  EV6)   UNAME_MACHINE=alphaev6 ;;
-	  EV67)  UNAME_MACHINE=alphaev67 ;;
-	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
-	objdump --private-headers /bin/sh | grep ld.so.1 >/dev/null
-	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
-	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
-	exit ;;
-    parisc:Linux:*:* | hppa:Linux:*:*)
-	# Look for CPU level
-	case `grep '^cpu[^a-z]*:' /proc/cpuinfo 2>/dev/null | cut -d' ' -f2` in
-	  PA7*) echo hppa1.1-unknown-linux-gnu ;;
-	  PA8*) echo hppa2.0-unknown-linux-gnu ;;
-	  *)    echo hppa-unknown-linux-gnu ;;
-	esac
-	exit ;;
-    parisc64:Linux:*:* | hppa64:Linux:*:*)
-	echo hppa64-unknown-linux-gnu
-	exit ;;
-    s390:Linux:*:* | s390x:Linux:*:*)
-	echo ${UNAME_MACHINE}-ibm-linux
-	exit ;;
-    sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sh*:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    sparc:Linux:*:* | sparc64:Linux:*:*)
-	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    vax:Linux:*:*)
-	echo ${UNAME_MACHINE}-dec-linux-gnu
-	exit ;;
-    x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
-	exit ;;
-    xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
-	exit ;;
-    i*86:Linux:*:*)
-	# The BFD linker knows what the default object file format is, so
-	# first see if it will tell us. cd to the root directory to prevent
-	# problems with other programs or directories called `ld' in the path.
-	# Set LC_ALL=C to ensure ld outputs messages in English.
-	ld_supported_targets=`cd /; LC_ALL=C ld --help 2>&1 \
-			 | sed -ne '/supported targets:/!d
-				    s/[ 	][ 	]*/ /g
-				    s/.*supported targets: *//
-				    s/ .*//
-				    p'`
-        case "$ld_supported_targets" in
-	  elf32-i386)
-		TENTATIVE="${UNAME_MACHINE}-pc-linux-gnu"
-		;;
-	  a.out-i386-linux)
-		echo "${UNAME_MACHINE}-pc-linux-gnuaout"
-		exit ;;
-	  coff-i386)
-		echo "${UNAME_MACHINE}-pc-linux-gnucoff"
-		exit ;;
-	  "")
-		# Either a pre-BFD a.out linker (linux-gnuoldld) or
-		# one that does not give us useful --help.
-		echo "${UNAME_MACHINE}-pc-linux-gnuoldld"
-		exit ;;
-	esac
-	# Determine whether the default compiler is a.out or elf
-	eval $set_cc_for_build
-	sed 's/^	//' << EOF >$dummy.c
-	#include <features.h>
-	#ifdef __ELF__
-	# ifdef __GLIBC__
-	#  if __GLIBC__ >= 2
-	LIBC=gnu
-	#  else
-	LIBC=gnulibc1
-	#  endif
-	# else
-	LIBC=gnulibc1
-	# endif
-	#else
-	#if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
-	LIBC=gnu
-	#else
-	LIBC=gnuaout
-	#endif
-	#endif
-	#ifdef __dietlibc__
-	LIBC=dietlibc
-	#endif
-EOF
-	eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
-	    /^LIBC/{
-		s: ::g
-		p
-	    }'`"
-	test x"${LIBC}" != x && {
-		echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
-		exit
-	}
-	test x"${TENTATIVE}" != x && { echo "${TENTATIVE}"; exit; }
-	;;
-    i*86:DYNIX/ptx:4*:*)
-	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
-	# earlier versions are messed up and put the nodename in both
-	# sysname and nodename.
-	echo i386-sequent-sysv4
-	exit ;;
-    i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
-	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
-	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
-	exit ;;
-    i*86:OS/2:*:*)
-	# If we were able to find `uname', then EMX Unix compatibility
-	# is probably installed.
-	echo ${UNAME_MACHINE}-pc-os2-emx
-	exit ;;
-    i*86:XTS-300:*:STOP)
-	echo ${UNAME_MACHINE}-unknown-stop
-	exit ;;
-    i*86:atheos:*:*)
-	echo ${UNAME_MACHINE}-unknown-atheos
-	exit ;;
-    i*86:syllable:*:*)
-	echo ${UNAME_MACHINE}-pc-syllable
-	exit ;;
-    i*86:LynxOS:2.*:* | i*86:LynxOS:3.[01]*:* | i*86:LynxOS:4.0*:*)
-	echo i386-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    i*86:*DOS:*:*)
-	echo ${UNAME_MACHINE}-pc-msdosdjgpp
-	exit ;;
-    i*86:*:4.*:* | i*86:SYSTEM_V:4.*:*)
-	UNAME_REL=`echo ${UNAME_RELEASE} | sed 's/\/MP$//'`
-	if grep Novell /usr/include/link.h >/dev/null 2>/dev/null; then
-		echo ${UNAME_MACHINE}-univel-sysv${UNAME_REL}
-	else
-		echo ${UNAME_MACHINE}-pc-sysv${UNAME_REL}
-	fi
-	exit ;;
-    i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
-	case `/bin/uname -X | grep "^Machine"` in
-	    *486*)	     UNAME_MACHINE=i486 ;;
-	    *Pentium)	     UNAME_MACHINE=i586 ;;
-	    *Pent*|*Celeron) UNAME_MACHINE=i686 ;;
-	esac
-	echo ${UNAME_MACHINE}-unknown-sysv${UNAME_RELEASE}${UNAME_SYSTEM}${UNAME_VERSION}
-	exit ;;
-    i*86:*:3.2:*)
-	if test -f /usr/options/cb.name; then
-		UNAME_REL=`sed -n 's/.*Version //p' </usr/options/cb.name`
-		echo ${UNAME_MACHINE}-pc-isc$UNAME_REL
-	elif /bin/uname -X 2>/dev/null >/dev/null ; then
-		UNAME_REL=`(/bin/uname -X|grep Release|sed -e 's/.*= //')`
-		(/bin/uname -X|grep i80486 >/dev/null) && UNAME_MACHINE=i486
-		(/bin/uname -X|grep '^Machine.*Pentium' >/dev/null) \
-			&& UNAME_MACHINE=i586
-		(/bin/uname -X|grep '^Machine.*Pent *II' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		(/bin/uname -X|grep '^Machine.*Pentium Pro' >/dev/null) \
-			&& UNAME_MACHINE=i686
-		echo ${UNAME_MACHINE}-pc-sco$UNAME_REL
-	else
-		echo ${UNAME_MACHINE}-pc-sysv32
-	fi
-	exit ;;
-    pc:*:*:*)
-	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i386.
-	echo i386-pc-msdosdjgpp
-        exit ;;
-    Intel:Mach:3*:*)
-	echo i386-pc-mach3
-	exit ;;
-    paragon:*:*:*)
-	echo i860-intel-osf1
-	exit ;;
-    i860:*:4.*:*) # i860-SVR4
-	if grep Stardent /usr/include/sys/uadmin.h >/dev/null 2>&1 ; then
-	  echo i860-stardent-sysv${UNAME_RELEASE} # Stardent Vistra i860-SVR4
-	else # Add other i860-SVR4 vendors below as they are discovered.
-	  echo i860-unknown-sysv${UNAME_RELEASE}  # Unknown i860-SVR4
-	fi
-	exit ;;
-    mini*:CTIX:SYS*5:*)
-	# "miniframe"
-	echo m68010-convergent-sysv
-	exit ;;
-    mc68k:UNIX:SYSTEM5:3.51m)
-	echo m68k-convergent-sysv
-	exit ;;
-    M680?0:D-NIX:5.3:*)
-	echo m68k-diab-dnix
-	exit ;;
-    M68*:*:R3V[5678]*:*)
-	test -r /sysV68 && { echo 'm68k-motorola-sysv'; exit; } ;;
-    3[345]??:*:4.0:3.0 | 3[34]??A:*:4.0:3.0 | 3[34]??,*:*:4.0:3.0 | 3[34]??/*:*:4.0:3.0 | 4400:*:4.0:3.0 | 4850:*:4.0:3.0 | SKA40:*:4.0:3.0 | SDS2:*:4.0:3.0 | SHG2:*:4.0:3.0 | S7501*:*:4.0:3.0)
-	OS_REL=''
-	test -r /etc/.relid \
-	&& OS_REL=.`sed -n 's/[^ ]* [^ ]* \([0-9][0-9]\).*/\1/p' < /etc/.relid`
-	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-	  && { echo i486-ncr-sysv4.3${OS_REL}; exit; }
-	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
-	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
-    3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
-    m68*:LynxOS:2.*:* | m68*:LynxOS:3.0*:*)
-	echo m68k-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    mc68030:UNIX_System_V:4.*:*)
-	echo m68k-atari-sysv4
-	exit ;;
-    TSUNAMI:LynxOS:2.*:*)
-	echo sparc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    rs6000:LynxOS:2.*:*)
-	echo rs6000-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    PowerPC:LynxOS:2.*:* | PowerPC:LynxOS:3.[01]*:* | PowerPC:LynxOS:4.0*:*)
-	echo powerpc-unknown-lynxos${UNAME_RELEASE}
-	exit ;;
-    SM[BE]S:UNIX_SV:*:*)
-	echo mips-dde-sysv${UNAME_RELEASE}
-	exit ;;
-    RM*:ReliantUNIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    RM*:SINIX-*:*:*)
-	echo mips-sni-sysv4
-	exit ;;
-    *:SINIX-*:*:*)
-	if uname -p 2>/dev/null >/dev/null ; then
-		UNAME_MACHINE=`(uname -p) 2>/dev/null`
-		echo ${UNAME_MACHINE}-sni-sysv4
-	else
-		echo ns32k-sni-sysv
-	fi
-	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
-    *:UNIX_System_V:4*:FTX*)
-	# From Gerald Hewes <hewes@openmarket.com>.
-	# How about differentiating between stratus architectures? -djm
-	echo hppa1.1-stratus-sysv4
-	exit ;;
-    *:*:*:FTX*)
-	# From seanf@swdc.stratus.com.
-	echo i860-stratus-sysv4
-	exit ;;
-    i*86:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo ${UNAME_MACHINE}-stratus-vos
-	exit ;;
-    *:VOS:*:*)
-	# From Paul.Green@stratus.com.
-	echo hppa1.1-stratus-vos
-	exit ;;
-    mc68*:A/UX:*:*)
-	echo m68k-apple-aux${UNAME_RELEASE}
-	exit ;;
-    news*:NEWS-OS:6*:*)
-	echo mips-sony-newsos6
-	exit ;;
-    R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
-	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
-	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
-	fi
-        exit ;;
-    BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
-	echo powerpc-be-beos
-	exit ;;
-    BeMac:BeOS:*:*)	# BeOS running on Mac or Mac clone, PPC only.
-	echo powerpc-apple-beos
-	exit ;;
-    BePC:BeOS:*:*)	# BeOS running on Intel PC compatible.
-	echo i586-pc-beos
-	exit ;;
-    SX-4:SUPER-UX:*:*)
-	echo sx4-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-5:SUPER-UX:*:*)
-	echo sx5-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-6:SUPER-UX:*:*)
-	echo sx6-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-7:SUPER-UX:*:*)
-	echo sx7-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8:SUPER-UX:*:*)
-	echo sx8-nec-superux${UNAME_RELEASE}
-	exit ;;
-    SX-8R:SUPER-UX:*:*)
-	echo sx8r-nec-superux${UNAME_RELEASE}
-	exit ;;
-    Power*:Rhapsody:*:*)
-	echo powerpc-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Rhapsody:*:*)
-	echo ${UNAME_MACHINE}-apple-rhapsody${UNAME_RELEASE}
-	exit ;;
-    *:Darwin:*:*)
-	UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
-	case $UNAME_PROCESSOR in
-	    unknown) UNAME_PROCESSOR=powerpc ;;
-	esac
-	echo ${UNAME_PROCESSOR}-apple-darwin${UNAME_RELEASE}
-	exit ;;
-    *:procnto*:*:* | *:QNX:[0123456789]*:*)
-	UNAME_PROCESSOR=`uname -p`
-	if test "$UNAME_PROCESSOR" = "x86"; then
-		UNAME_PROCESSOR=i386
-		UNAME_MACHINE=pc
-	fi
-	echo ${UNAME_PROCESSOR}-${UNAME_MACHINE}-nto-qnx${UNAME_RELEASE}
-	exit ;;
-    *:QNX:*:4*)
-	echo i386-pc-qnx
-	exit ;;
-    NSE-?:NONSTOP_KERNEL:*:*)
-	echo nse-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    NSR-?:NONSTOP_KERNEL:*:*)
-	echo nsr-tandem-nsk${UNAME_RELEASE}
-	exit ;;
-    *:NonStop-UX:*:*)
-	echo mips-compaq-nonstopux
-	exit ;;
-    BS2000:POSIX*:*:*)
-	echo bs2000-siemens-sysv
-	exit ;;
-    DS/*:UNIX_System_V:*:*)
-	echo ${UNAME_MACHINE}-${UNAME_SYSTEM}-${UNAME_RELEASE}
-	exit ;;
-    *:Plan9:*:*)
-	# "uname -m" is not consistent, so use $cputype instead. 386
-	# is converted to i386 for consistency with other x86
-	# operating systems.
-	if test "$cputype" = "386"; then
-	    UNAME_MACHINE=i386
-	else
-	    UNAME_MACHINE="$cputype"
-	fi
-	echo ${UNAME_MACHINE}-unknown-plan9
-	exit ;;
-    *:TOPS-10:*:*)
-	echo pdp10-unknown-tops10
-	exit ;;
-    *:TENEX:*:*)
-	echo pdp10-unknown-tenex
-	exit ;;
-    KS10:TOPS-20:*:* | KL10:TOPS-20:*:* | TYPE4:TOPS-20:*:*)
-	echo pdp10-dec-tops20
-	exit ;;
-    XKL-1:TOPS-20:*:* | TYPE5:TOPS-20:*:*)
-	echo pdp10-xkl-tops20
-	exit ;;
-    *:TOPS-20:*:*)
-	echo pdp10-unknown-tops20
-	exit ;;
-    *:ITS:*:*)
-	echo pdp10-unknown-its
-	exit ;;
-    SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
-	exit ;;
-    *:DragonFly:*:*)
-	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
-	exit ;;
-    *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
-	case "${UNAME_MACHINE}" in
-	    A*) echo alpha-dec-vms ; exit ;;
-	    I*) echo ia64-dec-vms ; exit ;;
-	    V*) echo vax-dec-vms ; exit ;;
-	esac ;;
-    *:XENIX:*:SysV)
-	echo i386-pc-xenix
-	exit ;;
-    i*86:skyos:*:*)
-	echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
-	exit ;;
-    i*86:rdos:*:*)
-	echo ${UNAME_MACHINE}-pc-rdos
-	exit ;;
-esac
-
-#echo '(No uname command or uname output not recognized.)' 1>&2
-#echo "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" 1>&2
-
-eval $set_cc_for_build
-cat >$dummy.c <<EOF
-#ifdef _SEQUENT_
-# include <sys/types.h>
-# include <sys/utsname.h>
-#endif
-main ()
-{
-#if defined (sony)
-#if defined (MIPSEB)
-  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
-     I don't know....  */
-  printf ("mips-sony-bsd\n"); exit (0);
-#else
-#include <sys/param.h>
-  printf ("m68k-sony-newsos%s\n",
-#ifdef NEWSOS4
-          "4"
-#else
-	  ""
-#endif
-         ); exit (0);
-#endif
-#endif
-
-#if defined (__arm) && defined (__acorn) && defined (__unix)
-  printf ("arm-acorn-riscix\n"); exit (0);
-#endif
-
-#if defined (hp300) && !defined (hpux)
-  printf ("m68k-hp-bsd\n"); exit (0);
-#endif
-
-#if defined (NeXT)
-#if !defined (__ARCHITECTURE__)
-#define __ARCHITECTURE__ "m68k"
-#endif
-  int version;
-  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
-  if (version < 4)
-    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
-  else
-    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
-  exit (0);
-#endif
-
-#if defined (MULTIMAX) || defined (n16)
-#if defined (UMAXV)
-  printf ("ns32k-encore-sysv\n"); exit (0);
-#else
-#if defined (CMU)
-  printf ("ns32k-encore-mach\n"); exit (0);
-#else
-  printf ("ns32k-encore-bsd\n"); exit (0);
-#endif
-#endif
-#endif
-
-#if defined (__386BSD__)
-  printf ("i386-pc-bsd\n"); exit (0);
-#endif
-
-#if defined (sequent)
-#if defined (i386)
-  printf ("i386-sequent-dynix\n"); exit (0);
-#endif
-#if defined (ns32000)
-  printf ("ns32k-sequent-dynix\n"); exit (0);
-#endif
-#endif
-
-#if defined (_SEQUENT_)
-    struct utsname un;
-
-    uname(&un);
-
-    if (strncmp(un.version, "V2", 2) == 0) {
-	printf ("i386-sequent-ptx2\n"); exit (0);
-    }
-    if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
-	printf ("i386-sequent-ptx1\n"); exit (0);
-    }
-    printf ("i386-sequent-ptx\n"); exit (0);
-
-#endif
-
-#if defined (vax)
-# if !defined (ultrix)
-#  include <sys/param.h>
-#  if defined (BSD)
-#   if BSD == 43
-      printf ("vax-dec-bsd4.3\n"); exit (0);
-#   else
-#    if BSD == 199006
-      printf ("vax-dec-bsd4.3reno\n"); exit (0);
-#    else
-      printf ("vax-dec-bsd\n"); exit (0);
-#    endif
-#   endif
-#  else
-    printf ("vax-dec-bsd\n"); exit (0);
-#  endif
-# else
-    printf ("vax-dec-ultrix\n"); exit (0);
-# endif
-#endif
-
-#if defined (alliant) && defined (i860)
-  printf ("i860-alliant-bsd\n"); exit (0);
-#endif
-
-  exit (1);
-}
-EOF
-
-$CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null && SYSTEM_NAME=`$dummy` &&
-	{ echo "$SYSTEM_NAME"; exit; }
-
-# Apollos put the system type in the environment.
-
-test -d /usr/apollo && { echo ${ISP}-apollo-${SYSTYPE}; exit; }
-
-# Convex versions that predate uname can use getsysinfo(1)
-
-if [ -x /usr/convex/getsysinfo ]
-then
-    case `getsysinfo -f cpu_type` in
-    c1*)
-	echo c1-convex-bsd
-	exit ;;
-    c2*)
-	if getsysinfo -f scalar_acc
-	then echo c32-convex-bsd
-	else echo c2-convex-bsd
-	fi
-	exit ;;
-    c34*)
-	echo c34-convex-bsd
-	exit ;;
-    c38*)
-	echo c38-convex-bsd
-	exit ;;
-    c4*)
-	echo c4-convex-bsd
-	exit ;;
-    esac
-fi
-
-cat >&2 <<EOF
-$0: unable to guess system type
-
-This script, last modified $timestamp, has failed to recognize
-the operating system you are using. It is advised that you
-download the most up to date version of the config scripts from
-
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.guess;hb=HEAD
-and
-  http://git.savannah.gnu.org/gitweb/?p=config.git;a=blob_plain;f=config.sub;hb=HEAD
-
-If the version you run ($0) is already up to date, please
-send the following data and any information you think might be
-pertinent to <config-patches@gnu.org> in order to provide the needed
-information to handle your system.
-
-config.guess timestamp = $timestamp
-
-uname -m = `(uname -m) 2>/dev/null || echo unknown`
-uname -r = `(uname -r) 2>/dev/null || echo unknown`
-uname -s = `(uname -s) 2>/dev/null || echo unknown`
-uname -v = `(uname -v) 2>/dev/null || echo unknown`
-
-/usr/bin/uname -p = `(/usr/bin/uname -p) 2>/dev/null`
-/bin/uname -X     = `(/bin/uname -X) 2>/dev/null`
-
-hostinfo               = `(hostinfo) 2>/dev/null`
-/bin/universe          = `(/bin/universe) 2>/dev/null`
-/usr/bin/arch -k       = `(/usr/bin/arch -k) 2>/dev/null`
-/bin/arch              = `(/bin/arch) 2>/dev/null`
-/usr/bin/oslevel       = `(/usr/bin/oslevel) 2>/dev/null`
-/usr/convex/getsysinfo = `(/usr/convex/getsysinfo) 2>/dev/null`
-
-UNAME_MACHINE = ${UNAME_MACHINE}
-UNAME_RELEASE = ${UNAME_RELEASE}
-UNAME_SYSTEM  = ${UNAME_SYSTEM}
-UNAME_VERSION = ${UNAME_VERSION}
-EOF
-
-exit 1
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
@@ -1,1658 +0,0 @@
-#! /bin/sh
-# Configuration validation subroutine script.
-#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008
-#   Free Software Foundation, Inc.
-
-timestamp='2008-01-16'
-
-# This file is (in principle) common to ALL GNU software.
-# The presence of a machine in this file suggests that SOME GNU software
-# can handle that machine.  It does not imply ALL GNU software can.
-#
-# This file is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
-#
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-
-# Please send patches to <config-patches@gnu.org>.  Submit a context
-# diff and a properly formatted ChangeLog entry.
-#
-# Configuration subroutine to validate and canonicalize a configuration type.
-# Supply the specified configuration type as an argument.
-# If it is invalid, we print an error message on stderr and exit with code 1.
-# Otherwise, we print the canonical config type on stdout and succeed.
-
-# This file is supposed to be the same for all GNU packages
-# and recognize all the CPU types, system types and aliases
-# that are meaningful with *any* GNU software.
-# Each package is responsible for reporting which valid configurations
-# it does not support.  The user should be able to distinguish
-# a failure to support a valid configuration from a meaningless
-# configuration.
-
-# The goal of this file is to map all the various variations of a given
-# machine specification into a single specification in the form:
-#	CPU_TYPE-MANUFACTURER-OPERATING_SYSTEM
-# or in some cases, the newer four-part form:
-#	CPU_TYPE-MANUFACTURER-KERNEL-OPERATING_SYSTEM
-# It is wrong to echo any other type of specification.
-
-me=`echo "$0" | sed -e 's,.*/,,'`
-
-usage="\
-Usage: $0 [OPTION] CPU-MFR-OPSYS
-       $0 [OPTION] ALIAS
-
-Canonicalize a configuration name.
-
-Operation modes:
-  -h, --help         print this help, then exit
-  -t, --time-stamp   print date of last modification, then exit
-  -v, --version      print version number, then exit
-
-Report bugs and patches to <config-patches@gnu.org>."
-
-version="\
-GNU config.sub ($timestamp)
-
-Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
-
-This is free software; see the source for copying conditions.  There is NO
-warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
-
-help="
-Try \`$me --help' for more information."
-
-# Parse command line
-while test $# -gt 0 ; do
-  case $1 in
-    --time-stamp | --time* | -t )
-       echo "$timestamp" ; exit ;;
-    --version | -v )
-       echo "$version" ; exit ;;
-    --help | --h* | -h )
-       echo "$usage"; exit ;;
-    -- )     # Stop option processing
-       shift; break ;;
-    - )	# Use stdin as input.
-       break ;;
-    -* )
-       echo "$me: invalid option $1$help"
-       exit 1 ;;
-
-    *local*)
-       # First pass through any local machine types.
-       echo $1
-       exit ;;
-
-    * )
-       break ;;
-  esac
-done
-
-case $# in
- 0) echo "$me: missing argument$help" >&2
-    exit 1;;
- 1) ;;
- *) echo "$me: too many arguments$help" >&2
-    exit 1;;
-esac
-
-# Separate what the user gave into CPU-COMPANY and OS or KERNEL-OS (if any).
-# Here we must recognize all the valid KERNEL-OS combinations.
-maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
-case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
-  storm-chaos* | os2-emx* | rtmk-nova*)
-    os=-$maybe_os
-    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
-    ;;
-  *)
-    basic_machine=`echo $1 | sed 's/-[^-]*$//'`
-    if [ $basic_machine != $1 ]
-    then os=`echo $1 | sed 's/.*-/-/'`
-    else os=; fi
-    ;;
-esac
-
-### Let's recognize common machines as not being operating systems so
-### that things like config.sub decstation-3100 work.  We also
-### recognize some manufacturers as not being operating systems, so we
-### can provide default operating systems below.
-case $os in
-	-sun*os*)
-		# Prevent following clause from handling this invalid input.
-		;;
-	-dec* | -mips* | -sequent* | -encore* | -pc532* | -sgi* | -sony* | \
-	-att* | -7300* | -3300* | -delta* | -motorola* | -sun[234]* | \
-	-unicom* | -ibm* | -next | -hp | -isi* | -apollo | -altos* | \
-	-convergent* | -ncr* | -news | -32* | -3600* | -3100* | -hitachi* |\
-	-c[123]* | -convex* | -sun | -crds | -omron* | -dg | -ultra | -tti* | \
-	-harris | -dolphin | -highlevel | -gould | -cbm | -ns | -masscomp | \
-	-apple | -axis | -knuth | -cray)
-		os=
-		basic_machine=$1
-		;;
-	-sim | -cisco | -oki | -wec | -winbond)
-		os=
-		basic_machine=$1
-		;;
-	-scout)
-		;;
-	-wrs)
-		os=-vxworks
-		basic_machine=$1
-		;;
-	-chorusos*)
-		os=-chorusos
-		basic_machine=$1
-		;;
- 	-chorusrdb)
- 		os=-chorusrdb
-		basic_machine=$1
- 		;;
-	-hiux*)
-		os=-hiuxwe2
-		;;
-	-sco6)
-		os=-sco5v6
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5)
-		os=-sco3.2v5
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco4)
-		os=-sco3.2v4
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2.[4-9]*)
-		os=`echo $os | sed -e 's/sco3.2./sco3.2v/'`
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco3.2v[4-9]*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco5v6*)
-		# Don't forget version if it is 3.2v4 or newer.
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-sco*)
-		os=-sco3.2v2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-udk*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-isc)
-		os=-isc2.2
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-clix*)
-		basic_machine=clipper-intergraph
-		;;
-	-isc*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
-		;;
-	-lynx*)
-		os=-lynxos
-		;;
-	-ptx*)
-		basic_machine=`echo $1 | sed -e 's/86-.*/86-sequent/'`
-		;;
-	-windowsnt*)
-		os=`echo $os | sed -e 's/windowsnt/winnt/'`
-		;;
-	-psos*)
-		os=-psos
-		;;
-	-mint | -mint[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-esac
-
-# Decode aliases for certain CPU-COMPANY combinations.
-case $basic_machine in
-	# Recognize the basic CPU types without company name.
-	# Some are omitted here because they have special meanings below.
-	1750a | 580 \
-	| a29k \
-	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
-	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
-	| am33_2.0 \
-	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
-	| bfin \
-	| c4x | clipper \
-	| d10v | d30v | dlx | dsp16xx \
-	| fido | fr30 | frv \
-	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
-	| i370 | i860 | i960 | ia64 \
-	| ip2k | iq2000 \
-	| m32c | m32r | m32rle | m68000 | m68k | m88k \
-	| maxq | mb | microblaze | mcore | mep \
-	| mips | mipsbe | mipseb | mipsel | mipsle \
-	| mips16 \
-	| mips64 | mips64el \
-	| mips64vr | mips64vrel \
-	| mips64orion | mips64orionel \
-	| mips64vr4100 | mips64vr4100el \
-	| mips64vr4300 | mips64vr4300el \
-	| mips64vr5000 | mips64vr5000el \
-	| mips64vr5900 | mips64vr5900el \
-	| mipsisa32 | mipsisa32el \
-	| mipsisa32r2 | mipsisa32r2el \
-	| mipsisa64 | mipsisa64el \
-	| mipsisa64r2 | mipsisa64r2el \
-	| mipsisa64sb1 | mipsisa64sb1el \
-	| mipsisa64sr71k | mipsisa64sr71kel \
-	| mipstx39 | mipstx39el \
-	| mn10200 | mn10300 \
-	| mt \
-	| msp430 \
-	| nios | nios2 \
-	| ns16k | ns32k \
-	| or32 \
-	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
-	| pyramid \
-	| score \
-	| sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
-	| sh64 | sh64le \
-	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
-	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
-	| v850 | v850e \
-	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
-	| z8k)
-		basic_machine=$basic_machine-unknown
-		;;
-	m6811 | m68hc11 | m6812 | m68hc12)
-		# Motorola 68HC11/12.
-		basic_machine=$basic_machine-unknown
-		os=-none
-		;;
-	m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
-		;;
-	ms1)
-		basic_machine=mt-unknown
-		;;
-
-	# We use `pc' rather than `unknown'
-	# because (1) that's what they normally are, and
-	# (2) the word "unknown" tends to confuse beginning users.
-	i*86 | x86_64)
-	  basic_machine=$basic_machine-pc
-	  ;;
-	# Object if more than one company name word.
-	*-*-*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-	# Recognize the basic CPU types with company name.
-	580-* \
-	| a29k-* \
-	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
-	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
-	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
-	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-	| avr-* | avr32-* \
-	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
-	| clipper-* | craynv-* | cydra-* \
-	| d10v-* | d30v-* | dlx-* \
-	| elxsi-* \
-	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
-	| h8300-* | h8500-* \
-	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
-	| i*86-* | i860-* | i960-* | ia64-* \
-	| ip2k-* | iq2000-* \
-	| m32c-* | m32r-* | m32rle-* \
-	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
-	| m88110-* | m88k-* | maxq-* | mcore-* \
-	| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
-	| mips16-* \
-	| mips64-* | mips64el-* \
-	| mips64vr-* | mips64vrel-* \
-	| mips64orion-* | mips64orionel-* \
-	| mips64vr4100-* | mips64vr4100el-* \
-	| mips64vr4300-* | mips64vr4300el-* \
-	| mips64vr5000-* | mips64vr5000el-* \
-	| mips64vr5900-* | mips64vr5900el-* \
-	| mipsisa32-* | mipsisa32el-* \
-	| mipsisa32r2-* | mipsisa32r2el-* \
-	| mipsisa64-* | mipsisa64el-* \
-	| mipsisa64r2-* | mipsisa64r2el-* \
-	| mipsisa64sb1-* | mipsisa64sb1el-* \
-	| mipsisa64sr71k-* | mipsisa64sr71kel-* \
-	| mipstx39-* | mipstx39el-* \
-	| mmix-* \
-	| mt-* \
-	| msp430-* \
-	| nios-* | nios2-* \
-	| none-* | np1-* | ns16k-* | ns32k-* \
-	| orion-* \
-	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
-	| pyramid-* \
-	| romp-* | rs6000-* \
-	| sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
-	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
-	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
-	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tron-* \
-	| v850-* | v850e-* | vax-* \
-	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
-	| xstormy16-* | xtensa*-* \
-	| ymp-* \
-	| z8k-*)
-		;;
-	# Recognize the basic CPU types without company name, with glob match.
-	xtensa*)
-		basic_machine=$basic_machine-unknown
-		;;
-	# Recognize the various machine names and aliases which stand
-	# for a CPU type and a company and sometimes even an OS.
-	386bsd)
-		basic_machine=i386-unknown
-		os=-bsd
-		;;
-	3b1 | 7300 | 7300-att | att-7300 | pc7300 | safari | unixpc)
-		basic_machine=m68000-att
-		;;
-	3b*)
-		basic_machine=we32k-att
-		;;
-	a29khif)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-    	abacus)
-		basic_machine=abacus-unknown
-		;;
-	adobe68k)
-		basic_machine=m68010-adobe
-		os=-scout
-		;;
-	alliant | fx80)
-		basic_machine=fx80-alliant
-		;;
-	altos | altos3068)
-		basic_machine=m68k-altos
-		;;
-	am29k)
-		basic_machine=a29k-none
-		os=-bsd
-		;;
-	amd64)
-		basic_machine=x86_64-pc
-		;;
-	amd64-*)
-		basic_machine=x86_64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	amdahl)
-		basic_machine=580-amdahl
-		os=-sysv
-		;;
-	amiga | amiga-*)
-		basic_machine=m68k-unknown
-		;;
-	amigaos | amigados)
-		basic_machine=m68k-unknown
-		os=-amigaos
-		;;
-	amigaunix | amix)
-		basic_machine=m68k-unknown
-		os=-sysv4
-		;;
-	apollo68)
-		basic_machine=m68k-apollo
-		os=-sysv
-		;;
-	apollo68bsd)
-		basic_machine=m68k-apollo
-		os=-bsd
-		;;
-	aux)
-		basic_machine=m68k-apple
-		os=-aux
-		;;
-	balance)
-		basic_machine=ns32k-sequent
-		os=-dynix
-		;;
-	blackfin)
-		basic_machine=bfin-unknown
-		os=-linux
-		;;
-	blackfin-*)
-		basic_machine=bfin-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	c90)
-		basic_machine=c90-cray
-		os=-unicos
-		;;
-	convex-c1)
-		basic_machine=c1-convex
-		os=-bsd
-		;;
-	convex-c2)
-		basic_machine=c2-convex
-		os=-bsd
-		;;
-	convex-c32)
-		basic_machine=c32-convex
-		os=-bsd
-		;;
-	convex-c34)
-		basic_machine=c34-convex
-		os=-bsd
-		;;
-	convex-c38)
-		basic_machine=c38-convex
-		os=-bsd
-		;;
-	cray | j90)
-		basic_machine=j90-cray
-		os=-unicos
-		;;
-	craynv)
-		basic_machine=craynv-cray
-		os=-unicosmp
-		;;
-	cr16)
-		basic_machine=cr16-unknown
-		os=-elf
-		;;
-	crds | unos)
-		basic_machine=m68k-crds
-		;;
-	crisv32 | crisv32-* | etraxfs*)
-		basic_machine=crisv32-axis
-		;;
-	cris | cris-* | etrax*)
-		basic_machine=cris-axis
-		;;
-	crx)
-		basic_machine=crx-unknown
-		os=-elf
-		;;
-	da30 | da30-*)
-		basic_machine=m68k-da30
-		;;
-	decstation | decstation-3100 | pmax | pmax-* | pmin | dec3100 | decstatn)
-		basic_machine=mips-dec
-		;;
-	decsystem10* | dec10*)
-		basic_machine=pdp10-dec
-		os=-tops10
-		;;
-	decsystem20* | dec20*)
-		basic_machine=pdp10-dec
-		os=-tops20
-		;;
-	delta | 3300 | motorola-3300 | motorola-delta \
-	      | 3300-motorola | delta-motorola)
-		basic_machine=m68k-motorola
-		;;
-	delta88)
-		basic_machine=m88k-motorola
-		os=-sysv3
-		;;
-	djgpp)
-		basic_machine=i586-pc
-		os=-msdosdjgpp
-		;;
-	dpx20 | dpx20-*)
-		basic_machine=rs6000-bull
-		os=-bosx
-		;;
-	dpx2* | dpx2*-bull)
-		basic_machine=m68k-bull
-		os=-sysv3
-		;;
-	ebmon29k)
-		basic_machine=a29k-amd
-		os=-ebmon
-		;;
-	elxsi)
-		basic_machine=elxsi-elxsi
-		os=-bsd
-		;;
-	encore | umax | mmax)
-		basic_machine=ns32k-encore
-		;;
-	es1800 | OSE68k | ose68k | ose | OSE)
-		basic_machine=m68k-ericsson
-		os=-ose
-		;;
-	fx2800)
-		basic_machine=i860-alliant
-		;;
-	genix)
-		basic_machine=ns32k-ns
-		;;
-	gmicro)
-		basic_machine=tron-gmicro
-		os=-sysv
-		;;
-	go32)
-		basic_machine=i386-pc
-		os=-go32
-		;;
-	h3050r* | hiux*)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	h8300hms)
-		basic_machine=h8300-hitachi
-		os=-hms
-		;;
-	h8300xray)
-		basic_machine=h8300-hitachi
-		os=-xray
-		;;
-	h8500hms)
-		basic_machine=h8500-hitachi
-		os=-hms
-		;;
-	harris)
-		basic_machine=m88k-harris
-		os=-sysv3
-		;;
-	hp300-*)
-		basic_machine=m68k-hp
-		;;
-	hp300bsd)
-		basic_machine=m68k-hp
-		os=-bsd
-		;;
-	hp300hpux)
-		basic_machine=m68k-hp
-		os=-hpux
-		;;
-	hp3k9[0-9][0-9] | hp9[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k2[0-9][0-9] | hp9k31[0-9])
-		basic_machine=m68000-hp
-		;;
-	hp9k3[2-9][0-9])
-		basic_machine=m68k-hp
-		;;
-	hp9k6[0-9][0-9] | hp6[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hp9k7[0-79][0-9] | hp7[0-79][0-9])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k78[0-9] | hp78[0-9])
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[67]1 | hp8[67]1 | hp9k80[24] | hp80[24] | hp9k8[78]9 | hp8[78]9 | hp9k893 | hp893)
-		# FIXME: really hppa2.0-hp
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][13679] | hp8[0-9][13679])
-		basic_machine=hppa1.1-hp
-		;;
-	hp9k8[0-9][0-9] | hp8[0-9][0-9])
-		basic_machine=hppa1.0-hp
-		;;
-	hppa-next)
-		os=-nextstep3
-		;;
-	hppaosf)
-		basic_machine=hppa1.1-hp
-		os=-osf
-		;;
-	hppro)
-		basic_machine=hppa1.1-hp
-		os=-proelf
-		;;
-	i370-ibm* | ibm*)
-		basic_machine=i370-ibm
-		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
-	i*86v32)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv32
-		;;
-	i*86v4*)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv4
-		;;
-	i*86v)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-sysv
-		;;
-	i*86sol2)
-		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
-		os=-solaris2
-		;;
-	i386mach)
-		basic_machine=i386-mach
-		os=-mach
-		;;
-	i386-vsta | vsta)
-		basic_machine=i386-unknown
-		os=-vsta
-		;;
-	iris | iris4d)
-		basic_machine=mips-sgi
-		case $os in
-		    -irix*)
-			;;
-		    *)
-			os=-irix4
-			;;
-		esac
-		;;
-	isi68 | isi)
-		basic_machine=m68k-isi
-		os=-sysv
-		;;
-	m68knommu)
-		basic_machine=m68k-unknown
-		os=-linux
-		;;
-	m68knommu-*)
-		basic_machine=m68k-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	m88k-omron*)
-		basic_machine=m88k-omron
-		;;
-	magnum | m3230)
-		basic_machine=mips-mips
-		os=-sysv
-		;;
-	merlin)
-		basic_machine=ns32k-utek
-		os=-sysv
-		;;
-	mingw32)
-		basic_machine=i386-pc
-		os=-mingw32
-		;;
-	mingw32ce)
-		basic_machine=arm-unknown
-		os=-mingw32ce
-		;;
-	miniframe)
-		basic_machine=m68000-convergent
-		;;
-	*mint | -mint[0-9]* | *MiNT | *MiNT[0-9]*)
-		basic_machine=m68k-atari
-		os=-mint
-		;;
-	mips3*-*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`
-		;;
-	mips3*)
-		basic_machine=`echo $basic_machine | sed -e 's/mips3/mips64/'`-unknown
-		;;
-	monitor)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	morphos)
-		basic_machine=powerpc-unknown
-		os=-morphos
-		;;
-	msdos)
-		basic_machine=i386-pc
-		os=-msdos
-		;;
-	ms1-*)
-		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
-		;;
-	mvs)
-		basic_machine=i370-ibm
-		os=-mvs
-		;;
-	ncr3000)
-		basic_machine=i486-ncr
-		os=-sysv4
-		;;
-	netbsd386)
-		basic_machine=i386-unknown
-		os=-netbsd
-		;;
-	netwinder)
-		basic_machine=armv4l-rebel
-		os=-linux
-		;;
-	news | news700 | news800 | news900)
-		basic_machine=m68k-sony
-		os=-newsos
-		;;
-	news1000)
-		basic_machine=m68030-sony
-		os=-newsos
-		;;
-	news-3600 | risc-news)
-		basic_machine=mips-sony
-		os=-newsos
-		;;
-	necv70)
-		basic_machine=v70-nec
-		os=-sysv
-		;;
-	next | m*-next )
-		basic_machine=m68k-next
-		case $os in
-		    -nextstep* )
-			;;
-		    -ns2*)
-		      os=-nextstep2
-			;;
-		    *)
-		      os=-nextstep3
-			;;
-		esac
-		;;
-	nh3000)
-		basic_machine=m68k-harris
-		os=-cxux
-		;;
-	nh[45]000)
-		basic_machine=m88k-harris
-		os=-cxux
-		;;
-	nindy960)
-		basic_machine=i960-intel
-		os=-nindy
-		;;
-	mon960)
-		basic_machine=i960-intel
-		os=-mon960
-		;;
-	nonstopux)
-		basic_machine=mips-compaq
-		os=-nonstopux
-		;;
-	np1)
-		basic_machine=np1-gould
-		;;
-	nsr-tandem)
-		basic_machine=nsr-tandem
-		;;
-	op50n-* | op60c-*)
-		basic_machine=hppa1.1-oki
-		os=-proelf
-		;;
-	openrisc | openrisc-*)
-		basic_machine=or32-unknown
-		;;
-	os400)
-		basic_machine=powerpc-ibm
-		os=-os400
-		;;
-	OSE68000 | ose68000)
-		basic_machine=m68000-ericsson
-		os=-ose
-		;;
-	os68k)
-		basic_machine=m68k-none
-		os=-os68k
-		;;
-	pa-hitachi)
-		basic_machine=hppa1.1-hitachi
-		os=-hiuxwe2
-		;;
-	paragon)
-		basic_machine=i860-intel
-		os=-osf
-		;;
-	parisc)
-		basic_machine=hppa-unknown
-		os=-linux
-		;;
-	parisc-*)
-		basic_machine=hppa-`echo $basic_machine | sed 's/^[^-]*-//'`
-		os=-linux
-		;;
-	pbd)
-		basic_machine=sparc-tti
-		;;
-	pbb)
-		basic_machine=m68k-tti
-		;;
-	pc532 | pc532-*)
-		basic_machine=ns32k-pc532
-		;;
-	pc98)
-		basic_machine=i386-pc
-		;;
-	pc98-*)
-		basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium | p5 | k5 | k6 | nexgen | viac3)
-		basic_machine=i586-pc
-		;;
-	pentiumpro | p6 | 6x86 | athlon | athlon_*)
-		basic_machine=i686-pc
-		;;
-	pentiumii | pentium2 | pentiumiii | pentium3)
-		basic_machine=i686-pc
-		;;
-	pentium4)
-		basic_machine=i786-pc
-		;;
-	pentium-* | p5-* | k5-* | k6-* | nexgen-* | viac3-*)
-		basic_machine=i586-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumpro-* | p6-* | 6x86-* | athlon-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentiumii-* | pentium2-* | pentiumiii-* | pentium3-*)
-		basic_machine=i686-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pentium4-*)
-		basic_machine=i786-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	pn)
-		basic_machine=pn-gould
-		;;
-	power)	basic_machine=power-ibm
-		;;
-	ppc)	basic_machine=powerpc-unknown
-		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppcle | powerpclittle | ppc-le | powerpc-little)
-		basic_machine=powerpcle-unknown
-		;;
-	ppcle-* | powerpclittle-*)
-		basic_machine=powerpcle-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64)	basic_machine=powerpc64-unknown
-		;;
-	ppc64-*) basic_machine=powerpc64-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ppc64le | powerpc64little | ppc64-le | powerpc64-little)
-		basic_machine=powerpc64le-unknown
-		;;
-	ppc64le-* | powerpc64little-*)
-		basic_machine=powerpc64le-`echo $basic_machine | sed 's/^[^-]*-//'`
-		;;
-	ps2)
-		basic_machine=i386-ibm
-		;;
-	pw32)
-		basic_machine=i586-unknown
-		os=-pw32
-		;;
-	rdos)
-		basic_machine=i386-pc
-		os=-rdos
-		;;
-	rom68k)
-		basic_machine=m68k-rom68k
-		os=-coff
-		;;
-	rm[46]00)
-		basic_machine=mips-siemens
-		;;
-	rtpc | rtpc-*)
-		basic_machine=romp-ibm
-		;;
-	s390 | s390-*)
-		basic_machine=s390-ibm
-		;;
-	s390x | s390x-*)
-		basic_machine=s390x-ibm
-		;;
-	sa29200)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	sb1)
-		basic_machine=mipsisa64sb1-unknown
-		;;
-	sb1el)
-		basic_machine=mipsisa64sb1el-unknown
-		;;
-	sde)
-		basic_machine=mipsisa32-sde
-		os=-elf
-		;;
-	sei)
-		basic_machine=mips-sei
-		os=-seiux
-		;;
-	sequent)
-		basic_machine=i386-sequent
-		;;
-	sh)
-		basic_machine=sh-hitachi
-		os=-hms
-		;;
-	sh5el)
-		basic_machine=sh5le-unknown
-		;;
-	sh64)
-		basic_machine=sh64-unknown
-		;;
-	sparclite-wrs | simso-wrs)
-		basic_machine=sparclite-wrs
-		os=-vxworks
-		;;
-	sps7)
-		basic_machine=m68k-bull
-		os=-sysv2
-		;;
-	spur)
-		basic_machine=spur-unknown
-		;;
-	st2000)
-		basic_machine=m68k-tandem
-		;;
-	stratus)
-		basic_machine=i860-stratus
-		os=-sysv4
-		;;
-	sun2)
-		basic_machine=m68000-sun
-		;;
-	sun2os3)
-		basic_machine=m68000-sun
-		os=-sunos3
-		;;
-	sun2os4)
-		basic_machine=m68000-sun
-		os=-sunos4
-		;;
-	sun3os3)
-		basic_machine=m68k-sun
-		os=-sunos3
-		;;
-	sun3os4)
-		basic_machine=m68k-sun
-		os=-sunos4
-		;;
-	sun4os3)
-		basic_machine=sparc-sun
-		os=-sunos3
-		;;
-	sun4os4)
-		basic_machine=sparc-sun
-		os=-sunos4
-		;;
-	sun4sol2)
-		basic_machine=sparc-sun
-		os=-solaris2
-		;;
-	sun3 | sun3-*)
-		basic_machine=m68k-sun
-		;;
-	sun4)
-		basic_machine=sparc-sun
-		;;
-	sun386 | sun386i | roadrunner)
-		basic_machine=i386-sun
-		;;
-	sv1)
-		basic_machine=sv1-cray
-		os=-unicos
-		;;
-	symmetry)
-		basic_machine=i386-sequent
-		os=-dynix
-		;;
-	t3e)
-		basic_machine=alphaev5-cray
-		os=-unicos
-		;;
-	t90)
-		basic_machine=t90-cray
-		os=-unicos
-		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-	tile*)
-		basic_machine=tile-unknown
-		os=-linux-gnu
-		;;
-	tx39)
-		basic_machine=mipstx39-unknown
-		;;
-	tx39el)
-		basic_machine=mipstx39el-unknown
-		;;
-	toad1)
-		basic_machine=pdp10-xkl
-		os=-tops20
-		;;
-	tower | tower-32)
-		basic_machine=m68k-ncr
-		;;
-	tpf)
-		basic_machine=s390x-ibm
-		os=-tpf
-		;;
-	udi29k)
-		basic_machine=a29k-amd
-		os=-udi
-		;;
-	ultra3)
-		basic_machine=a29k-nyu
-		os=-sym1
-		;;
-	v810 | necv810)
-		basic_machine=v810-nec
-		os=-none
-		;;
-	vaxv)
-		basic_machine=vax-dec
-		os=-sysv
-		;;
-	vms)
-		basic_machine=vax-dec
-		os=-vms
-		;;
-	vpp*|vx|vx-*)
-		basic_machine=f301-fujitsu
-		;;
-	vxworks960)
-		basic_machine=i960-wrs
-		os=-vxworks
-		;;
-	vxworks68)
-		basic_machine=m68k-wrs
-		os=-vxworks
-		;;
-	vxworks29k)
-		basic_machine=a29k-wrs
-		os=-vxworks
-		;;
-	w65*)
-		basic_machine=w65-wdc
-		os=-none
-		;;
-	w89k-*)
-		basic_machine=hppa1.1-winbond
-		os=-proelf
-		;;
-	xbox)
-		basic_machine=i686-pc
-		os=-mingw32
-		;;
-	xps | xps100)
-		basic_machine=xps100-honeywell
-		;;
-	ymp)
-		basic_machine=ymp-cray
-		os=-unicos
-		;;
-	z8k-*-coff)
-		basic_machine=z8k-unknown
-		os=-sim
-		;;
-	none)
-		basic_machine=none-none
-		os=-none
-		;;
-
-# Here we handle the default manufacturer of certain CPU types.  It is in
-# some cases the only manufacturer, in others, it is the most popular.
-	w89k)
-		basic_machine=hppa1.1-winbond
-		;;
-	op50n)
-		basic_machine=hppa1.1-oki
-		;;
-	op60c)
-		basic_machine=hppa1.1-oki
-		;;
-	romp)
-		basic_machine=romp-ibm
-		;;
-	mmix)
-		basic_machine=mmix-knuth
-		;;
-	rs6000)
-		basic_machine=rs6000-ibm
-		;;
-	vax)
-		basic_machine=vax-dec
-		;;
-	pdp10)
-		# there are many clones, so DEC is not a safe bet
-		basic_machine=pdp10-unknown
-		;;
-	pdp11)
-		basic_machine=pdp11-dec
-		;;
-	we32k)
-		basic_machine=we32k-att
-		;;
-	sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
-		basic_machine=sh-unknown
-		;;
-	sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
-		basic_machine=sparc-sun
-		;;
-	cydra)
-		basic_machine=cydra-cydrome
-		;;
-	orion)
-		basic_machine=orion-highlevel
-		;;
-	orion105)
-		basic_machine=clipper-highlevel
-		;;
-	mac | mpw | mac-mpw)
-		basic_machine=m68k-apple
-		;;
-	pmac | pmac-mpw)
-		basic_machine=powerpc-apple
-		;;
-	*-unknown)
-		# Make sure to match an already-canonicalized machine name.
-		;;
-	*)
-		echo Invalid configuration \`$1\': machine \`$basic_machine\' not recognized 1>&2
-		exit 1
-		;;
-esac
-
-# Here we canonicalize certain aliases for manufacturers.
-case $basic_machine in
-	*-digital*)
-		basic_machine=`echo $basic_machine | sed 's/digital.*/dec/'`
-		;;
-	*-commodore*)
-		basic_machine=`echo $basic_machine | sed 's/commodore.*/cbm/'`
-		;;
-	*)
-		;;
-esac
-
-# Decode manufacturer-specific aliases for certain operating systems.
-
-if [ x"$os" != x"" ]
-then
-case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
-	# -solaris* is a basic system type, with this one exception.
-	-solaris1 | -solaris1.*)
-		os=`echo $os | sed -e 's|solaris1|sunos4|'`
-		;;
-	-solaris)
-		os=-solaris2
-		;;
-	-svr4*)
-		os=-sysv4
-		;;
-	-unixware*)
-		os=-sysv4.2uw
-		;;
-	-gnu/linux*)
-		os=`echo $os | sed -e 's|gnu/linux|linux-gnu|'`
-		;;
-	# First accept the basic system types.
-	# The portable systems comes first.
-	# Each alternative MUST END IN A *, to match a version number.
-	# -sysv* is not here because it comes later, after sysvr4.
-	-gnu* | -bsd* | -mach* | -minix* | -genix* | -ultrix* | -irix* \
-	      | -*vms* | -sco* | -esix* | -isc* | -aix* | -sunos | -sunos[34]*\
-	      | -hpux* | -unos* | -osf* | -luna* | -dgux* | -solaris* | -sym* \
-	      | -amigaos* | -amigados* | -msdos* | -newsos* | -unicos* | -aof* \
-	      | -aos* \
-	      | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
-	      | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-	      | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
-	      | -openbsd* | -solidbsd* \
-	      | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
-	      | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
-	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
-	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
-	      | -chorusos* | -chorusrdb* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
-	      | -uxpv* | -beos* | -mpeix* | -udk* \
-	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
-	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
-	      | -storm-chaos* | -tops10* | -tenex* | -tops20* | -its* \
-	      | -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
-	      | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
-	      | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-	      | -skyos* | -haiku* | -rdos* | -toppers* | -drops*)
-	# Remember, each alternative MUST END IN *, to match a version number.
-		;;
-	-qnx*)
-		case $basic_machine in
-		    x86-* | i*86-*)
-			;;
-		    *)
-			os=-nto$os
-			;;
-		esac
-		;;
-	-nto-qnx*)
-		;;
-	-nto*)
-		os=`echo $os | sed -e 's|nto|nto-qnx|'`
-		;;
-	-sim | -es1800* | -hms* | -xray | -os68k* | -none* | -v88r* \
-	      | -windows* | -osx | -abug | -netware* | -os9* | -beos* | -haiku* \
-	      | -macos* | -mpw* | -magic* | -mmixware* | -mon960* | -lnews*)
-		;;
-	-mac*)
-		os=`echo $os | sed -e 's|mac|macos|'`
-		;;
-	-linux-dietlibc)
-		os=-linux-dietlibc
-		;;
-	-linux*)
-		os=`echo $os | sed -e 's|linux|linux-gnu|'`
-		;;
-	-sunos5*)
-		os=`echo $os | sed -e 's|sunos5|solaris2|'`
-		;;
-	-sunos6*)
-		os=`echo $os | sed -e 's|sunos6|solaris3|'`
-		;;
-	-opened*)
-		os=-openedition
-		;;
-        -os400*)
-		os=-os400
-		;;
-	-wince*)
-		os=-wince
-		;;
-	-osfrose*)
-		os=-osfrose
-		;;
-	-osf*)
-		os=-osf
-		;;
-	-utek*)
-		os=-bsd
-		;;
-	-dynix*)
-		os=-bsd
-		;;
-	-acis*)
-		os=-aos
-		;;
-	-atheos*)
-		os=-atheos
-		;;
-	-syllable*)
-		os=-syllable
-		;;
-	-386bsd)
-		os=-bsd
-		;;
-	-ctix* | -uts*)
-		os=-sysv
-		;;
-	-nova*)
-		os=-rtmk-nova
-		;;
-	-ns2 )
-		os=-nextstep2
-		;;
-	-nsk*)
-		os=-nsk
-		;;
-	# Preserve the version number of sinix5.
-	-sinix5.*)
-		os=`echo $os | sed -e 's|sinix|sysv|'`
-		;;
-	-sinix*)
-		os=-sysv4
-		;;
-        -tpf*)
-		os=-tpf
-		;;
-	-triton*)
-		os=-sysv3
-		;;
-	-oss*)
-		os=-sysv3
-		;;
-	-svr4)
-		os=-sysv4
-		;;
-	-svr3)
-		os=-sysv3
-		;;
-	-sysvr4)
-		os=-sysv4
-		;;
-	# This must come after -sysvr4.
-	-sysv*)
-		;;
-	-ose*)
-		os=-ose
-		;;
-	-es1800*)
-		os=-ose
-		;;
-	-xenix)
-		os=-xenix
-		;;
-	-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-		os=-mint
-		;;
-	-aros*)
-		os=-aros
-		;;
-	-kaos*)
-		os=-kaos
-		;;
-	-zvmoe)
-		os=-zvmoe
-		;;
-	-none)
-		;;
-	*)
-		# Get rid of the `-' at the beginning of $os.
-		os=`echo $os | sed 's/[^-]*-//'`
-		echo Invalid configuration \`$1\': system \`$os\' not recognized 1>&2
-		exit 1
-		;;
-esac
-else
-
-# Here we handle the default operating systems that come with various machines.
-# The value should be what the vendor currently ships out the door with their
-# machine or put another way, the most popular os provided with the machine.
-
-# Note that if you're going to try to match "-MANUFACTURER" here (say,
-# "-sun"), then you have to tell the case statement up towards the top
-# that MANUFACTURER isn't an operating system.  Otherwise, code above
-# will signal an error saying that MANUFACTURER isn't an operating
-# system, and we'll never get to this point.
-
-case $basic_machine in
-        score-*)
-		os=-elf
-		;;
-        spu-*)
-		os=-elf
-		;;
-	*-acorn)
-		os=-riscix1.2
-		;;
-	arm*-rebel)
-		os=-linux
-		;;
-	arm*-semi)
-		os=-aout
-		;;
-        c4x-* | tic4x-*)
-        	os=-coff
-		;;
-	# This must come before the *-dec entry.
-	pdp10-*)
-		os=-tops20
-		;;
-	pdp11-*)
-		os=-none
-		;;
-	*-dec | vax-*)
-		os=-ultrix4.2
-		;;
-	m68*-apollo)
-		os=-domain
-		;;
-	i386-sun)
-		os=-sunos4.0.2
-		;;
-	m68000-sun)
-		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
-		;;
-	m68*-cisco)
-		os=-aout
-		;;
-        mep-*)
-		os=-elf
-		;;
-	mips*-cisco)
-		os=-elf
-		;;
-	mips*-*)
-		os=-elf
-		;;
-	or32-*)
-		os=-coff
-		;;
-	*-tti)	# must be before sparc entry or we get the wrong os.
-		os=-sysv3
-		;;
-	sparc-* | *-sun)
-		os=-sunos4.1.1
-		;;
-	*-be)
-		os=-beos
-		;;
-	*-haiku)
-		os=-haiku
-		;;
-	*-ibm)
-		os=-aix
-		;;
-    	*-knuth)
-		os=-mmixware
-		;;
-	*-wec)
-		os=-proelf
-		;;
-	*-winbond)
-		os=-proelf
-		;;
-	*-oki)
-		os=-proelf
-		;;
-	*-hp)
-		os=-hpux
-		;;
-	*-hitachi)
-		os=-hiux
-		;;
-	i860-* | *-att | *-ncr | *-altos | *-motorola | *-convergent)
-		os=-sysv
-		;;
-	*-cbm)
-		os=-amigaos
-		;;
-	*-dg)
-		os=-dgux
-		;;
-	*-dolphin)
-		os=-sysv3
-		;;
-	m68k-ccur)
-		os=-rtu
-		;;
-	m88k-omron*)
-		os=-luna
-		;;
-	*-next )
-		os=-nextstep
-		;;
-	*-sequent)
-		os=-ptx
-		;;
-	*-crds)
-		os=-unos
-		;;
-	*-ns)
-		os=-genix
-		;;
-	i370-*)
-		os=-mvs
-		;;
-	*-next)
-		os=-nextstep3
-		;;
-	*-gould)
-		os=-sysv
-		;;
-	*-highlevel)
-		os=-bsd
-		;;
-	*-encore)
-		os=-bsd
-		;;
-	*-sgi)
-		os=-irix
-		;;
-	*-siemens)
-		os=-sysv4
-		;;
-	*-masscomp)
-		os=-rtu
-		;;
-	f30[01]-fujitsu | f700-fujitsu)
-		os=-uxpv
-		;;
-	*-rom68k)
-		os=-coff
-		;;
-	*-*bug)
-		os=-coff
-		;;
-	*-apple)
-		os=-macos
-		;;
-	*-atari*)
-		os=-mint
-		;;
-	*)
-		os=-none
-		;;
-esac
-fi
-
-# Here we handle the case where we know the os, and the CPU type, but not the
-# manufacturer.  We pick the logical manufacturer.
-vendor=unknown
-case $basic_machine in
-	*-unknown)
-		case $os in
-			-riscix*)
-				vendor=acorn
-				;;
-			-sunos*)
-				vendor=sun
-				;;
-			-aix*)
-				vendor=ibm
-				;;
-			-beos*)
-				vendor=be
-				;;
-			-hpux*)
-				vendor=hp
-				;;
-			-mpeix*)
-				vendor=hp
-				;;
-			-hiux*)
-				vendor=hitachi
-				;;
-			-unos*)
-				vendor=crds
-				;;
-			-dgux*)
-				vendor=dg
-				;;
-			-luna*)
-				vendor=omron
-				;;
-			-genix*)
-				vendor=ns
-				;;
-			-mvs* | -opened*)
-				vendor=ibm
-				;;
-			-os400*)
-				vendor=ibm
-				;;
-			-ptx*)
-				vendor=sequent
-				;;
-			-tpf*)
-				vendor=ibm
-				;;
-			-vxsim* | -vxworks* | -windiss*)
-				vendor=wrs
-				;;
-			-aux*)
-				vendor=apple
-				;;
-			-hms*)
-				vendor=hitachi
-				;;
-			-mpw* | -macos*)
-				vendor=apple
-				;;
-			-*mint | -mint[0-9]* | -*MiNT | -MiNT[0-9]*)
-				vendor=atari
-				;;
-			-vos*)
-				vendor=stratus
-				;;
-		esac
-		basic_machine=`echo $basic_machine | sed "s/unknown/$vendor/"`
-		;;
-esac
-
-echo $basic_machine$os
-exit
-
-# Local variables:
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "timestamp='"
-# time-stamp-format: "%:y-%02m-%02d"
-# time-stamp-end: "'"
-# End:
@@ -1,251 +0,0 @@
-#!/bin/sh
-#
-# install - install a program, script, or datafile
-# This comes from X11R5 (mit/util/scripts/install.sh).
-#
-# Copyright 1991 by the Massachusetts Institute of Technology
-#
-# Permission to use, copy, modify, distribute, and sell this software and its
-# documentation for any purpose is hereby granted without fee, provided that
-# the above copyright notice appear in all copies and that both that
-# copyright notice and this permission notice appear in supporting
-# documentation, and that the name of M.I.T. not be used in advertising or
-# publicity pertaining to distribution of the software without specific,
-# written prior permission.  M.I.T. makes no representations about the
-# suitability of this software for any purpose.  It is provided "as is"
-# without express or implied warranty.
-#
-# Calling this script install-sh is preferred over install.sh, to prevent
-# `make' implicit rules from creating a file called install from it
-# when there is no Makefile.
-#
-# This script is compatible with the BSD install script, but was written
-# from scratch.  It can only install one file at a time, a restriction
-# shared with many OS's install programs.
-
-
-# set DOITPROG to echo to test this script
-
-# Don't use :- since 4.3BSD and earlier shells don't like it.
-doit="${DOITPROG-}"
-
-
-# put in absolute paths if you don't have them in your path; or use env. vars.
-
-mvprog="${MVPROG-mv}"
-cpprog="${CPPROG-cp}"
-chmodprog="${CHMODPROG-chmod}"
-chownprog="${CHOWNPROG-chown}"
-chgrpprog="${CHGRPPROG-chgrp}"
-stripprog="${STRIPPROG-strip}"
-rmprog="${RMPROG-rm}"
-mkdirprog="${MKDIRPROG-mkdir}"
-
-transformbasename=""
-transform_arg=""
-instcmd="$mvprog"
-chmodcmd="$chmodprog 0755"
-chowncmd=""
-chgrpcmd=""
-stripcmd=""
-rmcmd="$rmprog -f"
-mvcmd="$mvprog"
-src=""
-dst=""
-dir_arg=""
-
-while [ x"$1" != x ]; do
-    case $1 in
-	-c) instcmd="$cpprog"
-	    shift
-	    continue;;
-
-	-d) dir_arg=true
-	    shift
-	    continue;;
-
-	-m) chmodcmd="$chmodprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-o) chowncmd="$chownprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-g) chgrpcmd="$chgrpprog $2"
-	    shift
-	    shift
-	    continue;;
-
-	-s) stripcmd="$stripprog"
-	    shift
-	    continue;;
-
-	-t=*) transformarg=`echo $1 | sed 's/-t=//'`
-	    shift
-	    continue;;
-
-	-b=*) transformbasename=`echo $1 | sed 's/-b=//'`
-	    shift
-	    continue;;
-
-	*)  if [ x"$src" = x ]
-	    then
-		src=$1
-	    else
-		# this colon is to work around a 386BSD /bin/sh bug
-		:
-		dst=$1
-	    fi
-	    shift
-	    continue;;
-    esac
-done
-
-if [ x"$src" = x ]
-then
-	echo "install:	no input file specified"
-	exit 1
-else
-	:
-fi
-
-if [ x"$dir_arg" != x ]; then
-	dst=$src
-	src=""
-	
-	if [ -d $dst ]; then
-		instcmd=:
-		chmodcmd=""
-	else
-		instcmd=$mkdirprog
-	fi
-else
-
-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
-# might cause directories to be created, which would be especially bad 
-# if $src (and thus $dsttmp) contains '*'.
-
-	if [ -f $src -o -d $src ]
-	then
-		:
-	else
-		echo "install:  $src does not exist"
-		exit 1
-	fi
-	
-	if [ x"$dst" = x ]
-	then
-		echo "install:	no destination specified"
-		exit 1
-	else
-		:
-	fi
-
-# If destination is a directory, append the input filename; if your system
-# does not like double slashes in filenames, you may need to add some logic
-
-	if [ -d $dst ]
-	then
-		dst="$dst"/`basename $src`
-	else
-		:
-	fi
-fi
-
-## this sed command emulates the dirname command
-dstdir=`echo $dst | sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
-
-# Make sure that the destination directory exists.
-#  this part is taken from Noah Friedman's mkinstalldirs script
-
-# Skip lots of stat calls in the usual case.
-if [ ! -d "$dstdir" ]; then
-defaultIFS='
-	'
-IFS="${IFS-${defaultIFS}}"
-
-oIFS="${IFS}"
-# Some sh's can't handle IFS=/ for some reason.
-IFS='%'
-set - `echo ${dstdir} | sed -e 's@/@%@g' -e 's@^%@/@'`
-IFS="${oIFS}"
-
-pathcomp=''
-
-while [ $# -ne 0 ] ; do
-	pathcomp="${pathcomp}${1}"
-	shift
-
-	if [ ! -d "${pathcomp}" ] ;
-        then
-		$mkdirprog "${pathcomp}"
-	else
-		:
-	fi
-
-	pathcomp="${pathcomp}/"
-done
-fi
-
-if [ x"$dir_arg" != x ]
-then
-	$doit $instcmd $dst &&
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
-else
-
-# If we're going to rename the final executable, determine the name now.
-
-	if [ x"$transformarg" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		dstfile=`basename $dst $transformbasename | 
-			sed $transformarg`$transformbasename
-	fi
-
-# don't allow the sed command to completely eliminate the filename
-
-	if [ x"$dstfile" = x ] 
-	then
-		dstfile=`basename $dst`
-	else
-		:
-	fi
-
-# Make a temp file name in the proper directory.
-
-	dsttmp=$dstdir/#inst.$$#
-
-# Move or copy the file name to the temp name
-
-	$doit $instcmd $src $dsttmp &&
-
-	trap "rm -f ${dsttmp}" 0 &&
-
-# and set any options; do chmod last to preserve setuid bits
-
-# If any of these fail, we abort the whole thing.  If we want to
-# ignore errors from any of these, just make sure not to ignore
-# errors from the above "$doit $instcmd $src $dsttmp" command.
-
-	if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
-	if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
-	if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
-	if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
-
-# Now rename the file to the real destination.
-
-	$doit $rmcmd -f $dstdir/$dstfile &&
-	$doit $mvcmd $dsttmp $dstdir/$dstfile 
-
-fi &&
-
-
-exit 0
@@ -1,128 +0,0 @@
-/*
- * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
- * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
- * aplicativos mainframe. Registro no INPI sob o nome G3270.
- *
- * Copyright (C) <2008> <Banco do Brasil S.A.>
- *
- * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
- * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
- * Free Software Foundation.
- *
- * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
- * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
- * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
- * obter mais detalhes.
- *
- * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
- * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
- * St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Este programa está nomeado como actions.cc e possui - linhas de código.
- *
- * Contatos
- *
- * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
- * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
- *
- * Referências:
- *
- * <https://docs.python.org/2/extending/newtypes.html>
- * <https://docs.python.org/2.7/extending/extending.html#a-simple-example>
- *
- */
-
- #include "private.h"
-
-/*---[ Implement ]----------------------------------------------------------------------------------*/
-
- PyObject * terminal_pfkey(PyObject *self, PyObject *args) {
-
-	int rc, key;
-
-	if (!PyArg_ParseTuple(args, "i", &key)) {
-		PyErr_SetString(terminalError, strerror(EINVAL));
-		return NULL;
-	}
-
-	try {
-
-		rc = ((pw3270_TerminalObject *) self)->session->pfkey(key);
-
-	} catch(std::exception &e) {
-
-		PyErr_SetString(terminalError, e.what());
-		return NULL;
-	}
-
-	return PyLong_FromLong(rc);
-
- }
-
- PyObject * terminal_pakey(PyObject *self, PyObject *args) {
-
-	int rc, key;
-
-	if (!PyArg_ParseTuple(args, "i", &key)) {
-		PyErr_SetString(terminalError, strerror(EINVAL));
-		return NULL;
-	}
-
-	try {
-
-		rc = ((pw3270_TerminalObject *) self)->session->pakey(key);
-
-	} catch(std::exception &e) {
-
-		PyErr_SetString(terminalError, e.what());
-		return NULL;
-	}
-
-	return PyLong_FromLong(rc);
-
- }
-
- PyObject * terminal_enter(PyObject *self, PyObject *args) {
-
-	int rc;
-
-	try {
-
-		rc = ((pw3270_TerminalObject *) self)->session->enter();
-
-	} catch(std::exception &e) {
-
-		PyErr_SetString(terminalError, e.what());
-		return NULL;
-	}
-
-	return PyLong_FromLong(rc);
-
-
- }
-
- PyObject * terminal_action(PyObject *self, PyObject *args) {
-
-	int rc;
-	const char *name;
-
-	if (!PyArg_ParseTuple(args, "s", &name)) {
-		PyErr_SetString(terminalError, strerror(EINVAL));
-		return NULL;
-	}
-
-	try {
-
-		rc = ((pw3270_TerminalObject *) self)->session->action(name);
-
-	} catch(std::exception &e) {
-
-		PyErr_SetString(terminalError, e.what());
-		return NULL;
-	}
-
-	return PyLong_FromLong(rc);
-
-
- }
-
@@ -1,51 +0,0 @@
-/**
- * @file config.h
- *
- * @brief Configuração para o aplicativo.
- *
- * Gerado automaticamente pelo processo ./configure esse arquivo descreve
- * as configurações de ambiente detectadas automaticamente.
- *
- * @author perry.werneck@gmail.com
- *
- */
-
-#ifndef CONFIG_H_INCLUDED
-
-	#define CONFIG_H_INCLUDED 1
-
-	/**
-	 * @brief Nome do pacote.
-	 */
-	#undef PACKAGE_NAME
-
-	/**
-	 * @brief Versão atual.
-	 */
-	#undef PACKAGE_VERSION
-
-	/**
-	 * @brief Revisão svn quando o pacote foi configurado.
-	 *
-	 */
-	#undef PACKAGE_REVISION
-
-	/**
- 	 * @brief Descrição do aplicativo.
-	 */
-	#undef PACKAGE_DESCRIPTION
-
-	/**
-	 * @brief Indica se o compilador atual possui suporte a "visibility"
-	 *
-	 * Quando disponível indica que o compilador atual permite tornar
-	 * visíveis numa biblioteca apenas as funções declaradas para isso
-	 * evitando que todos os símbolos fiquem visíveis.
-	 *
-	 * Isso permite um melhor controle sobre quais funções podem ser usados
-	 * pelo programa principal.
-	 *
-	 */
-	#undef HAVE_GNUC_VISIBILITY
-
-#endif // CONFIG_H_INCLUDED
@@ -0,0 +1,128 @@
+/*
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
+ *
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ *
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ *
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
+ * St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Este programa está nomeado como actions.cc e possui - linhas de código.
+ *
+ * Contatos
+ *
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
+ *
+ * Referências:
+ *
+ * <https://docs.python.org/2/extending/newtypes.html>
+ * <https://docs.python.org/2.7/extending/extending.html#a-simple-example>
+ *
+ */
+
+ #include "private.h"
+
+/*---[ Implement ]----------------------------------------------------------------------------------*/
+
+ PyObject * terminal_pfkey(PyObject *self, PyObject *args) {
+
+	int rc, key;
+
+	if (!PyArg_ParseTuple(args, "i", &key)) {
+		PyErr_SetString(terminalError, strerror(EINVAL));
+		return NULL;
+	}
+
+	try {
+
+		rc = ((pw3270_TerminalObject *) self)->session->pfkey(key);
+
+	} catch(std::exception &e) {
+
+		PyErr_SetString(terminalError, e.what());
+		return NULL;
+	}
+
+	return PyLong_FromLong(rc);
+
+ }
+
+ PyObject * terminal_pakey(PyObject *self, PyObject *args) {
+
+	int rc, key;
+
+	if (!PyArg_ParseTuple(args, "i", &key)) {
+		PyErr_SetString(terminalError, strerror(EINVAL));
+		return NULL;
+	}
+
+	try {
+
+		rc = ((pw3270_TerminalObject *) self)->session->pakey(key);
+
+	} catch(std::exception &e) {
+
+		PyErr_SetString(terminalError, e.what());
+		return NULL;
+	}
+
+	return PyLong_FromLong(rc);
+
+ }
+
+ PyObject * terminal_enter(PyObject *self, PyObject *args) {
+
+	int rc;
+
+	try {
+
+		rc = ((pw3270_TerminalObject *) self)->session->enter();
+
+	} catch(std::exception &e) {
+
+		PyErr_SetString(terminalError, e.what());
+		return NULL;
+	}
+
+	return PyLong_FromLong(rc);
+
+
+ }
+
+ PyObject * terminal_action(PyObject *self, PyObject *args) {
+
+	int rc;
+	const char *name;
+
+	if (!PyArg_ParseTuple(args, "s", &name)) {
+		PyErr_SetString(terminalError, strerror(EINVAL));
+		return NULL;
+	}
+
+	try {
+
+		rc = ((pw3270_TerminalObject *) self)->session->action(name);
+
+	} catch(std::exception &e) {
+
+		PyErr_SetString(terminalError, e.what());
+		return NULL;
+	}
+
+	return PyLong_FromLong(rc);
+
+
+ }
+
@@ -0,0 +1,154 @@
+/*
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
+ *
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ *
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ *
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
+ * St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Este programa está nomeado como get.cc e possui - linhas de código.
+ *
+ * Contatos:
+ *
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
+ *
+ * Referências:
+ *
+ * <https://docs.python.org/2/extending/newtypes.html>
+ * <https://docs.python.org/2.7/extending/extending.html#a-simple-example>
+ *
+ */
+
+ #include "private.h"
+
+
+/*---[ Implement ]----------------------------------------------------------------------------------*/
+
+PyObject * terminal_get_version(PyObject *self, PyObject *args) {
+
+    return PyString_FromString( ((pw3270_TerminalObject *) self)->session->get_version().c_str() );
+
+}
+
+PyObject * terminal_get_revision(PyObject *self, PyObject *args) {
+
+    return PyString_FromString( ((pw3270_TerminalObject *) self)->session->get_revision().c_str() );
+
+}
+
+PyObject * terminal_is_connected(PyObject *self, PyObject *args) {
+
+    return PyBool_FromLong( ((pw3270_TerminalObject *) self)->session->is_connected() );
+
+}
+
+PyObject * terminal_is_ready(PyObject *self, PyObject *args) {
+
+    return PyBool_FromLong( ((pw3270_TerminalObject *) self)->session->is_ready() );
+
+}
+
+PyObject * terminal_is_protected_at(PyObject *self, PyObject *args) {
+
+	int rc, row, col;
+
+	if (!PyArg_ParseTuple(args, "ii", &row, &col)) {
+		PyErr_SetString(terminalError, strerror(EINVAL));
+		return NULL;
+	}
+
+	try {
+
+		rc = ((pw3270_TerminalObject *) self)->session->get_is_protected_at(row,col);
+
+	} catch(std::exception &e) {
+
+		PyErr_SetString(terminalError, e.what());
+		return NULL;
+	}
+
+    return PyBool_FromLong( rc );
+
+}
+
+
+PyObject * terminal_cmp_string_at(PyObject *self, PyObject *args) {
+
+	int row, col, rc;
+	const char *text;
+
+	if (!PyArg_ParseTuple(args, "iis", &row, &col, &text)) {
+		PyErr_SetString(terminalError, strerror(EINVAL));
+		return NULL;
+	}
+
+	try {
+
+		rc = ((pw3270_TerminalObject *) self)->session->cmp_string_at(row,col,text);
+
+	} catch(std::exception &e) {
+
+		PyErr_SetString(terminalError, e.what());
+		return NULL;
+	}
+
+	return PyLong_FromLong(rc);
+
+}
+
+PyObject * terminal_get_string_at(PyObject *self, PyObject *args) {
+
+	int row, col, sz;
+	string rc;
+
+	if (!PyArg_ParseTuple(args, "iii", &row, &col, &sz)) {
+		PyErr_SetString(terminalError, strerror(EINVAL));
+		return NULL;
+	}
+
+	try {
+
+		rc = ((pw3270_TerminalObject *) self)->session->get_string_at(row,col,sz);
+
+	} catch(std::exception &e) {
+
+		PyErr_SetString(terminalError, e.what());
+		return NULL;
+	}
+
+	return PyString_FromString(rc.c_str());
+
+}
+
+PyObject * terminal_get_contents(PyObject *self) {
+
+	string rc;
+
+	try {
+
+		rc = ((pw3270_TerminalObject *) self)->session->get_string();
+
+	} catch(std::exception &e) {
+
+		PyErr_SetString(terminalError, e.what());
+		return NULL;
+	}
+
+	return PyString_FromString(rc.c_str());
+
+
+
+}
@@ -0,0 +1,87 @@
+/*
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
+ *
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ *
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ *
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
+ * St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Este programa está nomeado como py3270.cc e possui - linhas de código.
+ *
+ * Contatos:
+ *
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
+ *
+ * Implementa métodos básicos inicio/final do objeto python
+ *
+ * Referências:
+ *
+ * <https://docs.python.org/2/extending/newtypes.html>
+ * <https://docs.python.org/2.7/extending/extending.html#a-simple-example>
+ *
+ */
+
+ #include "private.h"
+
+
+/*---[ Implement ]----------------------------------------------------------------------------------*/
+
+PyObject * terminal_new(PyTypeObject *type, PyObject *args, PyObject *kwds) {
+
+	PW3270_NAMESPACE::session * session;
+	const char *id = "";
+
+	if (!PyArg_ParseTuple(args, "s", &id)) {
+		id = "";
+	}
+
+	trace("%s(%s)",__FUNCTION__,id);
+
+	try {
+
+		session = PW3270_NAMESPACE::session::create(id);
+
+	} catch(std::exception &e) {
+
+		trace("%s failed: %s",__FUNCTION__,e.what());
+		PyErr_SetString(terminalError, e.what());
+		return NULL;
+
+	}
+
+    pw3270_TerminalObject *self = (pw3270_TerminalObject *) type->tp_alloc(type, 0);
+
+	self->session = session;
+
+    return (PyObject *)self;
+}
+
+
+int terminal_init(pw3270_TerminalObject *self, PyObject *args, PyObject *kwds) {
+
+	return 0;
+
+}
+
+void terminal_dealloc(pw3270_TerminalObject * self) {
+
+	trace("%s",__FUNCTION__);
+
+	delete self->session;
+
+    self->ob_type->tp_free((PyObject*)self);
+
+}
@@ -0,0 +1,134 @@
+/*
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
+ *
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ *
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ *
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
+ * St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Este programa está nomeado como misc.cc e possui - linhas de código.
+ *
+ * Contatos:
+ *
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
+ *
+ * Implementa métodos básicos inicio/final do objeto python
+ *
+ * Referências:
+ *
+ * <https://docs.python.org/2/extending/newtypes.html>
+ * <https://docs.python.org/2.7/extending/extending.html#a-simple-example>
+ *
+ */
+
+ #include "private.h"
+
+
+/*---[ Implement ]----------------------------------------------------------------------------------*/
+
+ PyObject * terminal_connect(PyObject *self, PyObject *args) {
+
+	int			  rc	= -1;
+	int 		  wait	= 60;
+	const char 	* host	= "";
+
+	if (!PyArg_ParseTuple(args, "s|i", &host, &wait)) {
+		PyErr_SetString(terminalError, "connect requires a host URL");
+		return NULL;
+	}
+
+	try {
+
+		rc = ((pw3270_TerminalObject *) self)->session->connect(host,wait);
+
+	} catch(std::exception &e) {
+
+		PyErr_SetString(terminalError, e.what());
+		return NULL;
+	}
+
+	return PyLong_FromLong(rc);
+
+ }
+
+ PyObject * terminal_disconnect(PyObject *self, PyObject *args) {
+
+	int rc = -1;
+
+	try {
+
+		rc = ((pw3270_TerminalObject *) self)->session->disconnect();
+
+	} catch(std::exception &e) {
+
+		PyErr_SetString(terminalError, e.what());
+		return NULL;
+	}
+
+	return PyLong_FromLong(rc);
+
+ }
+
+ PyObject * terminal_wait_for_ready(PyObject *self, PyObject *args) {
+
+	int rc;
+	int timeout = 60;
+
+	if (!PyArg_ParseTuple(args, "|i", &timeout)) {
+		PyErr_SetString(terminalError, strerror(EINVAL));
+		return NULL;
+	}
+
+	try {
+
+		rc = ((pw3270_TerminalObject *) self)->session->wait_for_ready(timeout);
+
+	} catch(std::exception &e) {
+
+		PyErr_SetString(terminalError, e.what());
+		return NULL;
+	}
+
+	return PyLong_FromLong(rc);
+
+ }
+
+
+ PyObject * terminal_wait_for_string_at(PyObject *self, PyObject *args) {
+
+	int row, col, rc;
+	int timeout = 10;
+	const char *text;
+
+	if (!PyArg_ParseTuple(args, "iis|i", &row, &col, &text, &timeout)) {
+		PyErr_SetString(terminalError, strerror(EINVAL));
+		return NULL;
+	}
+
+	try {
+
+		rc = ((pw3270_TerminalObject *) self)->session->wait_for_string_at(row,col,text,timeout);
+
+	} catch(std::exception &e) {
+
+		PyErr_SetString(terminalError, e.what());
+		return NULL;
+	}
+
+	return PyLong_FromLong(rc);
+
+ }
+
@@ -0,0 +1,167 @@
+/*
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
+ *
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ *
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ *
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
+ * St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Este programa está nomeado como py3270.cc e possui - linhas de código.
+ *
+ * Contatos:
+ *
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
+ *
+ * Implementa métodos básicos para a extensão python.
+ *
+ * Referências:
+ *
+ * <https://docs.python.org/2/extending/newtypes.html>
+ * <https://docs.python.org/2.7/extending/extending.html#a-simple-example>
+ *
+ */
+
+ #include "private.h"
+
+/*---[ Globals ]------------------------------------------------------------------------------------*/
+
+ PyObject * terminalError = NULL;
+
+/*---[ Implement ]----------------------------------------------------------------------------------*/
+
+static PyObject * get_revision(PyObject *self, PyObject *args) {
+
+#ifdef PACKAGE_REVISION
+    return PyLong_FromLong(atoi(PACKAGE_REVISION));
+#else
+    return PyLong_FromLong(BUILD_DATE);
+#endif // PACKAGE_REVISION
+
+}
+
+static PyMethodDef terminal_methods[] = {
+
+    { "Version",  				terminal_get_version,			METH_NOARGS,	"Get the lib3270 version string."						},
+    { "Revision",  				terminal_get_revision,			METH_NOARGS,	"Get the lib3270 revision number."						},
+
+    { "IsConnected",			terminal_is_connected,			METH_NOARGS,	"True if the terminal is connected to the host."		},
+    { "IsReady",  				terminal_is_ready,				METH_NOARGS,	"True if the terminal has finished network activity."	},
+    { "IsProtected",  			terminal_is_protected_at,		METH_VARARGS,	"True if the position is read-only."					},
+
+    { "SetCursorPosition",		terminal_set_cursor_at,			METH_VARARGS,	"Set cursor position."									},
+
+    { "WaitForStringAt",		terminal_wait_for_string_at,	METH_VARARGS,	"Wait for string at position"							},
+    { "WaitForReady",			terminal_wait_for_ready,		METH_VARARGS,	"Wait for network communication to finish"				},
+
+    { "Connect",				terminal_connect,				METH_VARARGS,	"Connect to the host."									},
+    { "Disconnect",  			terminal_disconnect,			METH_NOARGS,	"Disconnect from host."									},
+
+    { "CmpStringAt",			terminal_cmp_string_at,			METH_VARARGS,	"Compare string with terminal buffer at the position."	},
+    { "GetStringAt",  			terminal_get_string_at,			METH_VARARGS,	"Get string from terminal buffer."						},
+    { "SetStringAt",  			terminal_set_string_at,			METH_VARARGS,	"Set string in terminal buffer."						},
+
+    { "PFKey",  				terminal_pfkey,					METH_VARARGS,	"Send PF key."											},
+    { "PAKey",  				terminal_pakey,					METH_VARARGS,	"Send PA key."											},
+    { "Enter",  				terminal_enter,					METH_NOARGS,	"Send Enter Key."										},
+    { "Action",  				terminal_action,				METH_VARARGS,	"Send Action by name."									},
+
+    {NULL}	// Sentinel
+
+};
+
+/*
+static PyMemberDef terminal_members[] = {
+
+    { NULL }	// Sentinel
+
+};
+*/
+
+static PyTypeObject pw3270_TerminalType = {
+    PyObject_HEAD_INIT(NULL)
+    0,								/*ob_size*/
+    "py3270.terminal",				/*tp_name*/
+    sizeof(pw3270_TerminalObject),	/*tp_basicsize*/
+    0,								/*tp_itemsize*/
+    (destructor) terminal_dealloc,	/*tp_dealloc*/
+    0,								/*tp_print*/
+    0,								/*tp_getattr*/
+    0,								/*tp_setattr*/
+    0,								/*tp_compare*/
+    0,								/*tp_repr*/
+    0,								/*tp_as_number*/
+    0,								/*tp_as_sequence*/
+    0,								/*tp_as_mapping*/
+    0,								/*tp_hash */
+    0,								/*tp_call*/
+    terminal_get_contents,			/*tp_str*/
+    0,								/*tp_getattro*/
+    0,								/*tp_setattro*/
+    0,								/*tp_as_buffer*/
+    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,	/*tp_flags*/
+    "3270 terminal object",			/* tp_doc */
+    0,								/* tp_traverse */
+    0,								/* tp_clear */
+    0,								/* tp_richcompare */
+    0,								/* tp_weaklistoffset */
+    0,								/* tp_iter */
+    0,								/* tp_iternext */
+    terminal_methods,				/* tp_methods */
+    0, // terminal_members,				/* tp_members */
+    0,								/* tp_getset */
+    0,								/* tp_base */
+    0,								/* tp_dict */
+    0,								/* tp_descr_get */
+    0,								/* tp_descr_set */
+    0,								/* tp_dictoffset */
+    (initproc) terminal_init,		/* tp_init */
+    0,								/* tp_alloc */
+    terminal_new,					/* tp_new */
+
+};
+
+static PyMethodDef MyMethods[] = {
+
+    { "Revision",  get_revision, METH_VARARGS,	"Get module revision."	},
+
+    {NULL, NULL, 0, NULL}        /* Sentinel */
+
+};
+
+PyMODINIT_FUNC initpy3270(void) {
+
+	// Cria o módulo
+
+    PyObject *m = Py_InitModule("py3270", MyMethods);
+
+    if (m == NULL) {
+		return;
+    }
+
+	// Adiciona objeto para tratamento de erros.
+	terminalError = PyErr_NewException((char *) "py3270.error", NULL, NULL);
+
+	(void) Py_INCREF(terminalError);
+	PyModule_AddObject(m, "error", terminalError);
+
+	// Adiciona terminal
+    if(PyType_Ready(&pw3270_TerminalType) < 0)
+        return
+
+	(void) Py_INCREF(&pw3270_TerminalType);
+    PyModule_AddObject(m, "Terminal", (PyObject *)&pw3270_TerminalType);
+
+}
@@ -0,0 +1,86 @@
+/*
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
+ *
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ *
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ *
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
+ * St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Este programa está nomeado como set.cc e possui - linhas de código.
+ *
+ * Contatos
+ *
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
+ *
+ * Referências:
+ *
+ * <https://docs.python.org/2/extending/newtypes.html>
+ * <https://docs.python.org/2.7/extending/extending.html#a-simple-example>
+ *
+ */
+
+ #include "private.h"
+
+
+/*---[ Implement ]----------------------------------------------------------------------------------*/
+
+ PyObject * terminal_set_string_at(PyObject *self, PyObject *args) {
+
+	int row, col, rc;
+	const char *text;
+
+	if (!PyArg_ParseTuple(args, "iis", &row, &col, &text)) {
+		PyErr_SetString(terminalError, strerror(EINVAL));
+		return NULL;
+	}
+
+	try {
+
+		rc = ((pw3270_TerminalObject *) self)->session->set_string_at(row,col,text);
+
+	} catch(std::exception &e) {
+
+		PyErr_SetString(terminalError, e.what());
+		return NULL;
+	}
+
+	return PyLong_FromLong(rc);
+
+ }
+
+ PyObject * terminal_set_cursor_at(PyObject *self, PyObject *args) {
+
+ 	int row, col, rc;
+
+	if (!PyArg_ParseTuple(args, "ii", &row, &col)) {
+		PyErr_SetString(terminalError, strerror(EINVAL));
+		return NULL;
+	}
+
+	try {
+
+		rc = ((pw3270_TerminalObject *) self)->session->set_cursor_position(row,col);
+
+	} catch(std::exception &e) {
+
+		PyErr_SetString(terminalError, e.what());
+		return NULL;
+	}
+
+	return PyLong_FromLong(rc);
+
+ }
+
@@ -1,154 +0,0 @@
-/*
- * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
- * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
- * aplicativos mainframe. Registro no INPI sob o nome G3270.
- *
- * Copyright (C) <2008> <Banco do Brasil S.A.>
- *
- * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
- * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
- * Free Software Foundation.
- *
- * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
- * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
- * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
- * obter mais detalhes.
- *
- * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
- * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
- * St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Este programa está nomeado como get.cc e possui - linhas de código.
- *
- * Contatos:
- *
- * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
- * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
- *
- * Referências:
- *
- * <https://docs.python.org/2/extending/newtypes.html>
- * <https://docs.python.org/2.7/extending/extending.html#a-simple-example>
- *
- */
-
- #include "private.h"
-
-
-/*---[ Implement ]----------------------------------------------------------------------------------*/
-
-PyObject * terminal_get_version(PyObject *self, PyObject *args) {
-
-    return PyString_FromString( ((pw3270_TerminalObject *) self)->session->get_version().c_str() );
-
-}
-
-PyObject * terminal_get_revision(PyObject *self, PyObject *args) {
-
-    return PyString_FromString( ((pw3270_TerminalObject *) self)->session->get_revision().c_str() );
-
-}
-
-PyObject * terminal_is_connected(PyObject *self, PyObject *args) {
-
-    return PyBool_FromLong( ((pw3270_TerminalObject *) self)->session->is_connected() );
-
-}
-
-PyObject * terminal_is_ready(PyObject *self, PyObject *args) {
-
-    return PyBool_FromLong( ((pw3270_TerminalObject *) self)->session->is_ready() );
-
-}
-
-PyObject * terminal_is_protected_at(PyObject *self, PyObject *args) {
-
-	int rc, row, col;
-
-	if (!PyArg_ParseTuple(args, "ii", &row, &col)) {
-		PyErr_SetString(terminalError, strerror(EINVAL));
-		return NULL;
-	}
-
-	try {
-
-		rc = ((pw3270_TerminalObject *) self)->session->get_is_protected_at(row,col);
-
-	} catch(std::exception &e) {
-
-		PyErr_SetString(terminalError, e.what());
-		return NULL;
-	}
-
-    return PyBool_FromLong( rc );
-
-}
-
-
-PyObject * terminal_cmp_string_at(PyObject *self, PyObject *args) {
-
-	int row, col, rc;
-	const char *text;
-
-	if (!PyArg_ParseTuple(args, "iis", &row, &col, &text)) {
-		PyErr_SetString(terminalError, strerror(EINVAL));
-		return NULL;
-	}
-
-	try {
-
-		rc = ((pw3270_TerminalObject *) self)->session->cmp_string_at(row,col,text);
-
-	} catch(std::exception &e) {
-
-		PyErr_SetString(terminalError, e.what());
-		return NULL;
-	}
-
-	return PyLong_FromLong(rc);
-
-}
-
-PyObject * terminal_get_string_at(PyObject *self, PyObject *args) {
-
-	int row, col, sz;
-	string rc;
-
-	if (!PyArg_ParseTuple(args, "iii", &row, &col, &sz)) {
-		PyErr_SetString(terminalError, strerror(EINVAL));
-		return NULL;
-	}
-
-	try {
-
-		rc = ((pw3270_TerminalObject *) self)->session->get_string_at(row,col,sz);
-
-	} catch(std::exception &e) {
-
-		PyErr_SetString(terminalError, e.what());
-		return NULL;
-	}
-
-	return PyString_FromString(rc.c_str());
-
-}
-
-PyObject * terminal_get_contents(PyObject *self) {
-
-	string rc;
-
-	try {
-
-		rc = ((pw3270_TerminalObject *) self)->session->get_string();
-
-	} catch(std::exception &e) {
-
-		PyErr_SetString(terminalError, e.what());
-		return NULL;
-	}
-
-	return PyString_FromString(rc.c_str());
-
-
-
-}
@@ -0,0 +1,51 @@
+/**
+ * @file config.h
+ *
+ * @brief Configuração para o aplicativo.
+ *
+ * Gerado automaticamente pelo processo ./configure esse arquivo descreve
+ * as configurações de ambiente detectadas automaticamente.
+ *
+ * @author perry.werneck@gmail.com
+ *
+ */
+
+#ifndef CONFIG_H_INCLUDED
+
+	#define CONFIG_H_INCLUDED 1
+
+	/**
+	 * @brief Nome do pacote.
+	 */
+	#undef PACKAGE_NAME
+
+	/**
+	 * @brief Versão atual.
+	 */
+	#undef PACKAGE_VERSION
+
+	/**
+	 * @brief Revisão svn quando o pacote foi configurado.
+	 *
+	 */
+	#undef PACKAGE_REVISION
+
+	/**
+ 	 * @brief Descrição do aplicativo.
+	 */
+	#undef PACKAGE_DESCRIPTION
+
+	/**
+	 * @brief Indica se o compilador atual possui suporte a "visibility"
+	 *
+	 * Quando disponível indica que o compilador atual permite tornar
+	 * visíveis numa biblioteca apenas as funções declaradas para isso
+	 * evitando que todos os símbolos fiquem visíveis.
+	 *
+	 * Isso permite um melhor controle sobre quais funções podem ser usados
+	 * pelo programa principal.
+	 *
+	 */
+	#undef HAVE_GNUC_VISIBILITY
+
+#endif // CONFIG_H_INCLUDED
@@ -0,0 +1,115 @@
+/*
+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
+ *
+ * Copyright (C) <2008> <Banco do Brasil S.A.>
+ *
+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
+ * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
+ * Free Software Foundation.
+ *
+ * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
+ * obter mais detalhes.
+ *
+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
+ * St, Fifth Floor, Boston, MA  02110-1301  USA
+ *
+ * Este programa está nomeado como private.h e possui - linhas de código.
+ *
+ * Contatos:
+ *
+ * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
+ * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
+ *
+ */
+
+#ifndef PRIVATE_H_INCLUDED
+
+	#define PRIVATE_H_INCLUDED
+
+	// http://stackoverflow.com/questions/28683358/error-hypot-has-not-been-declared-in-cmath-while-trying-to-embed-python
+	#include <cmath>
+
+	// https://lists.gt.net/python/dev/340073
+	#pragma GCC diagnostic push
+	#pragma GCC system_header
+	#include <Python.h>
+	#pragma GCC diagnostic pop
+
+	#include <pw3270/pw3270cpp.h>
+	#include "config.h"
+
+	#if defined(_WIN32)
+
+			#include <windows.h>
+
+			#define DLL_PRIVATE	extern
+			#define DLL_PUBLIC	extern __declspec (dllexport)
+
+	#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
+
+			#define DLL_PRIVATE		__hidden extern
+			#define DLL_PUBLIC		extern
+
+	#elif defined (HAVE_GNUC_VISIBILITY)
+
+			#define DLL_PRIVATE		__attribute__((visibility("hidden"))) extern
+			#define DLL_PUBLIC		__attribute__((visibility("default"))) extern
+
+	#else
+
+			#error Unable to set visibility attribute
+
+	#endif
+
+
+	using namespace std;
+
+	typedef struct {
+
+		PyObject_HEAD
+
+		PW3270_NAMESPACE::session * session;
+
+	} pw3270_TerminalObject;
+
+	extern PyObject * terminalError;
+
+	extern "C" {
+
+		DLL_PRIVATE PyObject	* terminal_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
+		DLL_PRIVATE int			  terminal_init(pw3270_TerminalObject *self, PyObject *args, PyObject *kwds);
+		DLL_PRIVATE void		  terminal_dealloc(pw3270_TerminalObject * self);
+
+		DLL_PRIVATE PyObject	* terminal_get_version(PyObject *self, PyObject *args);
+		DLL_PRIVATE PyObject	* terminal_get_revision(PyObject *self, PyObject *args);
+
+		DLL_PRIVATE PyObject	* terminal_is_connected(PyObject *self, PyObject *args);
+		DLL_PRIVATE PyObject	* terminal_is_ready(PyObject *self, PyObject *args);
+
+		DLL_PRIVATE PyObject	* terminal_connect(PyObject *self, PyObject *args);
+		DLL_PRIVATE PyObject	* terminal_disconnect(PyObject *self, PyObject *args);
+
+		DLL_PRIVATE PyObject 	* terminal_get_string_at(PyObject *self, PyObject *args);
+		DLL_PRIVATE PyObject 	* terminal_get_contents(PyObject *self);
+		DLL_PRIVATE PyObject 	* terminal_set_string_at(PyObject *self, PyObject *args);
+		DLL_PRIVATE PyObject	* terminal_cmp_string_at(PyObject *self, PyObject *args);
+
+		DLL_PRIVATE PyObject 	* terminal_pfkey(PyObject *self, PyObject *args);
+		DLL_PRIVATE PyObject 	* terminal_pakey(PyObject *self, PyObject *args);
+		DLL_PRIVATE PyObject 	* terminal_enter(PyObject *self, PyObject *args);
+		DLL_PRIVATE PyObject 	* terminal_action(PyObject *self, PyObject *args);
+
+		DLL_PRIVATE PyObject 	* terminal_is_protected_at(PyObject *self, PyObject *args);
+		DLL_PRIVATE PyObject 	* terminal_set_cursor_at(PyObject *self, PyObject *args);
+
+		DLL_PRIVATE PyObject	* terminal_wait_for_ready(PyObject *self, PyObject *args);
+		DLL_PRIVATE PyObject	* terminal_wait_for_string_at(PyObject *self, PyObject *args);
+
+	}
+
+#endif // PRIVATE_H_INCLUDED
@@ -1,87 +0,0 @@
-/*
- * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
- * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
- * aplicativos mainframe. Registro no INPI sob o nome G3270.
- *
- * Copyright (C) <2008> <Banco do Brasil S.A.>
- *
- * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
- * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
- * Free Software Foundation.
- *
- * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
- * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
- * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
- * obter mais detalhes.
- *
- * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
- * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
- * St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Este programa está nomeado como py3270.cc e possui - linhas de código.
- *
- * Contatos:
- *
- * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
- * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
- *
- * Implementa métodos básicos inicio/final do objeto python
- *
- * Referências:
- *
- * <https://docs.python.org/2/extending/newtypes.html>
- * <https://docs.python.org/2.7/extending/extending.html#a-simple-example>
- *
- */
-
- #include "private.h"
-
-
-/*---[ Implement ]----------------------------------------------------------------------------------*/
-
-PyObject * terminal_new(PyTypeObject *type, PyObject *args, PyObject *kwds) {
-
-	PW3270_NAMESPACE::session * session;
-	const char *id = "";
-
-	if (!PyArg_ParseTuple(args, "s", &id)) {
-		id = "";
-	}
-
-	trace("%s(%s)",__FUNCTION__,id);
-
-	try {
-
-		session = PW3270_NAMESPACE::session::create(id);
-
-	} catch(std::exception &e) {
-
-		trace("%s failed: %s",__FUNCTION__,e.what());
-		PyErr_SetString(terminalError, e.what());
-		return NULL;
-
-	}
-
-    pw3270_TerminalObject *self = (pw3270_TerminalObject *) type->tp_alloc(type, 0);
-
-	self->session = session;
-
-    return (PyObject *)self;
-}
-
-
-int terminal_init(pw3270_TerminalObject *self, PyObject *args, PyObject *kwds) {
-
-	return 0;
-
-}
-
-void terminal_dealloc(pw3270_TerminalObject * self) {
-
-	trace("%s",__FUNCTION__);
-
-	delete self->session;
-
-    self->ob_type->tp_free((PyObject*)self);
-
-}
@@ -1,134 +0,0 @@
-/*
- * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
- * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
- * aplicativos mainframe. Registro no INPI sob o nome G3270.
- *
- * Copyright (C) <2008> <Banco do Brasil S.A.>
- *
- * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
- * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
- * Free Software Foundation.
- *
- * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
- * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
- * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
- * obter mais detalhes.
- *
- * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
- * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
- * St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Este programa está nomeado como misc.cc e possui - linhas de código.
- *
- * Contatos:
- *
- * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
- * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
- *
- * Implementa métodos básicos inicio/final do objeto python
- *
- * Referências:
- *
- * <https://docs.python.org/2/extending/newtypes.html>
- * <https://docs.python.org/2.7/extending/extending.html#a-simple-example>
- *
- */
-
- #include "private.h"
-
-
-/*---[ Implement ]----------------------------------------------------------------------------------*/
-
- PyObject * terminal_connect(PyObject *self, PyObject *args) {
-
-	int			  rc	= -1;
-	int 		  wait	= 60;
-	const char 	* host	= "";
-
-	if (!PyArg_ParseTuple(args, "s|i", &host, &wait)) {
-		PyErr_SetString(terminalError, "connect requires a host URL");
-		return NULL;
-	}
-
-	try {
-
-		rc = ((pw3270_TerminalObject *) self)->session->connect(host,wait);
-
-	} catch(std::exception &e) {
-
-		PyErr_SetString(terminalError, e.what());
-		return NULL;
-	}
-
-	return PyLong_FromLong(rc);
-
- }
-
- PyObject * terminal_disconnect(PyObject *self, PyObject *args) {
-
-	int rc = -1;
-
-	try {
-
-		rc = ((pw3270_TerminalObject *) self)->session->disconnect();
-
-	} catch(std::exception &e) {
-
-		PyErr_SetString(terminalError, e.what());
-		return NULL;
-	}
-
-	return PyLong_FromLong(rc);
-
- }
-
- PyObject * terminal_wait_for_ready(PyObject *self, PyObject *args) {
-
-	int rc;
-	int timeout = 60;
-
-	if (!PyArg_ParseTuple(args, "|i", &timeout)) {
-		PyErr_SetString(terminalError, strerror(EINVAL));
-		return NULL;
-	}
-
-	try {
-
-		rc = ((pw3270_TerminalObject *) self)->session->wait_for_ready(timeout);
-
-	} catch(std::exception &e) {
-
-		PyErr_SetString(terminalError, e.what());
-		return NULL;
-	}
-
-	return PyLong_FromLong(rc);
-
- }
-
-
- PyObject * terminal_wait_for_string_at(PyObject *self, PyObject *args) {
-
-	int row, col, rc;
-	int timeout = 10;
-	const char *text;
-
-	if (!PyArg_ParseTuple(args, "iis|i", &row, &col, &text, &timeout)) {
-		PyErr_SetString(terminalError, strerror(EINVAL));
-		return NULL;
-	}
-
-	try {
-
-		rc = ((pw3270_TerminalObject *) self)->session->wait_for_string_at(row,col,text,timeout);
-
-	} catch(std::exception &e) {
-
-		PyErr_SetString(terminalError, e.what());
-		return NULL;
-	}
-
-	return PyLong_FromLong(rc);
-
- }
-
@@ -1,115 +0,0 @@
-/*
- * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
- * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
- * aplicativos mainframe. Registro no INPI sob o nome G3270.
- *
- * Copyright (C) <2008> <Banco do Brasil S.A.>
- *
- * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
- * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
- * Free Software Foundation.
- *
- * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
- * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
- * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
- * obter mais detalhes.
- *
- * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
- * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
- * St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Este programa está nomeado como private.h e possui - linhas de código.
- *
- * Contatos:
- *
- * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
- * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
- *
- */
-
-#ifndef PRIVATE_H_INCLUDED
-
-	#define PRIVATE_H_INCLUDED
-
-	// http://stackoverflow.com/questions/28683358/error-hypot-has-not-been-declared-in-cmath-while-trying-to-embed-python
-	#include <cmath>
-
-	// https://lists.gt.net/python/dev/340073
-	#pragma GCC diagnostic push
-	#pragma GCC system_header
-	#include <Python.h>
-	#pragma GCC diagnostic pop
-
-	#include <pw3270/pw3270cpp.h>
-	#include "config.h"
-
-	#if defined(_WIN32)
-
-			#include <windows.h>
-
-			#define DLL_PRIVATE	extern
-			#define DLL_PUBLIC	extern __declspec (dllexport)
-
-	#elif defined(__SUNPRO_C) && (__SUNPRO_C >= 0x550)
-
-			#define DLL_PRIVATE		__hidden extern
-			#define DLL_PUBLIC		extern
-
-	#elif defined (HAVE_GNUC_VISIBILITY)
-
-			#define DLL_PRIVATE		__attribute__((visibility("hidden"))) extern
-			#define DLL_PUBLIC		__attribute__((visibility("default"))) extern
-
-	#else
-
-			#error Unable to set visibility attribute
-
-	#endif
-
-
-	using namespace std;
-
-	typedef struct {
-
-		PyObject_HEAD
-
-		PW3270_NAMESPACE::session * session;
-
-	} pw3270_TerminalObject;
-
-	extern PyObject * terminalError;
-
-	extern "C" {
-
-		DLL_PRIVATE PyObject	* terminal_new(PyTypeObject *type, PyObject *args, PyObject *kwds);
-		DLL_PRIVATE int			  terminal_init(pw3270_TerminalObject *self, PyObject *args, PyObject *kwds);
-		DLL_PRIVATE void		  terminal_dealloc(pw3270_TerminalObject * self);
-
-		DLL_PRIVATE PyObject	* terminal_get_version(PyObject *self, PyObject *args);
-		DLL_PRIVATE PyObject	* terminal_get_revision(PyObject *self, PyObject *args);
-
-		DLL_PRIVATE PyObject	* terminal_is_connected(PyObject *self, PyObject *args);
-		DLL_PRIVATE PyObject	* terminal_is_ready(PyObject *self, PyObject *args);
-
-		DLL_PRIVATE PyObject	* terminal_connect(PyObject *self, PyObject *args);
-		DLL_PRIVATE PyObject	* terminal_disconnect(PyObject *self, PyObject *args);
-
-		DLL_PRIVATE PyObject 	* terminal_get_string_at(PyObject *self, PyObject *args);
-		DLL_PRIVATE PyObject 	* terminal_get_contents(PyObject *self);
-		DLL_PRIVATE PyObject 	* terminal_set_string_at(PyObject *self, PyObject *args);
-		DLL_PRIVATE PyObject	* terminal_cmp_string_at(PyObject *self, PyObject *args);
-
-		DLL_PRIVATE PyObject 	* terminal_pfkey(PyObject *self, PyObject *args);
-		DLL_PRIVATE PyObject 	* terminal_pakey(PyObject *self, PyObject *args);
-		DLL_PRIVATE PyObject 	* terminal_enter(PyObject *self, PyObject *args);
-		DLL_PRIVATE PyObject 	* terminal_action(PyObject *self, PyObject *args);
-
-		DLL_PRIVATE PyObject 	* terminal_is_protected_at(PyObject *self, PyObject *args);
-		DLL_PRIVATE PyObject 	* terminal_set_cursor_at(PyObject *self, PyObject *args);
-
-		DLL_PRIVATE PyObject	* terminal_wait_for_ready(PyObject *self, PyObject *args);
-		DLL_PRIVATE PyObject	* terminal_wait_for_string_at(PyObject *self, PyObject *args);
-
-	}
-
-#endif // PRIVATE_H_INCLUDED
@@ -1,167 +0,0 @@
-/*
- * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
- * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
- * aplicativos mainframe. Registro no INPI sob o nome G3270.
- *
- * Copyright (C) <2008> <Banco do Brasil S.A.>
- *
- * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
- * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
- * Free Software Foundation.
- *
- * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
- * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
- * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
- * obter mais detalhes.
- *
- * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
- * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
- * St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Este programa está nomeado como py3270.cc e possui - linhas de código.
- *
- * Contatos:
- *
- * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
- * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
- *
- * Implementa métodos básicos para a extensão python.
- *
- * Referências:
- *
- * <https://docs.python.org/2/extending/newtypes.html>
- * <https://docs.python.org/2.7/extending/extending.html#a-simple-example>
- *
- */
-
- #include "private.h"
-
-/*---[ Globals ]------------------------------------------------------------------------------------*/
-
- PyObject * terminalError = NULL;
-
-/*---[ Implement ]----------------------------------------------------------------------------------*/
-
-static PyObject * get_revision(PyObject *self, PyObject *args) {
-
-#ifdef PACKAGE_REVISION
-    return PyLong_FromLong(atoi(PACKAGE_REVISION));
-#else
-    return PyLong_FromLong(BUILD_DATE);
-#endif // PACKAGE_REVISION
-
-}
-
-static PyMethodDef terminal_methods[] = {
-
-    { "Version",  				terminal_get_version,			METH_NOARGS,	"Get the lib3270 version string."						},
-    { "Revision",  				terminal_get_revision,			METH_NOARGS,	"Get the lib3270 revision number."						},
-
-    { "IsConnected",			terminal_is_connected,			METH_NOARGS,	"True if the terminal is connected to the host."		},
-    { "IsReady",  				terminal_is_ready,				METH_NOARGS,	"True if the terminal has finished network activity."	},
-    { "IsProtected",  			terminal_is_protected_at,		METH_VARARGS,	"True if the position is read-only."					},
-
-    { "SetCursorPosition",		terminal_set_cursor_at,			METH_VARARGS,	"Set cursor position."									},
-
-    { "WaitForStringAt",		terminal_wait_for_string_at,	METH_VARARGS,	"Wait for string at position"							},
-    { "WaitForReady",			terminal_wait_for_ready,		METH_VARARGS,	"Wait for network communication to finish"				},
-
-    { "Connect",				terminal_connect,				METH_VARARGS,	"Connect to the host."									},
-    { "Disconnect",  			terminal_disconnect,			METH_NOARGS,	"Disconnect from host."									},
-
-    { "CmpStringAt",			terminal_cmp_string_at,			METH_VARARGS,	"Compare string with terminal buffer at the position."	},
-    { "GetStringAt",  			terminal_get_string_at,			METH_VARARGS,	"Get string from terminal buffer."						},
-    { "SetStringAt",  			terminal_set_string_at,			METH_VARARGS,	"Set string in terminal buffer."						},
-
-    { "PFKey",  				terminal_pfkey,					METH_VARARGS,	"Send PF key."											},
-    { "PAKey",  				terminal_pakey,					METH_VARARGS,	"Send PA key."											},
-    { "Enter",  				terminal_enter,					METH_NOARGS,	"Send Enter Key."										},
-    { "Action",  				terminal_action,				METH_VARARGS,	"Send Action by name."									},
-
-    {NULL}	// Sentinel
-
-};
-
-/*
-static PyMemberDef terminal_members[] = {
-
-    { NULL }	// Sentinel
-
-};
-*/
-
-static PyTypeObject pw3270_TerminalType = {
-    PyObject_HEAD_INIT(NULL)
-    0,								/*ob_size*/
-    "py3270.terminal",				/*tp_name*/
-    sizeof(pw3270_TerminalObject),	/*tp_basicsize*/
-    0,								/*tp_itemsize*/
-    (destructor) terminal_dealloc,	/*tp_dealloc*/
-    0,								/*tp_print*/
-    0,								/*tp_getattr*/
-    0,								/*tp_setattr*/
-    0,								/*tp_compare*/
-    0,								/*tp_repr*/
-    0,								/*tp_as_number*/
-    0,								/*tp_as_sequence*/
-    0,								/*tp_as_mapping*/
-    0,								/*tp_hash */
-    0,								/*tp_call*/
-    terminal_get_contents,			/*tp_str*/
-    0,								/*tp_getattro*/
-    0,								/*tp_setattro*/
-    0,								/*tp_as_buffer*/
-    Py_TPFLAGS_DEFAULT | Py_TPFLAGS_BASETYPE,	/*tp_flags*/
-    "3270 terminal object",			/* tp_doc */
-    0,								/* tp_traverse */
-    0,								/* tp_clear */
-    0,								/* tp_richcompare */
-    0,								/* tp_weaklistoffset */
-    0,								/* tp_iter */
-    0,								/* tp_iternext */
-    terminal_methods,				/* tp_methods */
-    0, // terminal_members,				/* tp_members */
-    0,								/* tp_getset */
-    0,								/* tp_base */
-    0,								/* tp_dict */
-    0,								/* tp_descr_get */
-    0,								/* tp_descr_set */
-    0,								/* tp_dictoffset */
-    (initproc) terminal_init,		/* tp_init */
-    0,								/* tp_alloc */
-    terminal_new,					/* tp_new */
-
-};
-
-static PyMethodDef MyMethods[] = {
-
-    { "Revision",  get_revision, METH_VARARGS,	"Get module revision."	},
-
-    {NULL, NULL, 0, NULL}        /* Sentinel */
-
-};
-
-PyMODINIT_FUNC initpy3270(void) {
-
-	// Cria o módulo
-
-    PyObject *m = Py_InitModule("py3270", MyMethods);
-
-    if (m == NULL) {
-		return;
-    }
-
-	// Adiciona objeto para tratamento de erros.
-	terminalError = PyErr_NewException((char *) "py3270.error", NULL, NULL);
-
-	(void) Py_INCREF(terminalError);
-	PyModule_AddObject(m, "error", terminalError);
-
-	// Adiciona terminal
-    if(PyType_Ready(&pw3270_TerminalType) < 0)
-        return
-
-	(void) Py_INCREF(&pw3270_TerminalType);
-    PyModule_AddObject(m, "Terminal", (PyObject *)&pw3270_TerminalType);
-
-}
@@ -1,86 +0,0 @@
-/*
- * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270  e X3270
- * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
- * aplicativos mainframe. Registro no INPI sob o nome G3270.
- *
- * Copyright (C) <2008> <Banco do Brasil S.A.>
- *
- * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
- * os termos da GPL v.2 - Licença Pública Geral  GNU,  conforme  publicado  pela
- * Free Software Foundation.
- *
- * Este programa é distribuído na expectativa de  ser  útil,  mas  SEM  QUALQUER
- * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou  de  ADEQUAÇÃO
- * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
- * obter mais detalhes.
- *
- * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
- * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
- * St, Fifth Floor, Boston, MA  02110-1301  USA
- *
- * Este programa está nomeado como set.cc e possui - linhas de código.
- *
- * Contatos
- *
- * perry.werneck@gmail.com	(Alexandre Perry de Souza Werneck)
- * erico.mendonca@gmail.com	(Erico Mascarenhas Mendonça)
- *
- * Referências:
- *
- * <https://docs.python.org/2/extending/newtypes.html>
- * <https://docs.python.org/2.7/extending/extending.html#a-simple-example>
- *
- */
-
- #include "private.h"
-
-
-/*---[ Implement ]----------------------------------------------------------------------------------*/
-
- PyObject * terminal_set_string_at(PyObject *self, PyObject *args) {
-
-	int row, col, rc;
-	const char *text;
-
-	if (!PyArg_ParseTuple(args, "iis", &row, &col, &text)) {
-		PyErr_SetString(terminalError, strerror(EINVAL));
-		return NULL;
-	}
-
-	try {
-
-		rc = ((pw3270_TerminalObject *) self)->session->set_string_at(row,col,text);
-
-	} catch(std::exception &e) {
-
-		PyErr_SetString(terminalError, e.what());
-		return NULL;
-	}
-
-	return PyLong_FromLong(rc);
-
- }
-
- PyObject * terminal_set_cursor_at(PyObject *self, PyObject *args) {
-
- 	int row, col, rc;
-
-	if (!PyArg_ParseTuple(args, "ii", &row, &col)) {
-		PyErr_SetString(terminalError, strerror(EINVAL));
-		return NULL;
-	}
-
-	try {
-
-		rc = ((pw3270_TerminalObject *) self)->session->set_cursor_position(row,col);
-
-	} catch(std::exception &e) {
-
-		PyErr_SetString(terminalError, e.what());
-		return NULL;
-	}
-
-	return PyLong_FromLong(rc);
-
- }
-
...	...	@@ -21,4 +21,5 @@ rpm/RPMS
21	21	rpm/SOURCES
22	22	rpm/SPECS
23	23	rpm/SRPMS
24		-
	24	+scripts
	25	+*.[0-9]
...	...
1	1	#!/bin/bash
2	2
3		-APPLEVEL="0"
4		-
5	3	test -n "$srcdir" \|\| srcdir=`dirname "$0"`
6	4	test -n "$srcdir" \|\| srcdir=.
7	5
8	6	olddir=`pwd`
9	7	cd "$srcdir"
10	8
11		-if test -e revision ; then
12		- . revision
13		-fi
14		-
15		-touch ChangeLog
16		-
17		-# Inicia com os defaults
18		-TEMPFILE=autogen.tmp
19		-
20		-if [ -d .svn ]; then
21		-
22		- # Tenta detectar a versão
23		- SVNVERSION=$(which svnversion 2> /dev/null)
24		- if test -x "${SVNVERSION}" ; then
25		- svnversion \| cut -d: -f2 \| sed 's@[M\|m]@@g' > ${TEMPFILE} 2> /dev/null
26		- if [ "$?" == "0" ]; then
27		- PACKAGE_REVISION=$(cat ${TEMPFILE})
28		- fi
29		- fi
30		-
31		- # Tenta detectar a URL
32		- SVN=$(which svn 2> /dev/null)
33		- if test -x "${SVN}" ; then
34		-
35		- LANG="EN_US" "${SVN}" info > ${TEMPFILE} 2>&1
36		- if [ "$?" == "0" ]; then
37		- PACKAGE_SOURCE=$(cat ${TEMPFILE} \| grep "^URL: " \| cut -d" " -f2)
38		- fi
39		-
40		- fi
41		-
42		-elif [ -d .git ]; then
43		-
44		- # Obtém revisão via git
45		- # Referência: http://stackoverflow.com/questions/4120001/what-is-the-git-equivalent-for-revision-number
46		-
47		- # Obtém URL via git
48		- PACKAGE_SOURCE=$(git config --get remote.origin.url)
49		-
50		- # Obtém número total de commits
51		- PACKAGE_REVISION=$(git rev-list HEAD --count)
52		-
53		-fi
54		-
55		-
56		-rm -f $TEMPFILE
57		-
58		-if test -z ${PACKAGE_REVISION} ; then
59		- echo "Can´t detect package revision, using current date"
60		- PACKAGE_REVISION=`date +%y%m%d`
61		-fi
62		-
63		-if test -z ${PACKAGE_SOURCE} ; then
64		- echo "Can´t detect package source"
65		- exit -1
66		-fi
67		-
68		-#echo "PACKAGE_REVISION=${PACKAGE_REVISION}" > $srcdir/revision
69		-#echo "PACKAGE_SOURCE=${PACKAGE_SOURCE}" >> $srcdir/revision
70		-#echo "PACKAGE_LEVEL=${APPLEVEL}" >> $srcdir/revision
71		-
72		-#echo "m4_define([SVN_REVISION], ${PACKAGE_REVISION})" > $srcdir/revision.m4
73		-#echo "m4_define([SVN_URL], ${PACKAGE_SOURCE})" >> $srcdir/revision.m4
74		-#echo "m4_define([APP_LEVEL], ${APPLEVEL})" >> $srcdir/revision.m4
75		-
76	9	aclocal
77	10	if test $? != 0 ; then
78	11	echo "aclocal failed."
...	...	@@ -85,10 +18,12 @@ if test $? != 0 ; then
85	18	exit -1
86	19	fi
87	20
	21	+mkdir -p scripts
	22	+automake --add-missing 2> /dev/null \| true
	23	+
88	24	cd "$olddir"
89	25	test -n "$NOCONFIGURE" \|\| "$srcdir/configure" "$@"
90	26
91		-echo "Package set to revision $PACKAGE_REVISION and source $PACKAGE_SOURCE"
92	27
93	28
94	29
...	...
...	...	@@ -27,11 +27,11 @@ dnl
27	27	dnl Process this file with autoconf to produce a configure script.
28	28
29	29	dnl The minimum version of autoconf required.
30		-AC_PREREQ(2.59)
	30	+AC_PREREQ(2.61)
31	31
32	32	dnl Initialise automake with the package name, version and
33	33	dnl bug-reporting address.
34		-AC_INIT([python-pw3270], [5.1], [perry.werneck@gmail.com])
	34	+AC_INIT([py3270], [5.2], [perry.werneck@gmail.com])
35	35
36	36	dnl Place auxilliary scripts here.
37	37	AC_CONFIG_AUX_DIR([scripts])
...	...	@@ -40,7 +40,7 @@ dnl Compute the canonical host-system type
40	40	AC_CANONICAL_HOST
41	41
42	42	dnl Put macro definitions here (though they aren't used).
43		-AC_CONFIG_HEADER([src/config.h])
	43	+AC_CONFIG_HEADER([src/include/config.h])
44	44
45	45	dnl Initialise automake stuff.
46	46	AM_INIT_AUTOMAKE
...	...	@@ -49,8 +49,8 @@ dnl Check for iconv
49	49	AM_ICONV
50	50
51	51	dnl Checks for programs.
52		-AC_PROG_CXX
53	52	AC_PROG_CC
	53	+AC_PROG_CXX
54	54	AC_PROG_SED
55	55	AC_PROG_LN_S
56	56
...	...	@@ -59,123 +59,114 @@ AC_LANG([C++])
59	59	dnl ---------------------------------------------------------------------------
60	60	dnl Initialize defaults
61	61	dnl ---------------------------------------------------------------------------
62		-DLLFLAGS="-shared -Wl,-soname,\$(@F)"
63		-DBG_CFLAGS="-DDEBUG=1"
	62	+
	63	+DBG_CFLAGS="-g -fstack-check -DDEBUG=1"
64	64	RLS_CFLAGS="-DNDEBUG=1"
	65	+PLUGINS=""
	66	+APP_RESOURCES=""
	67	+APP_LDFLAGS=""
	68	+DLL_LDFLAGS="-shared -Wl,-soname,\$(@F)"
	69	+DEPENDS=""
65	70
66	71	dnl ---------------------------------------------------------------------------
67		-dnl Check for OS specifics
	72	+dnl Version info
68	73	dnl ---------------------------------------------------------------------------
69	74
70		-case "$host" in
71		- *-mingw32)
72		-
73		- EXEEXT=".exe"
74		- DLLPREFIX=""
75		- DLLEXT=".dll"
76		-
77		- CFLAGS="$CFLAGS -Wall -Werror -D_WIN32_WINNT=0x0600"
78		- LIBS="$LIBS -lws2_32 -lntdll -lwtsapi32"
79		-
80		- ;;
	75	+AC_SUBST(PACKAGE_DESCRIPTION,"Python binding for pw3270/lib3270")
81	76
82		- *)
83		- EXEEXT=""
	77	+app_vrs_major=$(echo $VERSION \| cut -d. -f1)
	78	+app_vrs_minor=$(echo $VERSION \| cut -d. -f2)
84	79
85		- DLLEXT=".so"
	80	+AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_VERSION, $app_vrs_major)
	81	+AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor)
86	82
87		- CFLAGS="$CFLAGS -Wall -Werror"
	83	+AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)
	84	+AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
88	85
89		- # LIBS="-Wl,--no-allow-shlib-undefined,--as-needed,--no-undefined -pthread $LIBS"
90		- LIBS="-pthread $LIBS"
	86	+AC_ARG_WITH([release], [AS_HELP_STRING([--with-release], [Set release])], [ app_cv_release="$withval" ],[ app_cv_release="`date +%-y`.`date +%-m`.`date +%-d`" ])
91	87
92		-esac
	88	+app_rls_major=$(echo $app_cv_release.0.0 \| cut -d. -f1)
	89	+app_rls_minor=$(echo $app_cv_release.0.0 \| cut -d. -f2)
93	90
94		-AC_SUBST(LIBS)
	91	+AC_DEFINE_UNQUOTED(PACKAGE_RELEASE, $app_cv_release)
	92	+AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_RELEASE, $app_rls_major)
	93	+AC_DEFINE_UNQUOTED(PACKAGE_MINOR_RELEASE, $app_rls_minor)
95	94
96		-AC_SUBST(DBG_CFLAGS)
97		-AC_SUBST(RLS_CFLAGS)
	95	+AC_SUBST(PACKAGE_RELEASE,$app_cv_release)
	96	+AC_SUBST(PACKAGE_MAJOR_RELEASE,$app_rls_major)
	97	+AC_SUBST(PACKAGE_MINOR_RELEASE,$app_rls_minor)
98	98
99		-AC_SUBST(DBG_LDFLAGS)
100		-AC_SUBST(RLS_LDFLAGS)
	99	+AC_ARG_WITH([application-datadir], [AS_HELP_STRING([--with-application-datadir], [Set path for configuration file])], [ app_cv_source_appdatadir="$withval" ],[ app_cv_source_appdatadir="\$(datarootdir)/\$(PACKAGE_NAME)" ])
101	100
102		-AC_SUBST(EXEEXT)
103		-AC_SUBST(DLLEXT)
104		-AC_SUBST(DLLPREFIX)
	101	+AC_DEFINE_UNQUOTED(APPDATADIR, $app_cv_source_appdatadir)
	102	+AC_SUBST(APPDATADIR,$app_cv_source_appdatadir)
105	103
106	104	dnl ---------------------------------------------------------------------------
107		-dnl Check for other programs
108		-dnl ---------------------------------------------------------------------------
109		-AC_PATH_TOOL([STRIP], [strip])
110		-AC_PATH_TOOL([RPMBUILD], [rpmbuild], [no])
111		-AC_PATH_TOOL([MAKENSIS], [makensis], [no])
112		-AC_PATH_TOOL([VALGRIND], [valgrind], [no])
113		-AC_PATH_TOOL([WINDRES], [windres], [no])
114		-AC_PATH_TOOL([ZIP], [zip], [zip])
115		-AC_PATH_TOOL([FIND], [find], [find])
116		-AC_PATH_TOOL([AR], [ar], [ar])
117		-
118		-PKG_CHECK_EXISTS
119		-
120		-dnl ---------------------------------------------------------------------------
121		-dnl Version info
	105	+dnl Check for OS specifics
122	106	dnl ---------------------------------------------------------------------------
123	107
124		-app_vrs_major=$(echo $VERSION \| cut -d. -f1)
125		-app_vrs_minor=$(echo $VERSION \| cut -d. -f2)
126		-
127		-AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)
128		-AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
129		-
130		-AC_DEFINE_UNQUOTED(PACKAGE_MAJOR_VERSION, $app_vrs_major)
131		-AC_DEFINE_UNQUOTED(PACKAGE_MINOR_VERSION, $app_vrs_minor)
	108	+case "$host" in
	109	+ -mingw32\|-pc-msys)
	110	+ app_cv_osname="windows"
132	111
133		-AC_SUBST(PACKAGE_MAJOR_VERSION,$app_vrs_major)
134		-AC_SUBST(PACKAGE_MINOR_VERSION,$app_vrs_minor)
	112	+ CFLAGS="$CFLAGS -pthread -D_WIN32_WINNT=0x0600"
	113	+ LIBS="$LIBS -lws2_32 -lwtsapi32 -lcomdlg32"
	114	+ DLLEXT=".dll"
135	115
136		-app_cv_description="Python binding for pw3270/lib3270"
	116	+ app_win32_revision=$(date +%-y.%-m.%-d.%-H)
	117	+ AC_SUBST(WIN32_VERSION,$app_win32_revision)
137	118
138		-AC_DEFINE_UNQUOTED(PACKAGE_DESCRIPTION,"$app_cv_description")
139		-AC_SUBST(PACKAGE_DESCRIPTION,"$app_cv_description")
	119	+ app_win32_file_version=$(date +%-y,%-m,%-d,%-H)
	120	+ AC_SUBST(WIN32_FILE_VERSION,$app_win32_file_version)
140	121
141		-dnl ---------------------------------------------------------------------------
142		-dnl Check for Python
143		-dnl ---------------------------------------------------------------------------
	122	+dnl AC_CONFIG_FILES(src/core/windows/resources.rc)
	123	+dnl AC_CONFIG_FILES(win/py3270.nsi)
144	124
145		-PKG_CHECK_MODULES( [PYTHON], [python], AC_DEFINE(HAVE_PYTHON))
	125	+ if test "$host_cpu" = "x86_64"; then
	126	+ app_cv_programfiles="PROGRAMFILES64"
	127	+ app_cv_winarch="64"
	128	+ else
	129	+ app_cv_programfiles="PROGRAMFILES"
	130	+ app_cv_winarch="32"
	131	+ fi
146	132
147		-AC_SUBST(PYTHON_LIBS)
148		-AC_SUBST(PYTHON_CFLAGS)
	133	+ AC_SUBST(PROGRAMFILES,$app_cv_programfiles)
	134	+ AC_SUBST(WINARCH,$app_cv_winarch)
	135	+ AC_SUBST(SONAME,py3270.dll)
149	136
150		-dnl ---------------------------------------------------------------------------
151		-dnl Check for D-Bus
152		-dnl ---------------------------------------------------------------------------
	137	+ ;;
153	138
154		-PKG_CHECK_MODULES( [DBUS], [dbus-1], AC_DEFINE(HAVE_DBUS), AC_MSG_NOTICE([ No DBUS support.]) )
155		-AC_SUBST(DBUS_LIBS)
156		-AC_SUBST(DBUS_CFLAGS)
	139	+ *)
	140	+ CFLAGS="$CFLAGS -pthread"
	141	+ LDFLAGS="$LDFLAGS -pthread"
	142	+ app_cv_datadir="/usr/share"
	143	+ app_cv_confdir="/etc"
	144	+ app_cv_osname="linux"
	145	+ LOGDIR="/var/log"
	146	+ DLLEXT=".so"
	147	+ AC_SUBST(SONAME,py3270.so.$app_vrs_major.$app_vrs_minor)
157	148
158		-dnl ---------------------------------------------------------------------------
159		-dnl Check for integer types & library functions
160		-dnl ---------------------------------------------------------------------------
	149	+esac
161	150
162		-AC_CHECK_TYPES([pid_t, uint8_t, uint16_t, uint32_t, int32_t, uint64_t, int64_t])
163		-AC_CHECK_FUNCS(srandom random getopt asprintf vasprintf)
164		-AC_CHECK_FUNCS(getaddrinfo sendfile poll eventfd statfs64)
	151	+AC_SUBST(DATADIR,$app_cv_datadir)
	152	+AC_SUBST(CONFDIR,$app_cv_confdir)
	153	+AC_SUBST(OSNAME,$app_cv_osname)
	154	+AC_SUBST(LIBS)
	155	+AC_SUBST(LOGDIR)
	156	+AC_SUBST(DLLEXT)
	157	+AC_SUBST(DLLPREFIX)
	158	+AC_SUBST(LDFLAGS)
	159	+AC_SUBST(DLL_LDFLAGS)
165	160
166	161	dnl ---------------------------------------------------------------------------
167		-dnl Check for libintl
	162	+dnl Check for other programs
168	163	dnl ---------------------------------------------------------------------------
169	164
170		-AC_PATH_TOOL([XGETTEXT], [xgettext], [no])
171		-AC_PATH_TOOL([MSGCAT], [msgcat], [no])
172		-AC_PATH_TOOL([MSGINIT], [msginit], [no])
173		-AC_PATH_TOOL([MSGMERGE], [msgmerge], [no])
174		-AC_PATH_TOOL([MSGFMT], [msgfmt], [no])
	165	+AC_PATH_TOOL([AR], [ar], [ar])
	166	+AC_PATH_TOOL([WINDRES], [windres], [no])
	167	+AC_PATH_TOOL([VALGRIND], [valgrind], [no])
175	168
176		-AC_CHECK_HEADER(libintl.h, [
177		- AC_DEFINE(HAVE_LIBINTL, 1)
178		-])
	169	+PKG_CHECK_EXISTS
179	170
180	171	dnl ---------------------------------------------------------------------------
181	172	dnl Check for C++ 2011 support
...	...	@@ -199,118 +190,95 @@ AS_VAR_POPDEF([CACHEVAR])dnl
199	190	AX_CHECK_COMPILE_FLAG([-std=gnu++11], [CFLAGS="$CFLAGS -std=gnu++11"])
200	191
201	192	dnl ---------------------------------------------------------------------------
202		-dnl Check for ELF symbol visibility support
	193	+dnl Check for IPC3270
203	194	dnl ---------------------------------------------------------------------------
204		-m4_define([GLIB_CHECK_COMPILE_WARNINGS],
205		-[m4_ifvaln([$1], [AC_LANG_CONFTEST([$1])])dnl
206		-rm -f conftest.$ac_objext
207		-glib_ac_compile_save="$ac_compile"
208		-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext'
209		-AS_IF([_AC_EVAL_STDERR($ac_compile) &&
210		- AC_TRY_COMMAND([(if test -s conftest.err; then false ; else true; fi)])],
211		- [$2],
212		- [echo "$as_me: failed program was:" >&AS_MESSAGE_LOG_FD
213		-cat conftest.$ac_ext >&AS_MESSAGE_LOG_FD
214		-m4_ifvaln([$3],[$3])dnl])
215		-ac_compile="$glib_ac_compile_save"
216		-rm -f conftest.$ac_objext conftest.err m4_ifval([$1], [conftest.$ac_ext])[]dnl
217		-])# GLIB_CHECK_COMPILE_WARNINGS
218		-
219		-AC_MSG_CHECKING(for GNUC visibility attribute)
220		-GLIB_CHECK_COMPILE_WARNINGS([
221		-void
222		-__attribute__ ((visibility ("hidden")))
223		- f_hidden (void)
224		-{
225		-}
226		-void
227		-__attribute__ ((visibility ("internal")))
228		- f_internal (void)
229		-{
230		-}
231		-void
232		-__attribute__ ((visibility ("protected")))
233		- f_protected (void)
234		-{
235		-}
236		-void
237		-__attribute__ ((visibility ("default")))
238		- f_default (void)
239		-{
240		-}
241		-int main (int argc, char **argv)
242		-{
243		- f_hidden();
244		- f_internal();
245		- f_protected();
246		- f_default();
247		- return 0;
248		-}
249		-],g_have_gnuc_visibility=yes,g_have_gnuc_visibility=no)
250		-AC_MSG_RESULT($g_have_gnuc_visibility)
251		-if test x$g_have_gnuc_visibility = xyes; then
252		- AC_DEFINE(HAVE_GNUC_VISIBILITY, 1, [supports GCC visibility attributes])
	195	+
	196	+AC_ARG_WITH([static-ipc3270],
	197	+ [AS_HELP_STRING([--with-static-ipc3270], [Uses static version of ipc3270])],
	198	+[
	199	+ app_cv_static_ipc3270=$withval
	200	+],[
	201	+ app_cv_static_ipc3270="auto"
	202	+])
	203	+
	204	+if test "$app_cv_static_ipc3270" == "auto"; then
	205	+ case "$host" in
	206	+ -mingw32\|-pc-msys)
	207	+ app_cv_static_ipc3270="yes"
	208	+ ;;
	209	+
	210	+ *)
	211	+ app_cv_static_ipc3270="no"
	212	+
	213	+ esac
	214	+
	215	+fi
	216	+
	217	+if test "$app_cv_static_ipc3270" == "yes"; then
	218	+ LDFLAGS="-static -static-libgcc -static-libstdc++ $LDFLAGS"
	219	+ PKG_CHECK_MODULES( [IPC3270], [ipc3270-static], AC_DEFINE(USING_STATIC_IPC3270), AC_MSG_ERROR([IPC3270 not present.]))
	220	+else
	221	+ PKG_CHECK_MODULES( [IPC3270], [ipc3270], AC_DEFINE(USING_SHARED_IPC3270), AC_MSG_ERROR([IPC3270 not present.]))
253	222	fi
254	223
	224	+AC_SUBST(IPC3270_LIBS)
	225	+AC_SUBST(IPC3270_CFLAGS)
	226	+
	227	+AC_ARG_WITH([product-name], [AS_HELP_STRING([--with-product-name], [Set product name])], [ app_cv_product="$withval" ],[ app_cv_product=`pkg-config --variable=product_name ipc3270` ])
	228	+AC_DEFINE_UNQUOTED(PRODUCT_NAME, $app_cv_product)
	229	+AC_SUBST(PRODUCT_NAME,$app_cv_product)
	230	+
255	231	dnl ---------------------------------------------------------------------------
256		-dnl Check for compiler visibility flag
	232	+dnl Check for Python
257	233	dnl ---------------------------------------------------------------------------
258		-dnl AC_MSG_CHECKING(whether $CC accepts -fvisibility=hidden)
259		-dnl AC_CACHE_VAL(app_cv_fvisibility_ok,
260		-dnl [ac_save_cc="$CC"
261		-dnl CC="$CC -fvisibility=hidden"
262		-dnl AC_TRY_RUN([int main() { return 0; }],
263		-dnl app_cv_fvisibility_ok=yes,
264		-dnl app_cv_fvisibility_ok=no,
265		-dnl app_cv_fvisibility_ok=no)
266		-dnl CC="$ac_save_cc"])
267		-dnl AC_MSG_RESULT($app_cv_fvisibility_ok)
268		-dnl if test $app_cv_fvisibility_ok = yes; then
269		-dnl CFLAGS="$CFLAGS -fvisibility=hidden"
270		-dnl fi
	234	+
	235	+PKG_CHECK_MODULES( [PYTHON], [python], AC_DEFINE(HAVE_PYTHON), AC_MSG_ERROR([Python devel is unavailable]))
	236	+
	237	+AC_SUBST(PYTHON_LIBS)
	238	+AC_SUBST(PYTHON_CFLAGS)
	239	+
271	240
272	241	dnl ---------------------------------------------------------------------------
273	242	dnl Check for pic
274	243	dnl ---------------------------------------------------------------------------
	244	+
275	245	AC_ARG_ENABLE([pic],
276	246	[AS_HELP_STRING([--disable-pic], [disable support for PIC libraries (required to compile on 64bits)])],
277	247	[
278	248	app_cv_pic="$enableval"
279	249	],[
280	250
281		- case "$host" in
282		- *-mingw32)
283		- app_cv_pic="no"
284		- ;;
	251	+ case "$host_cpu" in
	252	+ x86_64)
	253	+ app_cv_pic="yes"
	254	+ ;;
	255	+
	256	+ aarch64)
	257	+ app_cv_pic="yes"
	258	+ ;;
285	259
286	260	*)
287		- if test "$host_cpu" = "x86_64"; then
288		- app_cv_pic="yes"
289		- else
290		- app_cv_pic="no"
291		- fi
	261	+ app_cv_pic="no"
292	262	esac
	263	+
293	264	])
294	265
295	266	if test "$app_cv_pic" == "yes"; then
296	267	CFLAGS="$CFLAGS -fPIC"
	268	+ CXXFLAGS="$CXXFLAGS -fPIC"
297	269	fi
298	270
299	271	dnl ---------------------------------------------------------------------------
300		-dnl Output config
301		-dnl ---------------------------------------------------------------------------
302		-
303		-AC_SUBST(BASEDIR,$ac_pwd)
304		-
305		-dnl ---------------------------------------------------------------------------
306	272	dnl Configure which files to generate.
307	273	dnl ---------------------------------------------------------------------------
308	274
309		-AC_CONFIG_FILES(Makefile)
	275	+# AC_CONFIG_FILES(Makefile)
310	276
311	277	dnl ---------------------------------------------------------------------------
312	278	dnl Output the generated config.status script.
313	279	dnl ---------------------------------------------------------------------------
	280	+AC_SUBST(BASEDIR,$ac_pwd)
	281	+
314	282	AC_OUTPUT
315	283
316	284
...	...
...	...	@@ -1,251 +0,0 @@
1		-#!/bin/sh
2		-#
3		-# install - install a program, script, or datafile
4		-# This comes from X11R5 (mit/util/scripts/install.sh).
5		-#
6		-# Copyright 1991 by the Massachusetts Institute of Technology
7		-#
8		-# Permission to use, copy, modify, distribute, and sell this software and its
9		-# documentation for any purpose is hereby granted without fee, provided that
10		-# the above copyright notice appear in all copies and that both that
11		-# copyright notice and this permission notice appear in supporting
12		-# documentation, and that the name of M.I.T. not be used in advertising or
13		-# publicity pertaining to distribution of the software without specific,
14		-# written prior permission. M.I.T. makes no representations about the
15		-# suitability of this software for any purpose. It is provided "as is"
16		-# without express or implied warranty.
17		-#
18		-# Calling this script install-sh is preferred over install.sh, to prevent
19		-# `make' implicit rules from creating a file called install from it
20		-# when there is no Makefile.
21		-#
22		-# This script is compatible with the BSD install script, but was written
23		-# from scratch. It can only install one file at a time, a restriction
24		-# shared with many OS's install programs.
25		-
26		-
27		-# set DOITPROG to echo to test this script
28		-
29		-# Don't use :- since 4.3BSD and earlier shells don't like it.
30		-doit="${DOITPROG-}"
31		-
32		-
33		-# put in absolute paths if you don't have them in your path; or use env. vars.
34		-
35		-mvprog="${MVPROG-mv}"
36		-cpprog="${CPPROG-cp}"
37		-chmodprog="${CHMODPROG-chmod}"
38		-chownprog="${CHOWNPROG-chown}"
39		-chgrpprog="${CHGRPPROG-chgrp}"
40		-stripprog="${STRIPPROG-strip}"
41		-rmprog="${RMPROG-rm}"
42		-mkdirprog="${MKDIRPROG-mkdir}"
43		-
44		-transformbasename=""
45		-transform_arg=""
46		-instcmd="$mvprog"
47		-chmodcmd="$chmodprog 0755"
48		-chowncmd=""
49		-chgrpcmd=""
50		-stripcmd=""
51		-rmcmd="$rmprog -f"
52		-mvcmd="$mvprog"
53		-src=""
54		-dst=""
55		-dir_arg=""
56		-
57		-while [ x"$1" != x ]; do
58		- case $1 in
59		- -c) instcmd="$cpprog"
60		- shift
61		- continue;;
62		-
63		- -d) dir_arg=true
64		- shift
65		- continue;;
66		-
67		- -m) chmodcmd="$chmodprog $2"
68		- shift
69		- shift
70		- continue;;
71		-
72		- -o) chowncmd="$chownprog $2"
73		- shift
74		- shift
75		- continue;;
76		-
77		- -g) chgrpcmd="$chgrpprog $2"
78		- shift
79		- shift
80		- continue;;
81		-
82		- -s) stripcmd="$stripprog"
83		- shift
84		- continue;;
85		-
86		- -t=*) transformarg=`echo $1 \| sed 's/-t=//'`
87		- shift
88		- continue;;
89		-
90		- -b=*) transformbasename=`echo $1 \| sed 's/-b=//'`
91		- shift
92		- continue;;
93		-
94		- *) if [ x"$src" = x ]
95		- then
96		- src=$1
97		- else
98		- # this colon is to work around a 386BSD /bin/sh bug
99		- :
100		- dst=$1
101		- fi
102		- shift
103		- continue;;
104		- esac
105		-done
106		-
107		-if [ x"$src" = x ]
108		-then
109		- echo "install: no input file specified"
110		- exit 1
111		-else
112		- :
113		-fi
114		-
115		-if [ x"$dir_arg" != x ]; then
116		- dst=$src
117		- src=""
118		-
119		- if [ -d $dst ]; then
120		- instcmd=:
121		- chmodcmd=""
122		- else
123		- instcmd=$mkdirprog
124		- fi
125		-else
126		-
127		-# Waiting for this to be detected by the "$instcmd $src $dsttmp" command
128		-# might cause directories to be created, which would be especially bad
129		-# if $src (and thus $dsttmp) contains '*'.
130		-
131		- if [ -f $src -o -d $src ]
132		- then
133		- :
134		- else
135		- echo "install: $src does not exist"
136		- exit 1
137		- fi
138		-
139		- if [ x"$dst" = x ]
140		- then
141		- echo "install: no destination specified"
142		- exit 1
143		- else
144		- :
145		- fi
146		-
147		-# If destination is a directory, append the input filename; if your system
148		-# does not like double slashes in filenames, you may need to add some logic
149		-
150		- if [ -d $dst ]
151		- then
152		- dst="$dst"/`basename $src`
153		- else
154		- :
155		- fi
156		-fi
157		-
158		-## this sed command emulates the dirname command
159		-dstdir=`echo $dst \| sed -e 's,[^/]*$,,;s,/$,,;s,^$,.,'`
160		-
161		-# Make sure that the destination directory exists.
162		-# this part is taken from Noah Friedman's mkinstalldirs script
163		-
164		-# Skip lots of stat calls in the usual case.
165		-if [ ! -d "$dstdir" ]; then
166		-defaultIFS='
167		- '
168		-IFS="${IFS-${defaultIFS}}"
169		-
170		-oIFS="${IFS}"
171		-# Some sh's can't handle IFS=/ for some reason.
172		-IFS='%'
173		-set - `echo ${dstdir} \| sed -e 's@/@%@g' -e 's@^%@/@'`
174		-IFS="${oIFS}"
175		-
176		-pathcomp=''
177		-
178		-while [ $# -ne 0 ] ; do
179		- pathcomp="${pathcomp}${1}"
180		- shift
181		-
182		- if [ ! -d "${pathcomp}" ] ;
183		- then
184		- $mkdirprog "${pathcomp}"
185		- else
186		- :
187		- fi
188		-
189		- pathcomp="${pathcomp}/"
190		-done
191		-fi
192		-
193		-if [ x"$dir_arg" != x ]
194		-then
195		- $doit $instcmd $dst &&
196		-
197		- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dst; else : ; fi &&
198		- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dst; else : ; fi &&
199		- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dst; else : ; fi &&
200		- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dst; else : ; fi
201		-else
202		-
203		-# If we're going to rename the final executable, determine the name now.
204		-
205		- if [ x"$transformarg" = x ]
206		- then
207		- dstfile=`basename $dst`
208		- else
209		- dstfile=`basename $dst $transformbasename \|
210		- sed $transformarg`$transformbasename
211		- fi
212		-
213		-# don't allow the sed command to completely eliminate the filename
214		-
215		- if [ x"$dstfile" = x ]
216		- then
217		- dstfile=`basename $dst`
218		- else
219		- :
220		- fi
221		-
222		-# Make a temp file name in the proper directory.
223		-
224		- dsttmp=$dstdir/#inst.$$#
225		-
226		-# Move or copy the file name to the temp name
227		-
228		- $doit $instcmd $src $dsttmp &&
229		-
230		- trap "rm -f ${dsttmp}" 0 &&
231		-
232		-# and set any options; do chmod last to preserve setuid bits
233		-
234		-# If any of these fail, we abort the whole thing. If we want to
235		-# ignore errors from any of these, just make sure not to ignore
236		-# errors from the above "$doit $instcmd $src $dsttmp" command.
237		-
238		- if [ x"$chowncmd" != x ]; then $doit $chowncmd $dsttmp; else :;fi &&
239		- if [ x"$chgrpcmd" != x ]; then $doit $chgrpcmd $dsttmp; else :;fi &&
240		- if [ x"$stripcmd" != x ]; then $doit $stripcmd $dsttmp; else :;fi &&
241		- if [ x"$chmodcmd" != x ]; then $doit $chmodcmd $dsttmp; else :;fi &&
242		-
243		-# Now rename the file to the real destination.
244		-
245		- $doit $rmcmd -f $dstdir/$dstfile &&
246		- $doit $mvcmd $dsttmp $dstdir/$dstfile
247		-
248		-fi &&
249		-
250		-
251		-exit 0
...	...	@@ -1,128 +0,0 @@
1		-/*
2		- * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270
3		- * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
4		- * aplicativos mainframe. Registro no INPI sob o nome G3270.
5		- *
6		- * Copyright (C) <2008> <Banco do Brasil S.A.>
7		- *
8		- * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
9		- * os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
10		- * Free Software Foundation.
11		- *
12		- * Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER
13		- * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO
14		- * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
15		- * obter mais detalhes.
16		- *
17		- * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
18		- * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
19		- * St, Fifth Floor, Boston, MA 02110-1301 USA
20		- *
21		- * Este programa está nomeado como actions.cc e possui - linhas de código.
22		- *
23		- * Contatos
24		- *
25		- * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
26		- * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça)
27		- *
28		- * Referências:
29		- *
30		- * <https://docs.python.org/2/extending/newtypes.html>
31		- * <https://docs.python.org/2.7/extending/extending.html#a-simple-example>
32		- *
33		- */
34		-
35		- #include "private.h"
36		-
37		-/---[ Implement ]----------------------------------------------------------------------------------/
38		-
39		- PyObject * terminal_pfkey(PyObject self, PyObject args) {
40		-
41		- int rc, key;
42		-
43		- if (!PyArg_ParseTuple(args, "i", &key)) {
44		- PyErr_SetString(terminalError, strerror(EINVAL));
45		- return NULL;
46		- }
47		-
48		- try {
49		-
50		- rc = ((pw3270_TerminalObject *) self)->session->pfkey(key);
51		-
52		- } catch(std::exception &e) {
53		-
54		- PyErr_SetString(terminalError, e.what());
55		- return NULL;
56		- }
57		-
58		- return PyLong_FromLong(rc);
59		-
60		- }
61		-
62		- PyObject * terminal_pakey(PyObject self, PyObject args) {
63		-
64		- int rc, key;
65		-
66		- if (!PyArg_ParseTuple(args, "i", &key)) {
67		- PyErr_SetString(terminalError, strerror(EINVAL));
68		- return NULL;
69		- }
70		-
71		- try {
72		-
73		- rc = ((pw3270_TerminalObject *) self)->session->pakey(key);
74		-
75		- } catch(std::exception &e) {
76		-
77		- PyErr_SetString(terminalError, e.what());
78		- return NULL;
79		- }
80		-
81		- return PyLong_FromLong(rc);
82		-
83		- }
84		-
85		- PyObject * terminal_enter(PyObject self, PyObject args) {
86		-
87		- int rc;
88		-
89		- try {
90		-
91		- rc = ((pw3270_TerminalObject *) self)->session->enter();
92		-
93		- } catch(std::exception &e) {
94		-
95		- PyErr_SetString(terminalError, e.what());
96		- return NULL;
97		- }
98		-
99		- return PyLong_FromLong(rc);
100		-
101		-
102		- }
103		-
104		- PyObject * terminal_action(PyObject self, PyObject args) {
105		-
106		- int rc;
107		- const char *name;
108		-
109		- if (!PyArg_ParseTuple(args, "s", &name)) {
110		- PyErr_SetString(terminalError, strerror(EINVAL));
111		- return NULL;
112		- }
113		-
114		- try {
115		-
116		- rc = ((pw3270_TerminalObject *) self)->session->action(name);
117		-
118		- } catch(std::exception &e) {
119		-
120		- PyErr_SetString(terminalError, e.what());
121		- return NULL;
122		- }
123		-
124		- return PyLong_FromLong(rc);
125		-
126		-
127		- }
128		-
...	...	@@ -1,51 +0,0 @@
1		-/**
2		- * @file config.h
3		- *
4		- * @brief Configuração para o aplicativo.
5		- *
6		- * Gerado automaticamente pelo processo ./configure esse arquivo descreve
7		- * as configurações de ambiente detectadas automaticamente.
8		- *
9		- * @author perry.werneck@gmail.com
10		- *
11		- */
12		-
13		-#ifndef CONFIG_H_INCLUDED
14		-
15		- #define CONFIG_H_INCLUDED 1
16		-
17		- /**
18		- * @brief Nome do pacote.
19		- */
20		- #undef PACKAGE_NAME
21		-
22		- /**
23		- * @brief Versão atual.
24		- */
25		- #undef PACKAGE_VERSION
26		-
27		- /**
28		- * @brief Revisão svn quando o pacote foi configurado.
29		- *
30		- */
31		- #undef PACKAGE_REVISION
32		-
33		- /**
34		- * @brief Descrição do aplicativo.
35		- */
36		- #undef PACKAGE_DESCRIPTION
37		-
38		- /**
39		- * @brief Indica se o compilador atual possui suporte a "visibility"
40		- *
41		- * Quando disponível indica que o compilador atual permite tornar
42		- * visíveis numa biblioteca apenas as funções declaradas para isso
43		- * evitando que todos os símbolos fiquem visíveis.
44		- *
45		- * Isso permite um melhor controle sobre quais funções podem ser usados
46		- * pelo programa principal.
47		- *
48		- */
49		- #undef HAVE_GNUC_VISIBILITY
50		-
51		-#endif // CONFIG_H_INCLUDED
...	...	@@ -0,0 +1,128 @@
	1	+/*
	2	+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270
	3	+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
	4	+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
	5	+ *
	6	+ * Copyright (C) <2008> <Banco do Brasil S.A.>
	7	+ *
	8	+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
	9	+ * os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
	10	+ * Free Software Foundation.
	11	+ *
	12	+ * Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER
	13	+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO
	14	+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
	15	+ * obter mais detalhes.
	16	+ *
	17	+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
	18	+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
	19	+ * St, Fifth Floor, Boston, MA 02110-1301 USA
	20	+ *
	21	+ * Este programa está nomeado como actions.cc e possui - linhas de código.
	22	+ *
	23	+ * Contatos
	24	+ *
	25	+ * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
	26	+ * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça)
	27	+ *
	28	+ * Referências:
	29	+ *
	30	+ * <https://docs.python.org/2/extending/newtypes.html>
	31	+ * <https://docs.python.org/2.7/extending/extending.html#a-simple-example>
	32	+ *
	33	+ */
	34	+
	35	+ #include "private.h"
	36	+
	37	+/---[ Implement ]----------------------------------------------------------------------------------/
	38	+
	39	+ PyObject * terminal_pfkey(PyObject self, PyObject args) {
	40	+
	41	+ int rc, key;
	42	+
	43	+ if (!PyArg_ParseTuple(args, "i", &key)) {
	44	+ PyErr_SetString(terminalError, strerror(EINVAL));
	45	+ return NULL;
	46	+ }
	47	+
	48	+ try {
	49	+
	50	+ rc = ((pw3270_TerminalObject *) self)->session->pfkey(key);
	51	+
	52	+ } catch(std::exception &e) {
	53	+
	54	+ PyErr_SetString(terminalError, e.what());
	55	+ return NULL;
	56	+ }
	57	+
	58	+ return PyLong_FromLong(rc);
	59	+
	60	+ }
	61	+
	62	+ PyObject * terminal_pakey(PyObject self, PyObject args) {
	63	+
	64	+ int rc, key;
	65	+
	66	+ if (!PyArg_ParseTuple(args, "i", &key)) {
	67	+ PyErr_SetString(terminalError, strerror(EINVAL));
	68	+ return NULL;
	69	+ }
	70	+
	71	+ try {
	72	+
	73	+ rc = ((pw3270_TerminalObject *) self)->session->pakey(key);
	74	+
	75	+ } catch(std::exception &e) {
	76	+
	77	+ PyErr_SetString(terminalError, e.what());
	78	+ return NULL;
	79	+ }
	80	+
	81	+ return PyLong_FromLong(rc);
	82	+
	83	+ }
	84	+
	85	+ PyObject * terminal_enter(PyObject self, PyObject args) {
	86	+
	87	+ int rc;
	88	+
	89	+ try {
	90	+
	91	+ rc = ((pw3270_TerminalObject *) self)->session->enter();
	92	+
	93	+ } catch(std::exception &e) {
	94	+
	95	+ PyErr_SetString(terminalError, e.what());
	96	+ return NULL;
	97	+ }
	98	+
	99	+ return PyLong_FromLong(rc);
	100	+
	101	+
	102	+ }
	103	+
	104	+ PyObject * terminal_action(PyObject self, PyObject args) {
	105	+
	106	+ int rc;
	107	+ const char *name;
	108	+
	109	+ if (!PyArg_ParseTuple(args, "s", &name)) {
	110	+ PyErr_SetString(terminalError, strerror(EINVAL));
	111	+ return NULL;
	112	+ }
	113	+
	114	+ try {
	115	+
	116	+ rc = ((pw3270_TerminalObject *) self)->session->action(name);
	117	+
	118	+ } catch(std::exception &e) {
	119	+
	120	+ PyErr_SetString(terminalError, e.what());
	121	+ return NULL;
	122	+ }
	123	+
	124	+ return PyLong_FromLong(rc);
	125	+
	126	+
	127	+ }
	128	+
...	...
...	...	@@ -0,0 +1,154 @@
	1	+/*
	2	+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270
	3	+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
	4	+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
	5	+ *
	6	+ * Copyright (C) <2008> <Banco do Brasil S.A.>
	7	+ *
	8	+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
	9	+ * os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
	10	+ * Free Software Foundation.
	11	+ *
	12	+ * Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER
	13	+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO
	14	+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
	15	+ * obter mais detalhes.
	16	+ *
	17	+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
	18	+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
	19	+ * St, Fifth Floor, Boston, MA 02110-1301 USA
	20	+ *
	21	+ * Este programa está nomeado como get.cc e possui - linhas de código.
	22	+ *
	23	+ * Contatos:
	24	+ *
	25	+ * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
	26	+ * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça)
	27	+ *
	28	+ * Referências:
	29	+ *
	30	+ * <https://docs.python.org/2/extending/newtypes.html>
	31	+ * <https://docs.python.org/2.7/extending/extending.html#a-simple-example>
	32	+ *
	33	+ */
	34	+
	35	+ #include "private.h"
	36	+
	37	+
	38	+/---[ Implement ]----------------------------------------------------------------------------------/
	39	+
	40	+PyObject * terminal_get_version(PyObject self, PyObject args) {
	41	+
	42	+ return PyString_FromString( ((pw3270_TerminalObject *) self)->session->get_version().c_str() );
	43	+
	44	+}
	45	+
	46	+PyObject * terminal_get_revision(PyObject self, PyObject args) {
	47	+
	48	+ return PyString_FromString( ((pw3270_TerminalObject *) self)->session->get_revision().c_str() );
	49	+
	50	+}
	51	+
	52	+PyObject * terminal_is_connected(PyObject self, PyObject args) {
	53	+
	54	+ return PyBool_FromLong( ((pw3270_TerminalObject *) self)->session->is_connected() );
	55	+
	56	+}
	57	+
	58	+PyObject * terminal_is_ready(PyObject self, PyObject args) {
	59	+
	60	+ return PyBool_FromLong( ((pw3270_TerminalObject *) self)->session->is_ready() );
	61	+
	62	+}
	63	+
	64	+PyObject * terminal_is_protected_at(PyObject self, PyObject args) {
	65	+
	66	+ int rc, row, col;
	67	+
	68	+ if (!PyArg_ParseTuple(args, "ii", &row, &col)) {
	69	+ PyErr_SetString(terminalError, strerror(EINVAL));
	70	+ return NULL;
	71	+ }
	72	+
	73	+ try {
	74	+
	75	+ rc = ((pw3270_TerminalObject *) self)->session->get_is_protected_at(row,col);
	76	+
	77	+ } catch(std::exception &e) {
	78	+
	79	+ PyErr_SetString(terminalError, e.what());
	80	+ return NULL;
	81	+ }
	82	+
	83	+ return PyBool_FromLong( rc );
	84	+
	85	+}
	86	+
	87	+
	88	+PyObject * terminal_cmp_string_at(PyObject self, PyObject args) {
	89	+
	90	+ int row, col, rc;
	91	+ const char *text;
	92	+
	93	+ if (!PyArg_ParseTuple(args, "iis", &row, &col, &text)) {
	94	+ PyErr_SetString(terminalError, strerror(EINVAL));
	95	+ return NULL;
	96	+ }
	97	+
	98	+ try {
	99	+
	100	+ rc = ((pw3270_TerminalObject *) self)->session->cmp_string_at(row,col,text);
	101	+
	102	+ } catch(std::exception &e) {
	103	+
	104	+ PyErr_SetString(terminalError, e.what());
	105	+ return NULL;
	106	+ }
	107	+
	108	+ return PyLong_FromLong(rc);
	109	+
	110	+}
	111	+
	112	+PyObject * terminal_get_string_at(PyObject self, PyObject args) {
	113	+
	114	+ int row, col, sz;
	115	+ string rc;
	116	+
	117	+ if (!PyArg_ParseTuple(args, "iii", &row, &col, &sz)) {
	118	+ PyErr_SetString(terminalError, strerror(EINVAL));
	119	+ return NULL;
	120	+ }
	121	+
	122	+ try {
	123	+
	124	+ rc = ((pw3270_TerminalObject *) self)->session->get_string_at(row,col,sz);
	125	+
	126	+ } catch(std::exception &e) {
	127	+
	128	+ PyErr_SetString(terminalError, e.what());
	129	+ return NULL;
	130	+ }
	131	+
	132	+ return PyString_FromString(rc.c_str());
	133	+
	134	+}
	135	+
	136	+PyObject * terminal_get_contents(PyObject *self) {
	137	+
	138	+ string rc;
	139	+
	140	+ try {
	141	+
	142	+ rc = ((pw3270_TerminalObject *) self)->session->get_string();
	143	+
	144	+ } catch(std::exception &e) {
	145	+
	146	+ PyErr_SetString(terminalError, e.what());
	147	+ return NULL;
	148	+ }
	149	+
	150	+ return PyString_FromString(rc.c_str());
	151	+
	152	+
	153	+
	154	+}
...	...
...	...	@@ -0,0 +1,87 @@
	1	+/*
	2	+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270
	3	+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
	4	+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
	5	+ *
	6	+ * Copyright (C) <2008> <Banco do Brasil S.A.>
	7	+ *
	8	+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
	9	+ * os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
	10	+ * Free Software Foundation.
	11	+ *
	12	+ * Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER
	13	+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO
	14	+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
	15	+ * obter mais detalhes.
	16	+ *
	17	+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
	18	+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
	19	+ * St, Fifth Floor, Boston, MA 02110-1301 USA
	20	+ *
	21	+ * Este programa está nomeado como py3270.cc e possui - linhas de código.
	22	+ *
	23	+ * Contatos:
	24	+ *
	25	+ * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
	26	+ * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça)
	27	+ *
	28	+ * Implementa métodos básicos inicio/final do objeto python
	29	+ *
	30	+ * Referências:
	31	+ *
	32	+ * <https://docs.python.org/2/extending/newtypes.html>
	33	+ * <https://docs.python.org/2.7/extending/extending.html#a-simple-example>
	34	+ *
	35	+ */
	36	+
	37	+ #include "private.h"
	38	+
	39	+
	40	+/---[ Implement ]----------------------------------------------------------------------------------/
	41	+
	42	+PyObject * terminal_new(PyTypeObject type, PyObject args, PyObject *kwds) {
	43	+
	44	+ PW3270_NAMESPACE::session * session;
	45	+ const char *id = "";
	46	+
	47	+ if (!PyArg_ParseTuple(args, "s", &id)) {
	48	+ id = "";
	49	+ }
	50	+
	51	+ trace("%s(%s)",__FUNCTION__,id);
	52	+
	53	+ try {
	54	+
	55	+ session = PW3270_NAMESPACE::session::create(id);
	56	+
	57	+ } catch(std::exception &e) {
	58	+
	59	+ trace("%s failed: %s",__FUNCTION__,e.what());
	60	+ PyErr_SetString(terminalError, e.what());
	61	+ return NULL;
	62	+
	63	+ }
	64	+
	65	+ pw3270_TerminalObject self = (pw3270_TerminalObject ) type->tp_alloc(type, 0);
	66	+
	67	+ self->session = session;
	68	+
	69	+ return (PyObject *)self;
	70	+}
	71	+
	72	+
	73	+int terminal_init(pw3270_TerminalObject self, PyObject args, PyObject *kwds) {
	74	+
	75	+ return 0;
	76	+
	77	+}
	78	+
	79	+void terminal_dealloc(pw3270_TerminalObject * self) {
	80	+
	81	+ trace("%s",__FUNCTION__);
	82	+
	83	+ delete self->session;
	84	+
	85	+ self->ob_type->tp_free((PyObject*)self);
	86	+
	87	+}
...	...
...	...	@@ -0,0 +1,134 @@
	1	+/*
	2	+ * "Software pw3270, desenvolvido com base nos códigos fontes do WC3270 e X3270
	3	+ * (Paul Mattes Paul.Mattes@usa.net), de emulação de terminal 3270 para acesso a
	4	+ * aplicativos mainframe. Registro no INPI sob o nome G3270.
	5	+ *
	6	+ * Copyright (C) <2008> <Banco do Brasil S.A.>
	7	+ *
	8	+ * Este programa é software livre. Você pode redistribuí-lo e/ou modificá-lo sob
	9	+ * os termos da GPL v.2 - Licença Pública Geral GNU, conforme publicado pela
	10	+ * Free Software Foundation.
	11	+ *
	12	+ * Este programa é distribuído na expectativa de ser útil, mas SEM QUALQUER
	13	+ * GARANTIA; sem mesmo a garantia implícita de COMERCIALIZAÇÃO ou de ADEQUAÇÃO
	14	+ * A QUALQUER PROPÓSITO EM PARTICULAR. Consulte a Licença Pública Geral GNU para
	15	+ * obter mais detalhes.
	16	+ *
	17	+ * Você deve ter recebido uma cópia da Licença Pública Geral GNU junto com este
	18	+ * programa; se não, escreva para a Free Software Foundation, Inc., 51 Franklin
	19	+ * St, Fifth Floor, Boston, MA 02110-1301 USA
	20	+ *
	21	+ * Este programa está nomeado como misc.cc e possui - linhas de código.
	22	+ *
	23	+ * Contatos:
	24	+ *
	25	+ * perry.werneck@gmail.com (Alexandre Perry de Souza Werneck)
	26	+ * erico.mendonca@gmail.com (Erico Mascarenhas Mendonça)
	27	+ *
	28	+ * Implementa métodos básicos inicio/final do objeto python
	29	+ *
	30	+ * Referências:
	31	+ *
	32	+ * <https://docs.python.org/2/extending/newtypes.html>
	33	+ * <https://docs.python.org/2.7/extending/extending.html#a-simple-example>
	34	+ *
	35	+ */
	36	+
	37	+ #include "private.h"
	38	+
	39	+
	40	+/---[ Implement ]----------------------------------------------------------------------------------/
	41	+
	42	+ PyObject * terminal_connect(PyObject self, PyObject args) {
	43	+
	44	+ int rc = -1;
	45	+ int wait = 60;
	46	+ const char * host = "";
	47	+
	48	+ if (!PyArg_ParseTuple(args, "s\|i", &host, &wait)) {
	49	+ PyErr_SetString(terminalError, "connect requires a host URL");
	50	+ return NULL;
	51	+ }
	52	+
	53	+ try {
	54	+
	55	+ rc = ((pw3270_TerminalObject *) self)->session->connect(host,wait);
	56	+
	57	+ } catch(std::exception &e) {
	58	+
	59	+ PyErr_SetString(terminalError, e.what());
	60	+ return NULL;
	61	+ }
	62	+
	63	+ return PyLong_FromLong(rc);
	64	+
	65	+ }
	66	+
	67	+ PyObject * terminal_disconnect(PyObject self, PyObject args) {
	68	+
	69	+ int rc = -1;
	70	+
	71	+ try {
	72	+
	73	+ rc = ((pw3270_TerminalObject *) self)->session->disconnect();
	74	+
	75	+ } catch(std::exception &e) {
	76	+
	77	+ PyErr_SetString(terminalError, e.what());
	78	+ return NULL;
	79	+ }
	80	+
	81	+ return PyLong_FromLong(rc);
	82	+
	83	+ }
	84	+
	85	+ PyObject * terminal_wait_for_ready(PyObject self, PyObject args) {
	86	+
	87	+ int rc;
	88	+ int timeout = 60;
	89	+
	90	+ if (!PyArg_ParseTuple(args, "\|i", &timeout)) {
	91	+ PyErr_SetString(terminalError, strerror(EINVAL));
	92	+ return NULL;
	93	+ }
	94	+
	95	+ try {
	96	+
	97	+ rc = ((pw3270_TerminalObject *) self)->session->wait_for_ready(timeout);
	98	+
	99	+ } catch(std::exception &e) {
	100	+
	101	+ PyErr_SetString(terminalError, e.what());
	102	+ return NULL;
	103	+ }
	104	+
	105	+ return PyLong_FromLong(rc);
	106	+
	107	+ }
	108	+
	109	+
	110	+ PyObject * terminal_wait_for_string_at(PyObject self, PyObject args) {
	111	+
	112	+ int row, col, rc;
	113	+ int timeout = 10;
	114	+ const char *text;
	115	+
	116	+ if (!PyArg_ParseTuple(args, "iis\|i", &row, &col, &text, &timeout)) {
	117	+ PyErr_SetString(terminalError, strerror(EINVAL));
	118	+ return NULL;
	119	+ }
	120	+
	121	+ try {
	122	+
	123	+ rc = ((pw3270_TerminalObject *) self)->session->wait_for_string_at(row,col,text,timeout);
	124	+
	125	+ } catch(std::exception &e) {
	126	+
	127	+ PyErr_SetString(terminalError, e.what());
	128	+ return NULL;
	129	+ }
	130	+
	131	+ return PyLong_FromLong(rc);
	132	+
	133	+ }
	134	+
...	...