From 2c5b8ec6d95cf68650265941530e5ce38c8dd6d9 Mon Sep 17 00:00:00 2001 From: Chris Larson Date: Thu, 9 Dec 2004 09:47:41 +0000 Subject: Merge oe-devel@oe-devel.bkbits.net:openembedded into hyperion.kergoth.com:/home/kergoth/code/openembedded 2004/12/09 03:39:39-06:00 kergoth.com!kergoth Break people's builds again.. this time moving the packages into a packages/ subdir to clean things up a bit. BKrev: 41b81f3dvlp3rU7_8MUXLcI8LDdDoA --- uae/uae-0.8.23-20040129/configure.patch | 9 - uae/uae-0.8.23-20040129/m4.patch | 4191 ------------------------------- uae/uae-0.8.23-20040129/uaerc | 61 - 3 files changed, 4261 deletions(-) delete mode 100644 uae/uae-0.8.23-20040129/configure.patch delete mode 100644 uae/uae-0.8.23-20040129/m4.patch delete mode 100644 uae/uae-0.8.23-20040129/uaerc (limited to 'uae/uae-0.8.23-20040129') diff --git a/uae/uae-0.8.23-20040129/configure.patch b/uae/uae-0.8.23-20040129/configure.patch deleted file mode 100644 index bd2ecce3d7..0000000000 --- a/uae/uae-0.8.23-20040129/configure.patch +++ /dev/null @@ -1,9 +0,0 @@ ---- tmp/base/uae-0.8.23-20040129-r0/uae-0.8.23-20040129/configure.in 2004-01-29 00:38:18.000000000 -0500 -+++ uae-0.8.23-20040129/configure.in 2004-03-05 17:26:12.000000000 -0500 -@@ -1032,5 +1032,5 @@ - export CC=$CC_FOR_BUILD - export CFLAGS=$CFLAGS_FOR_BUILD - mkdir -p src/tools -- cd src/tools && ../../"$srcdir"/src/tools/configure --cache-file=/dev/null --host=$build --target=$host -+ cd src/tools && "$srcdir"/src/tools/configure --cache-file=/dev/null --host=$build --target=$host - fi diff --git a/uae/uae-0.8.23-20040129/m4.patch b/uae/uae-0.8.23-20040129/m4.patch deleted file mode 100644 index 717e5e10d8..0000000000 --- a/uae/uae-0.8.23-20040129/m4.patch +++ /dev/null @@ -1,4191 +0,0 @@ ---- tmp/base/uae-0.8.23-20040129-r0/uae-0.8.23-20040129/aclocal.m4 2004-01-29 00:38:24.000000000 -0500 -+++ uae-0.8.23-20040129/aclocal.m4 2004-03-05 17:26:19.000000000 -0500 -@@ -1,6 +1,6 @@ --# generated automatically by aclocal 1.7.9 -*- Autoconf -*- -+# generated automatically by aclocal 1.8.2 -*- Autoconf -*- - --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002 -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 - # Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation - # gives unlimited permission to copy and/or distribute it, -@@ -11,132 +11,9 @@ - # even the implied warranty of MERCHANTABILITY or FITNESS FOR A - # PARTICULAR PURPOSE. - --# Do all the work for Automake. -*- Autoconf -*- -- --# This macro actually does too much some checks are only needed if --# your package does certain things. But this isn't really a big deal. -- --# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 --# Free Software Foundation, Inc. -- --# This program 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, 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., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --# serial 10 -- --AC_PREREQ([2.54]) -- --# Autoconf 2.50 wants to disallow AM_ names. We explicitly allow --# the ones we care about. --m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -- --# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) --# AM_INIT_AUTOMAKE([OPTIONS]) --# ----------------------------------------------- --# The call with PACKAGE and VERSION arguments is the old style --# call (pre autoconf-2.50), which is being phased out. PACKAGE --# and VERSION should now be passed to AC_INIT and removed from --# the call to AM_INIT_AUTOMAKE. --# We support both call styles for the transition. After --# the next Automake release, Autoconf can make the AC_INIT --# arguments mandatory, and then we can depend on a new Autoconf --# release and drop the old call support. --AC_DEFUN([AM_INIT_AUTOMAKE], --[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -- AC_REQUIRE([AC_PROG_INSTALL])dnl --# test to see if srcdir already configured --if test "`cd $srcdir && pwd`" != "`pwd`" && -- test -f $srcdir/config.status; then -- AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) --fi -- --# test whether we have cygpath --if test -z "$CYGPATH_W"; then -- if (cygpath --version) >/dev/null 2>/dev/null; then -- CYGPATH_W='cygpath -w' -- else -- CYGPATH_W=echo -- fi --fi --AC_SUBST([CYGPATH_W]) -- --# Define the identity of the package. --dnl Distinguish between old-style and new-style calls. --m4_ifval([$2], --[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl -- AC_SUBST([PACKAGE], [$1])dnl -- AC_SUBST([VERSION], [$2])], --[_AM_SET_OPTIONS([$1])dnl -- AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl -- AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -- --_AM_IF_OPTION([no-define],, --[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -- AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -- --# Some tools Automake needs. --AC_REQUIRE([AM_SANITY_CHECK])dnl --AC_REQUIRE([AC_ARG_PROGRAM])dnl --AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) --AM_MISSING_PROG(AUTOCONF, autoconf) --AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) --AM_MISSING_PROG(AUTOHEADER, autoheader) --AM_MISSING_PROG(MAKEINFO, makeinfo) --AM_MISSING_PROG(AMTAR, tar) --AM_PROG_INSTALL_SH --AM_PROG_INSTALL_STRIP --# We need awk for the "check" target. The system "awk" is bad on --# some platforms. --AC_REQUIRE([AC_PROG_AWK])dnl --AC_REQUIRE([AC_PROG_MAKE_SET])dnl --AC_REQUIRE([AM_SET_LEADING_DOT])dnl -- --_AM_IF_OPTION([no-dependencies],, --[AC_PROVIDE_IFELSE([AC_PROG_CC], -- [_AM_DEPENDENCIES(CC)], -- [define([AC_PROG_CC], -- defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl --AC_PROVIDE_IFELSE([AC_PROG_CXX], -- [_AM_DEPENDENCIES(CXX)], -- [define([AC_PROG_CXX], -- defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl --]) --]) -- -- --# When config.status generates a header, we must update the stamp-h file. --# This file resides in the same directory as the config header --# that is generated. The stamp files are numbered to have different names. -- --# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the --# loop where config.status creates the headers, so we can generate --# our stamp files there. --AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], --[# Compute $1's index in $config_headers. --_am_stamp_count=1 --for _am_header in $config_headers :; do -- case $_am_header in -- $1 | $1:* ) -- break ;; -- * ) -- _am_stamp_count=`expr $_am_stamp_count + 1` ;; -- esac --done --echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) -- --# Copyright 2002 Free Software Foundation, Inc. -+# -*- Autoconf -*- -+# Copyright (C) 2002, 2003 Free Software Foundation, Inc. -+# Generated from amversion.in; do not edit by hand. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -156,127 +33,20 @@ - # ---------------------------- - # Automake X.Y traces this macro to ensure aclocal.m4 has been - # generated from the m4 files accompanying Automake X.Y. --AC_DEFUN([AM_AUTOMAKE_VERSION],[am__api_version="1.7"]) -+AC_DEFUN([AM_AUTOMAKE_VERSION], [am__api_version="1.8"]) - - # AM_SET_CURRENT_AUTOMAKE_VERSION - # ------------------------------- - # Call AM_AUTOMAKE_VERSION so it can be traced. - # This function is AC_REQUIREd by AC_INIT_AUTOMAKE. - AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], -- [AM_AUTOMAKE_VERSION([1.7.9])]) -- --# Helper functions for option handling. -*- Autoconf -*- -- --# Copyright 2001, 2002 Free Software Foundation, Inc. -- --# This program 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, 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., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --# serial 2 -- --# _AM_MANGLE_OPTION(NAME) --# ----------------------- --AC_DEFUN([_AM_MANGLE_OPTION], --[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -- --# _AM_SET_OPTION(NAME) --# ------------------------------ --# Set option NAME. Presently that only means defining a flag for this option. --AC_DEFUN([_AM_SET_OPTION], --[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -- --# _AM_SET_OPTIONS(OPTIONS) --# ---------------------------------- --# OPTIONS is a space-separated list of Automake options. --AC_DEFUN([_AM_SET_OPTIONS], --[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -- --# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) --# ------------------------------------------- --# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. --AC_DEFUN([_AM_IF_OPTION], --[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -- --# --# Check to make sure that the build environment is sane. --# -- --# Copyright 1996, 1997, 2000, 2001 Free Software Foundation, Inc. -- --# This program 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, 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. -+ [AM_AUTOMAKE_VERSION([1.8.2])]) - --# 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., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -+# Figure out how to run the assembler. -*- Autoconf -*- - - # serial 3 - --# AM_SANITY_CHECK --# --------------- --AC_DEFUN([AM_SANITY_CHECK], --[AC_MSG_CHECKING([whether build environment is sane]) --# Just in case --sleep 1 --echo timestamp > conftest.file --# Do `set' in a subshell so we don't clobber the current shell's --# arguments. Must try -L first in case configure is actually a --# symlink; some systems play weird games with the mod time of symlinks --# (eg FreeBSD returns the mod time of the symlink's containing --# directory). --if ( -- set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -- if test "$[*]" = "X"; then -- # -L didn't work. -- set X `ls -t $srcdir/configure conftest.file` -- fi -- rm -f conftest.file -- if test "$[*]" != "X $srcdir/configure conftest.file" \ -- && test "$[*]" != "X conftest.file $srcdir/configure"; then -- -- # If neither matched, then we have a broken ls. This can happen -- # if, for instance, CONFIG_SHELL is bash and it inherits a -- # broken ls alias from the environment. This has actually -- # happened. Such a system could not be considered "sane". -- AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken --alias in your environment]) -- fi -- -- test "$[2]" = conftest.file -- ) --then -- # Ok. -- : --else -- AC_MSG_ERROR([newly created file is older than distributed files! --Check your system clock]) --fi --AC_MSG_RESULT(yes)]) -- --# -*- Autoconf -*- -- -- --# Copyright 1997, 1999, 2000, 2001 Free Software Foundation, Inc. -+# Copyright (C) 2001, 2003, 2004 Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -293,35 +63,20 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - # 02111-1307, USA. - --# serial 3 -- --# AM_MISSING_PROG(NAME, PROGRAM) --# ------------------------------ --AC_DEFUN([AM_MISSING_PROG], --[AC_REQUIRE([AM_MISSING_HAS_RUN]) --$1=${$1-"${am_missing_run}$2"} --AC_SUBST($1)]) -- -- --# AM_MISSING_HAS_RUN --# ------------------ --# Define MISSING if not defined so far and test if it supports --run. --# If it does, set am_missing_run to use it, otherwise, to nothing. --AC_DEFUN([AM_MISSING_HAS_RUN], --[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" --# Use eval to expand $SHELL --if eval "$MISSING --run true"; then -- am_missing_run="$MISSING --run " --else -- am_missing_run= -- AC_MSG_WARN([`missing' script is too old or missing]) --fi -+# AM_PROG_AS -+# ---------- -+AC_DEFUN([AM_PROG_AS], -+[# By default we simply use the C compiler to build assembly code. -+AC_REQUIRE([AC_PROG_CC]) -+test "${CCAS+set}" = set || CCAS=$CC -+test "${CCASFLAGS+set}" = set || CCASFLAGS=$CFLAGS -+AC_ARG_VAR([CCAS], [assembler compiler command (defaults to CC)]) -+AC_ARG_VAR([CCASFLAGS], [assembler compiler flags (defaults to CFLAGS)]) - ]) - - # AM_AUX_DIR_EXPAND - --# Copyright 2001 Free Software Foundation, Inc. -+# Copyright (C) 2001, 2003 Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -376,81 +131,16 @@ - # absolute PATH. The drawback is that using absolute paths prevent a - # configured tree to be moved without reconfiguration. - --# Rely on autoconf to set up CDPATH properly. --AC_PREREQ([2.50]) -- --AC_DEFUN([AM_AUX_DIR_EXPAND], [ -+AC_DEFUN([AM_AUX_DIR_EXPAND], -+[dnl Rely on autoconf to set up CDPATH properly. -+AC_PREREQ([2.50])dnl - # expand $ac_aux_dir to an absolute path - am_aux_dir=`cd $ac_aux_dir && pwd` - ]) - --# AM_PROG_INSTALL_SH --# ------------------ --# Define $install_sh. -- --# Copyright 2001 Free Software Foundation, Inc. -- --# This program 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, 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., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --AC_DEFUN([AM_PROG_INSTALL_SH], --[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl --install_sh=${install_sh-"$am_aux_dir/install-sh"} --AC_SUBST(install_sh)]) -- --# AM_PROG_INSTALL_STRIP -- --# Copyright 2001 Free Software Foundation, Inc. -- --# This program 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, 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., 59 Temple Place - Suite 330, Boston, MA --# 02111-1307, USA. -- --# One issue with vendor `install' (even GNU) is that you can't --# specify the program used to strip binaries. This is especially --# annoying in cross-compiling environments, where the build's strip --# is unlikely to handle the host's binaries. --# Fortunately install-sh will honor a STRIPPROG variable, so we --# always use install-sh in `make install-strip', and initialize --# STRIPPROG with the value of the STRIP variable (set by the user). --AC_DEFUN([AM_PROG_INSTALL_STRIP], --[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl --# Installed binaries are usually stripped using `strip' when the user --# run `make install-strip'. However `strip' might not be the right --# tool to use in cross-compilation environments, therefore Automake --# will honor the `STRIP' environment variable to overrule this program. --dnl Don't test for $cross_compiling = yes, because it might be `maybe'. --if test "$cross_compiling" != no; then -- AC_CHECK_TOOL([STRIP], [strip], :) --fi --INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" --AC_SUBST([INSTALL_STRIP_PROGRAM])]) -+# AM_CONDITIONAL -*- Autoconf -*- - --# -*- Autoconf -*- --# Copyright (C) 2003 Free Software Foundation, Inc. -+# Copyright (C) 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -467,24 +157,34 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - # 02111-1307, USA. - --# serial 1 -+# serial 6 - --# Check whether the underlying file-system supports filenames --# with a leading dot. For instance MS-DOS doesn't. --AC_DEFUN([AM_SET_LEADING_DOT], --[rm -rf .tst 2>/dev/null --mkdir .tst 2>/dev/null --if test -d .tst; then -- am__leading_dot=. -+# AM_CONDITIONAL(NAME, SHELL-CONDITION) -+# ------------------------------------- -+# Define a conditional. -+AC_DEFUN([AM_CONDITIONAL], -+[AC_PREREQ(2.52)dnl -+ ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], -+ [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl -+AC_SUBST([$1_TRUE]) -+AC_SUBST([$1_FALSE]) -+if $2; then -+ $1_TRUE= -+ $1_FALSE='#' - else -- am__leading_dot=_ -+ $1_TRUE='#' -+ $1_FALSE= - fi --rmdir .tst 2>/dev/null --AC_SUBST([am__leading_dot])]) -+AC_CONFIG_COMMANDS_PRE( -+[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then -+ AC_MSG_ERROR([conditional "$1" was never defined. -+Usually this means the macro was only invoked conditionally.]) -+fi])]) - --# serial 5 -*- Autoconf -*- -+# serial 6 -*- Autoconf -*- - --# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. -+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004 -+# Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -632,8 +332,8 @@ - # ------------ - AC_DEFUN([AM_DEP_TRACK], - [AC_ARG_ENABLE(dependency-tracking, --[ --disable-dependency-tracking Speeds up one-time builds -- --enable-dependency-tracking Do not reject slow dependency extractors]) -+[ --disable-dependency-tracking speeds up one-time build -+ --enable-dependency-tracking do not reject slow dependency extractors]) - if test "x$enable_dependency_tracking" != xno; then - am_depcomp="$ac_aux_dir/depcomp" - AMDEPBACKSLASH='\' -@@ -644,7 +344,7 @@ - - # Generate code to set up dependency tracking. -*- Autoconf -*- - --# Copyright 1999, 2000, 2001, 2002 Free Software Foundation, Inc. -+# Copyright (C) 1999, 2000, 2001, 2002, 2003 Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -726,6 +426,189 @@ - [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) - ]) - -+# Do all the work for Automake. -*- Autoconf -*- -+ -+# This macro actually does too much some checks are only needed if -+# your package does certain things. But this isn't really a big deal. -+ -+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003 -+# Free Software Foundation, Inc. -+ -+# This program 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, 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. -+ -+# serial 11 -+ -+# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) -+# AM_INIT_AUTOMAKE([OPTIONS]) -+# ----------------------------------------------- -+# The call with PACKAGE and VERSION arguments is the old style -+# call (pre autoconf-2.50), which is being phased out. PACKAGE -+# and VERSION should now be passed to AC_INIT and removed from -+# the call to AM_INIT_AUTOMAKE. -+# We support both call styles for the transition. After -+# the next Automake release, Autoconf can make the AC_INIT -+# arguments mandatory, and then we can depend on a new Autoconf -+# release and drop the old call support. -+AC_DEFUN([AM_INIT_AUTOMAKE], -+[AC_PREREQ([2.58])dnl -+dnl Autoconf wants to disallow AM_ names. We explicitly allow -+dnl the ones we care about. -+m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl -+AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl -+AC_REQUIRE([AC_PROG_INSTALL])dnl -+# test to see if srcdir already configured -+if test "`cd $srcdir && pwd`" != "`pwd`" && -+ test -f $srcdir/config.status; then -+ AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) -+fi -+ -+# test whether we have cygpath -+if test -z "$CYGPATH_W"; then -+ if (cygpath --version) >/dev/null 2>/dev/null; then -+ CYGPATH_W='cygpath -w' -+ else -+ CYGPATH_W=echo -+ fi -+fi -+AC_SUBST([CYGPATH_W]) -+ -+# Define the identity of the package. -+dnl Distinguish between old-style and new-style calls. -+m4_ifval([$2], -+[m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl -+ AC_SUBST([PACKAGE], [$1])dnl -+ AC_SUBST([VERSION], [$2])], -+[_AM_SET_OPTIONS([$1])dnl -+ AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl -+ AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl -+ -+_AM_IF_OPTION([no-define],, -+[AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package]) -+ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package])])dnl -+ -+# Some tools Automake needs. -+AC_REQUIRE([AM_SANITY_CHECK])dnl -+AC_REQUIRE([AC_ARG_PROGRAM])dnl -+AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}) -+AM_MISSING_PROG(AUTOCONF, autoconf) -+AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}) -+AM_MISSING_PROG(AUTOHEADER, autoheader) -+AM_MISSING_PROG(MAKEINFO, makeinfo) -+AM_MISSING_PROG(AMTAR, tar) -+AM_PROG_INSTALL_SH -+AM_PROG_INSTALL_STRIP -+AC_REQUIRE([AM_PROG_MKDIR_P])dnl -+# We need awk for the "check" target. The system "awk" is bad on -+# some platforms. -+AC_REQUIRE([AC_PROG_AWK])dnl -+AC_REQUIRE([AC_PROG_MAKE_SET])dnl -+AC_REQUIRE([AM_SET_LEADING_DOT])dnl -+ -+_AM_IF_OPTION([no-dependencies],, -+[AC_PROVIDE_IFELSE([AC_PROG_CC], -+ [_AM_DEPENDENCIES(CC)], -+ [define([AC_PROG_CC], -+ defn([AC_PROG_CC])[_AM_DEPENDENCIES(CC)])])dnl -+AC_PROVIDE_IFELSE([AC_PROG_CXX], -+ [_AM_DEPENDENCIES(CXX)], -+ [define([AC_PROG_CXX], -+ defn([AC_PROG_CXX])[_AM_DEPENDENCIES(CXX)])])dnl -+]) -+]) -+ -+ -+# When config.status generates a header, we must update the stamp-h file. -+# This file resides in the same directory as the config header -+# that is generated. The stamp files are numbered to have different names. -+ -+# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the -+# loop where config.status creates the headers, so we can generate -+# our stamp files there. -+AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], -+[# Compute $1's index in $config_headers. -+_am_stamp_count=1 -+for _am_header in $config_headers :; do -+ case $_am_header in -+ $1 | $1:* ) -+ break ;; -+ * ) -+ _am_stamp_count=`expr $_am_stamp_count + 1` ;; -+ esac -+done -+echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count]) -+ -+# AM_PROG_INSTALL_SH -+# ------------------ -+# Define $install_sh. -+ -+# Copyright (C) 2001, 2003 Free Software Foundation, Inc. -+ -+# This program 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, 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. -+ -+AC_DEFUN([AM_PROG_INSTALL_SH], -+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -+install_sh=${install_sh-"$am_aux_dir/install-sh"} -+AC_SUBST(install_sh)]) -+ -+# -*- Autoconf -*- -+# Copyright (C) 2003 Free Software Foundation, Inc. -+ -+# This program 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, 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. -+ -+# serial 1 -+ -+# Check whether the underlying file-system supports filenames -+# with a leading dot. For instance MS-DOS doesn't. -+AC_DEFUN([AM_SET_LEADING_DOT], -+[rm -rf .tst 2>/dev/null -+mkdir .tst 2>/dev/null -+if test -d .tst; then -+ am__leading_dot=. -+else -+ am__leading_dot=_ -+fi -+rmdir .tst 2>/dev/null -+AC_SUBST([am__leading_dot])]) -+ - # Check to see how 'make' treats includes. -*- Autoconf -*- - - # Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. -@@ -789,9 +672,10 @@ - rm -f confinc confmf - ]) - --# AM_CONDITIONAL -*- Autoconf -*- -+# -*- Autoconf -*- - --# Copyright 1997, 2000, 2001 Free Software Foundation, Inc. -+ -+# Copyright (C) 1997, 1999, 2000, 2001, 2003 Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -808,36 +692,139 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - # 02111-1307, USA. - --# serial 5 -+# serial 3 - --AC_PREREQ(2.52) -+# AM_MISSING_PROG(NAME, PROGRAM) -+# ------------------------------ -+AC_DEFUN([AM_MISSING_PROG], -+[AC_REQUIRE([AM_MISSING_HAS_RUN]) -+$1=${$1-"${am_missing_run}$2"} -+AC_SUBST($1)]) - --# AM_CONDITIONAL(NAME, SHELL-CONDITION) --# ------------------------------------- --# Define a conditional. --AC_DEFUN([AM_CONDITIONAL], --[ifelse([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], -- [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl --AC_SUBST([$1_TRUE]) --AC_SUBST([$1_FALSE]) --if $2; then -- $1_TRUE= -- $1_FALSE='#' -+ -+# AM_MISSING_HAS_RUN -+# ------------------ -+# Define MISSING if not defined so far and test if it supports --run. -+# If it does, set am_missing_run to use it, otherwise, to nothing. -+AC_DEFUN([AM_MISSING_HAS_RUN], -+[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl -+test x"${MISSING+set}" = xset || MISSING="\${SHELL} $am_aux_dir/missing" -+# Use eval to expand $SHELL -+if eval "$MISSING --run true"; then -+ am_missing_run="$MISSING --run " - else -- $1_TRUE='#' -- $1_FALSE= -+ am_missing_run= -+ AC_MSG_WARN([`missing' script is too old or missing]) - fi --AC_CONFIG_COMMANDS_PRE( --[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then -- AC_MSG_ERROR([conditional "$1" was never defined. --Usually this means the macro was only invoked conditionally.]) --fi])]) -+]) - --# Figure out how to run the assembler. -*- Autoconf -*- -+# AM_PROG_MKDIR_P -+# --------------- -+# Check whether `mkdir -p' is supported, fallback to mkinstalldirs otherwise. -+ -+# Copyright (C) 2003, 2004 Free Software Foundation, Inc. -+ -+# This program 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, 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. -+ -+# Automake 1.8 used `mkdir -m 0755 -p --' to ensure that directories -+# created by `make install' are always world readable, even if the -+# installer happens to have an overly restrictive umask (e.g. 077). -+# This was a mistake. There are at least two reasons why we must not -+# use `-m 0755': -+# - it causes special bits like SGID to be ignored, -+# - it may be too restrictive (some setups expect 775 directories). -+# -+# Do not use -m 0755 and let people choose whatever they expect by -+# setting umask. -+AC_DEFUN([AM_PROG_MKDIR_P], -+[if mkdir -p -- . 2>/dev/null; then -+ # Keeping the `.' argument allows $(mkdir_p) to be used without -+ # argument. Indeed, we sometimes output rules like -+ # $(mkdir_p) $(somedir) -+ # where $(somedir) is conditionally defined. -+ # (`test -n '$(somedir)' && $(mkdir_p) $(somedir)' is a more -+ # expensive solution, as it forces Make to start a sub-shell.) -+ mkdir_p='mkdir -p -- .' -+else -+ # On NextStep and OpenStep, the `mkdir' command does not -+ # recognize any option. It will interpret all options as -+ # directories to create, and then abort because `.' already -+ # exists. -+ for d in ./-p ./--; -+ do -+ test -d $d && rmdir $d -+ done -+ # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists. -+ if test -f "$ac_aux_dir/mkinstalldirs"; then -+ mkdir_p='$(mkinstalldirs)' -+ else -+ mkdir_p='$(install_sh) -d' -+ fi -+fi -+AC_SUBST([mkdir_p])]) -+ -+# Helper functions for option handling. -*- Autoconf -*- -+ -+# Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc. -+ -+# This program 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, 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. - - # serial 2 - --# Copyright 2001 Free Software Foundation, Inc. -+# _AM_MANGLE_OPTION(NAME) -+# ----------------------- -+AC_DEFUN([_AM_MANGLE_OPTION], -+[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) -+ -+# _AM_SET_OPTION(NAME) -+# ------------------------------ -+# Set option NAME. Presently that only means defining a flag for this option. -+AC_DEFUN([_AM_SET_OPTION], -+[m4_define(_AM_MANGLE_OPTION([$1]), 1)]) -+ -+# _AM_SET_OPTIONS(OPTIONS) -+# ---------------------------------- -+# OPTIONS is a space-separated list of Automake options. -+AC_DEFUN([_AM_SET_OPTIONS], -+[AC_FOREACH([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) -+ -+# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) -+# ------------------------------------------- -+# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. -+AC_DEFUN([_AM_IF_OPTION], -+[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) -+ -+# -+# Check to make sure that the build environment is sane. -+# -+ -+# Copyright (C) 1996, 1997, 2000, 2001, 2003 Free Software Foundation, Inc. - - # This program is free software; you can redistribute it and/or modify - # it under the terms of the GNU General Public License as published by -@@ -854,218 +841,601 @@ - # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA - # 02111-1307, USA. - --# AM_PROG_AS --# ---------- --AC_DEFUN([AM_PROG_AS], --[# By default we simply use the C compiler to build assembly code. --AC_REQUIRE([AC_PROG_CC]) --: ${CCAS='$(CC)'} --# Set ASFLAGS if not already set. --: ${CCASFLAGS='$(CFLAGS)'} --AC_SUBST(CCAS) --AC_SUBST(CCASFLAGS)]) -+# serial 3 - --# isc-posix.m4 serial 2 (gettext-0.11.2) --dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. -+# AM_SANITY_CHECK -+# --------------- -+AC_DEFUN([AM_SANITY_CHECK], -+[AC_MSG_CHECKING([whether build environment is sane]) -+# Just in case -+sleep 1 -+echo timestamp > conftest.file -+# Do `set' in a subshell so we don't clobber the current shell's -+# arguments. Must try -L first in case configure is actually a -+# symlink; some systems play weird games with the mod time of symlinks -+# (eg FreeBSD returns the mod time of the symlink's containing -+# directory). -+if ( -+ set X `ls -Lt $srcdir/configure conftest.file 2> /dev/null` -+ if test "$[*]" = "X"; then -+ # -L didn't work. -+ set X `ls -t $srcdir/configure conftest.file` -+ fi -+ rm -f conftest.file -+ if test "$[*]" != "X $srcdir/configure conftest.file" \ -+ && test "$[*]" != "X conftest.file $srcdir/configure"; then -+ -+ # If neither matched, then we have a broken ls. This can happen -+ # if, for instance, CONFIG_SHELL is bash and it inherits a -+ # broken ls alias from the environment. This has actually -+ # happened. Such a system could not be considered "sane". -+ AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken -+alias in your environment]) -+ fi -+ -+ test "$[2]" = conftest.file -+ ) -+then -+ # Ok. -+ : -+else -+ AC_MSG_ERROR([newly created file is older than distributed files! -+Check your system clock]) -+fi -+AC_MSG_RESULT(yes)]) -+ -+# AM_PROG_INSTALL_STRIP -+ -+# Copyright (C) 2001, 2003 Free Software Foundation, Inc. -+ -+# This program 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, 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., 59 Temple Place - Suite 330, Boston, MA -+# 02111-1307, USA. -+ -+# One issue with vendor `install' (even GNU) is that you can't -+# specify the program used to strip binaries. This is especially -+# annoying in cross-compiling environments, where the build's strip -+# is unlikely to handle the host's binaries. -+# Fortunately install-sh will honor a STRIPPROG variable, so we -+# always use install-sh in `make install-strip', and initialize -+# STRIPPROG with the value of the STRIP variable (set by the user). -+AC_DEFUN([AM_PROG_INSTALL_STRIP], -+[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl -+# Installed binaries are usually stripped using `strip' when the user -+# run `make install-strip'. However `strip' might not be the right -+# tool to use in cross-compilation environments, therefore Automake -+# will honor the `STRIP' environment variable to overrule this program. -+dnl Don't test for $cross_compiling = yes, because it might be `maybe'. -+if test "$cross_compiling" != no; then -+ AC_CHECK_TOOL([STRIP], [strip], :) -+fi -+INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s" -+AC_SUBST([INSTALL_STRIP_PROGRAM])]) -+ -+dnl Available from the GNU Autoconf Macro Archive at: -+dnl http://www.gnu.org/software/ac-archive/htmldoc/acx_pthread.html -+dnl -+AC_DEFUN([ACX_PTHREAD], [ -+AC_REQUIRE([AC_CANONICAL_HOST]) -+AC_LANG_SAVE -+AC_LANG_C -+acx_pthread_ok=no -+ -+# We used to check for pthread.h first, but this fails if pthread.h -+# requires special compiler flags (e.g. on True64 or Sequent). -+# It gets checked for in the link test anyway. -+ -+# First of all, check if the user has set any of the PTHREAD_LIBS, -+# etcetera environment variables, and if threads linking works using -+# them: -+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then -+ save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -+ save_LIBS="$LIBS" -+ LIBS="$PTHREAD_LIBS $LIBS" -+ AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) -+ AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes) -+ AC_MSG_RESULT($acx_pthread_ok) -+ if test x"$acx_pthread_ok" = xno; then -+ PTHREAD_LIBS="" -+ PTHREAD_CFLAGS="" -+ fi -+ LIBS="$save_LIBS" -+ CFLAGS="$save_CFLAGS" -+fi -+ -+# We must check for the threads library under a number of different -+# names; the ordering is very important because some systems -+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the -+# libraries is broken (non-POSIX). -+ -+# Create a list of thread flags to try. Items starting with a "-" are -+# C compiler flags, and other items are library names, except for "none" -+# which indicates that we try without any flags at all. -+ -+acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt" -+ -+# The ordering *is* (sometimes) important. Some notes on the -+# individual items follow: -+ -+# pthreads: AIX (must check this before -lpthread) -+# none: in case threads are in libc; should be tried before -Kthread and -+# other compiler flags to prevent continual compiler warnings -+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) -+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) -+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) -+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) -+# -pthreads: Solaris/gcc -+# -mthreads: Mingw32/gcc, Lynx/gcc -+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it -+# doesn't hurt to check since this sometimes defines pthreads too; -+# also defines -D_REENTRANT) -+# pthread: Linux, etcetera -+# --thread-safe: KAI C++ -+ -+case "${host_cpu}-${host_os}" in -+ *solaris*) -+ -+ # On Solaris (at least, for some versions), libc contains stubbed -+ # (non-functional) versions of the pthreads routines, so link-based -+ # tests will erroneously succeed. (We need to link with -pthread or -+ # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather -+ # a function called by this macro, so we could check for that, but -+ # who knows whether they'll stub that too in a future libc.) So, -+ # we'll just look for -pthreads and -lpthread first: -+ -+ acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags" -+ ;; -+esac -+ -+if test x"$acx_pthread_ok" = xno; then -+for flag in $acx_pthread_flags; do -+ -+ case $flag in -+ none) -+ AC_MSG_CHECKING([whether pthreads work without any flags]) -+ ;; -+ -+ -*) -+ AC_MSG_CHECKING([whether pthreads work with $flag]) -+ PTHREAD_CFLAGS="$flag" -+ ;; -+ -+ *) -+ AC_MSG_CHECKING([for the pthreads library -l$flag]) -+ PTHREAD_LIBS="-l$flag" -+ ;; -+ esac -+ -+ save_LIBS="$LIBS" -+ save_CFLAGS="$CFLAGS" -+ LIBS="$PTHREAD_LIBS $LIBS" -+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -+ -+ # Check for various functions. We must include pthread.h, -+ # since some functions may be macros. (On the Sequent, we -+ # need a special flag -Kthread to make this header compile.) -+ # We check for pthread_join because it is in -lpthread on IRIX -+ # while pthread_create is in libc. We check for pthread_attr_init -+ # due to DEC craziness with -lpthreads. We check for -+ # pthread_cleanup_push because it is one of the few pthread -+ # functions on Solaris that doesn't have a non-functional libc stub. -+ # We try pthread_create on general principles. -+ AC_TRY_LINK([#include ], -+ [pthread_t th; pthread_join(th, 0); -+ pthread_attr_init(0); pthread_cleanup_push(0, 0); -+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], -+ [acx_pthread_ok=yes]) -+ -+ LIBS="$save_LIBS" -+ CFLAGS="$save_CFLAGS" -+ -+ AC_MSG_RESULT($acx_pthread_ok) -+ if test "x$acx_pthread_ok" = xyes; then -+ break; -+ fi -+ -+ PTHREAD_LIBS="" -+ PTHREAD_CFLAGS="" -+done -+fi -+ -+# Various other checks: -+if test "x$acx_pthread_ok" = xyes; then -+ save_LIBS="$LIBS" -+ LIBS="$PTHREAD_LIBS $LIBS" -+ save_CFLAGS="$CFLAGS" -+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -+ -+ # Detect AIX lossage: threads are created detached by default -+ # and the JOINABLE attribute has a nonstandard name (UNDETACHED). -+ AC_MSG_CHECKING([for joinable pthread attribute]) -+ AC_TRY_LINK([#include ], -+ [int attr=PTHREAD_CREATE_JOINABLE;], -+ ok=PTHREAD_CREATE_JOINABLE, ok=unknown) -+ if test x"$ok" = xunknown; then -+ AC_TRY_LINK([#include ], -+ [int attr=PTHREAD_CREATE_UNDETACHED;], -+ ok=PTHREAD_CREATE_UNDETACHED, ok=unknown) -+ fi -+ if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then -+ AC_DEFINE(PTHREAD_CREATE_JOINABLE, $ok, -+ [Define to the necessary symbol if this constant -+ uses a non-standard name on your system.]) -+ fi -+ AC_MSG_RESULT(${ok}) -+ if test x"$ok" = xunknown; then -+ AC_MSG_WARN([we do not know how to create joinable pthreads]) -+ fi -+ -+ AC_MSG_CHECKING([if more special flags are required for pthreads]) -+ flag=no -+ case "${host_cpu}-${host_os}" in -+ *-aix* | *-freebsd*) flag="-D_THREAD_SAFE";; -+ *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; -+ esac -+ AC_MSG_RESULT(${flag}) -+ if test "x$flag" != xno; then -+ PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" -+ fi -+ -+ LIBS="$save_LIBS" -+ CFLAGS="$save_CFLAGS" -+ -+ # More AIX lossage: must compile with cc_r -+ AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC}) -+else -+ PTHREAD_CC="$CC" -+fi -+ -+AC_SUBST(PTHREAD_LIBS) -+AC_SUBST(PTHREAD_CFLAGS) -+AC_SUBST(PTHREAD_CC) -+ -+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: -+if test x"$acx_pthread_ok" = xyes; then -+ ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) -+ : -+else -+ acx_pthread_ok=no -+ $2 -+fi -+AC_LANG_RESTORE -+])dnl ACX_PTHREAD -+ -+dnl Available from the GNU Autoconf Macro Archive at: -+dnl http://www.gnu.org/software/ac-archive/htmldoc/check_zlib.html -+dnl -+AC_DEFUN([CHECK_ZLIB], -+# -+# Handle user hints -+# -+[AC_MSG_CHECKING(if zlib is wanted) -+AC_ARG_WITH(zlib, -+[ --with-zlib=DIR root directory path of zlib installation [defaults to -+ /usr/local or /usr if not found in /usr/local] -+ --without-zlib to disable zlib usage completely], -+[if test "$withval" != no ; then -+ AC_MSG_RESULT(yes) -+ ZLIB_HOME="$withval" -+else -+ AC_MSG_RESULT(no) -+fi], [ -+AC_MSG_RESULT(yes) -+ZLIB_HOME=/usr/local -+if test ! -f "${ZLIB_HOME}/include/zlib.h" -+then -+ ZLIB_HOME=/usr -+fi -+]) -+ -+# -+# Locate zlib, if wanted -+# -+if test -n "${ZLIB_HOME}" -+then -+ ZLIB_OLD_LDFLAGS=$LDFLAGS -+ ZLIB_OLD_CPPFLAGS=$LDFLAGS -+ LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib" -+ CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include" -+ AC_LANG_SAVE -+ AC_LANG_C -+ AC_CHECK_LIB(z, inflateEnd, [zlib_cv_libz=yes], [zlib_cv_libz=no]) -+ AC_CHECK_HEADER(zlib.h, [zlib_cv_zlib_h=yes], [zlib_cvs_zlib_h=no]) -+ AC_LANG_RESTORE -+ if test "$zlib_cv_libz" = "yes" -a "$zlib_cv_zlib_h" = "yes" -+ then -+ # -+ # If both library and header were found, use them -+ # -+ AC_CHECK_LIB(z, inflateEnd) -+ AC_MSG_CHECKING(zlib in ${ZLIB_HOME}) -+ AC_MSG_RESULT(ok) -+ else -+ # -+ # If either header or library was not found, revert and bomb -+ # -+ AC_MSG_CHECKING(zlib in ${ZLIB_HOME}) -+ LDFLAGS="$ZLIB_OLD_LDFLAGS" -+ CPPFLAGS="$ZLIB_OLD_CPPFLAGS" -+ AC_MSG_RESULT(failed) -+ AC_MSG_ERROR(either specify a valid zlib installation with --with-zlib=DIR or disable zlib usage with --without-zlib) -+ fi -+fi -+ -+]) -+ -+ -+# file-type.m4 serial 1 -+dnl Copyright (C) 2002 Free Software Foundation, Inc. - dnl This file is free software, distributed under the terms of the GNU - dnl General Public License. As a special exception to the GNU General - dnl Public License, this file may be distributed as part of a program - dnl that contains a configuration script generated by Autoconf, under - dnl the same distribution terms as the rest of that program. - --# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. -+AC_DEFUN([gl_FILE_TYPE], -+[ -+ dnl Prerequisites of lib/file-type.h. -+ AC_REQUIRE([AC_HEADER_STAT]) -+]) - --# This test replaces the one in autoconf. --# Currently this macro should have the same name as the autoconf macro --# because gettext's gettext.m4 (distributed in the automake package) --# still uses it. Otherwise, the use in gettext.m4 makes autoheader --# give these diagnostics: --# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX --# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX -+#serial 11 - --undefine([AC_ISC_POSIX]) -+# From fileutils/configure.in - --AC_DEFUN([AC_ISC_POSIX], -- [ -- dnl This test replaces the obsolescent AC_ISC_POSIX kludge. -- AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) -- ] --) -+AC_DEFUN([gl_FSUSAGE], -+[ -+ AC_CHECK_HEADERS(sys/param.h) -+ AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs_types.h) -+ jm_FILE_SYSTEM_USAGE([gl_cv_fs_space=yes], [gl_cv_fs_space=no]) -+ if test $gl_cv_fs_space = yes; then -+ AC_LIBOBJ(fsusage) -+ gl_PREREQ_FSUSAGE_EXTRA -+ fi -+]) - --# Configure paths for SDL --# Sam Lantinga 9/21/99 --# stolen from Manish Singh --# stolen back from Frank Belew --# stolen from Manish Singh --# Shamelessly stolen from Owen Taylor -+# Try to determine how a program can obtain filesystem usage information. -+# If successful, define the appropriate symbol (see fsusage.c) and -+# execute ACTION-IF-FOUND. Otherwise, execute ACTION-IF-NOT-FOUND. -+# -+# jm_FILE_SYSTEM_USAGE([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) - --dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) --dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS --dnl --AC_DEFUN(AM_PATH_SDL, --[dnl --dnl Get the cflags and libraries from the sdl-config script --dnl --AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], -- sdl_prefix="$withval", sdl_prefix="") --AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], -- sdl_exec_prefix="$withval", sdl_exec_prefix="") --AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], -- , enable_sdltest=yes) -+AC_DEFUN([jm_FILE_SYSTEM_USAGE], -+[ - -- if test x$sdl_exec_prefix != x ; then -- sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" -- if test x${SDL_CONFIG+set} != xset ; then -- SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config -- fi -+echo "checking how to get filesystem space usage..." -+ac_fsusage_space=no -+ -+# Perform only the link test since it seems there are no variants of the -+# statvfs function. This check is more than just AC_CHECK_FUNCS(statvfs) -+# because that got a false positive on SCO OSR5. Adding the declaration -+# of a `struct statvfs' causes this test to fail (as it should) on such -+# systems. That system is reported to work fine with STAT_STATFS4 which -+# is what it gets when this test fails. -+if test $ac_fsusage_space = no; then -+ # SVR4 -+ AC_CACHE_CHECK([for statvfs function (SVR4)], fu_cv_sys_stat_statvfs, -+ [AC_TRY_LINK([#include -+#ifdef __GLIBC__ -+Do not use statvfs on systems with GNU libc, because that function stats -+all preceding entries in /proc/mounts, and that makes df hang if even -+one of the corresponding file systems is hard-mounted, but not available. -+#endif -+#include ], -+ [struct statvfs fsd; statvfs (0, &fsd);], -+ fu_cv_sys_stat_statvfs=yes, -+ fu_cv_sys_stat_statvfs=no)]) -+ if test $fu_cv_sys_stat_statvfs = yes; then -+ ac_fsusage_space=yes -+ AC_DEFINE(STAT_STATVFS, 1, -+ [ Define if there is a function named statvfs. (SVR4)]) - fi -- if test x$sdl_prefix != x ; then -- sdl_args="$sdl_args --prefix=$sdl_prefix" -- if test x${SDL_CONFIG+set} != xset ; then -- SDL_CONFIG=$sdl_prefix/bin/sdl-config -- fi -+fi -+ -+if test $ac_fsusage_space = no; then -+ # DEC Alpha running OSF/1 -+ AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)]) -+ AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1, -+ [AC_TRY_RUN([ -+#include -+#include -+#include -+ main () -+ { -+ struct statfs fsd; -+ fsd.f_fsize = 0; -+ exit (statfs (".", &fsd, sizeof (struct statfs))); -+ }], -+ fu_cv_sys_stat_statfs3_osf1=yes, -+ fu_cv_sys_stat_statfs3_osf1=no, -+ fu_cv_sys_stat_statfs3_osf1=no)]) -+ AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1) -+ if test $fu_cv_sys_stat_statfs3_osf1 = yes; then -+ ac_fsusage_space=yes -+ AC_DEFINE(STAT_STATFS3_OSF1, 1, -+ [ Define if statfs takes 3 args. (DEC Alpha running OSF/1)]) - fi -+fi - -- AC_REQUIRE([AC_CANONICAL_TARGET]) -- PATH="$prefix/bin:$prefix/usr/bin:$PATH" -- AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) -- min_sdl_version=ifelse([$1], ,0.11.0,$1) -- AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) -- no_sdl="" -- if test "$SDL_CONFIG" = "no" ; then -- no_sdl=yes -- else -- SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` -- SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` -+if test $ac_fsusage_space = no; then -+# AIX -+ AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl -+member (AIX, 4.3BSD)]) -+ AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize, -+ [AC_TRY_RUN([ -+#ifdef HAVE_SYS_PARAM_H -+#include -+#endif -+#ifdef HAVE_SYS_MOUNT_H -+#include -+#endif -+#ifdef HAVE_SYS_VFS_H -+#include -+#endif -+ main () -+ { -+ struct statfs fsd; -+ fsd.f_bsize = 0; -+ exit (statfs (".", &fsd)); -+ }], -+ fu_cv_sys_stat_statfs2_bsize=yes, -+ fu_cv_sys_stat_statfs2_bsize=no, -+ fu_cv_sys_stat_statfs2_bsize=no)]) -+ AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize) -+ if test $fu_cv_sys_stat_statfs2_bsize = yes; then -+ ac_fsusage_space=yes -+ AC_DEFINE(STAT_STATFS2_BSIZE, 1, -+[ Define if statfs takes 2 args and struct statfs has a field named f_bsize. -+ (4.3BSD, SunOS 4, HP-UX, AIX PS/2)]) -+ fi -+fi - -- sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -- sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -- sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ -- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -- if test "x$enable_sdltest" = "xyes" ; then -- ac_save_CFLAGS="$CFLAGS" -- ac_save_LIBS="$LIBS" -- CFLAGS="$CFLAGS $SDL_CFLAGS" -- LIBS="$LIBS $SDL_LIBS" --dnl --dnl Now check if the installed SDL is sufficiently new. (Also sanity --dnl checks the results of sdl-config to some extent --dnl -- rm -f conf.sdltest -- AC_TRY_RUN([ --#include --#include --#include --#include "SDL.h" -+if test $ac_fsusage_space = no; then -+# SVR3 -+ AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)]) -+ AC_CACHE_VAL(fu_cv_sys_stat_statfs4, -+ [AC_TRY_RUN([#include -+#include -+ main () -+ { -+ struct statfs fsd; -+ exit (statfs (".", &fsd, sizeof fsd, 0)); -+ }], -+ fu_cv_sys_stat_statfs4=yes, -+ fu_cv_sys_stat_statfs4=no, -+ fu_cv_sys_stat_statfs4=no)]) -+ AC_MSG_RESULT($fu_cv_sys_stat_statfs4) -+ if test $fu_cv_sys_stat_statfs4 = yes; then -+ ac_fsusage_space=yes -+ AC_DEFINE(STAT_STATFS4, 1, -+ [ Define if statfs takes 4 args. (SVR3, Dynix, Irix, Dolphin)]) -+ fi -+fi - --char* --my_strdup (char *str) --{ -- char *new_str; -- -- if (str) -- { -- new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); -- strcpy (new_str, str); -- } -- else -- new_str = NULL; -- -- return new_str; --} -+if test $ac_fsusage_space = no; then -+# 4.4BSD and NetBSD -+ AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl -+member (4.4BSD and NetBSD)]) -+ AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize, -+ [AC_TRY_RUN([#include -+#ifdef HAVE_SYS_PARAM_H -+#include -+#endif -+#ifdef HAVE_SYS_MOUNT_H -+#include -+#endif -+ main () -+ { -+ struct statfs fsd; -+ fsd.f_fsize = 0; -+ exit (statfs (".", &fsd)); -+ }], -+ fu_cv_sys_stat_statfs2_fsize=yes, -+ fu_cv_sys_stat_statfs2_fsize=no, -+ fu_cv_sys_stat_statfs2_fsize=no)]) -+ AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize) -+ if test $fu_cv_sys_stat_statfs2_fsize = yes; then -+ ac_fsusage_space=yes -+ AC_DEFINE(STAT_STATFS2_FSIZE, 1, -+[ Define if statfs takes 2 args and struct statfs has a field named f_fsize. -+ (4.4BSD, NetBSD)]) -+ fi -+fi - --int main (int argc, char *argv[]) --{ -- int major, minor, micro; -- char *tmp_version; -+if test $ac_fsusage_space = no; then -+ # Ultrix -+ AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)]) -+ AC_CACHE_VAL(fu_cv_sys_stat_fs_data, -+ [AC_TRY_RUN([#include -+#ifdef HAVE_SYS_PARAM_H -+#include -+#endif -+#ifdef HAVE_SYS_MOUNT_H -+#include -+#endif -+#ifdef HAVE_SYS_FS_TYPES_H -+#include -+#endif -+ main () -+ { -+ struct fs_data fsd; -+ /* Ultrix's statfs returns 1 for success, -+ 0 for not mounted, -1 for failure. */ -+ exit (statfs (".", &fsd) != 1); -+ }], -+ fu_cv_sys_stat_fs_data=yes, -+ fu_cv_sys_stat_fs_data=no, -+ fu_cv_sys_stat_fs_data=no)]) -+ AC_MSG_RESULT($fu_cv_sys_stat_fs_data) -+ if test $fu_cv_sys_stat_fs_data = yes; then -+ ac_fsusage_space=yes -+ AC_DEFINE(STAT_STATFS2_FS_DATA, 1, -+[ Define if statfs takes 2 args and the second argument has -+ type struct fs_data. (Ultrix)]) -+ fi -+fi - -- /* This hangs on some systems (?) -- system ("touch conf.sdltest"); -- */ -- { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } -+if test $ac_fsusage_space = no; then -+ # SVR2 -+ AC_TRY_CPP([#include -+ ], -+ AC_DEFINE(STAT_READ_FILSYS, 1, -+ [Define if there is no specific function for reading filesystems usage -+ information and you have the header file. (SVR2)]) -+ ac_fsusage_space=yes) -+fi - -- /* HP/UX 9 (%@#!) writes to sscanf strings */ -- tmp_version = my_strdup("$min_sdl_version"); -- if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -- printf("%s, bad version string\n", "$min_sdl_version"); -- exit(1); -- } -+AS_IF([test $ac_fsusage_space = yes], [$1], [$2]) - -- if (($sdl_major_version > major) || -- (($sdl_major_version == major) && ($sdl_minor_version > minor)) || -- (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) -- { -- return 0; -- } -- else -- { -- printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); -- printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); -- printf("*** best to upgrade to the required version.\n"); -- printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); -- printf("*** to point to the correct copy of sdl-config, and remove the file\n"); -- printf("*** config.cache before re-running configure\n"); -- return 1; -- } --} -+]) - --],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -- CFLAGS="$ac_save_CFLAGS" -- LIBS="$ac_save_LIBS" -- fi -- fi -- if test "x$no_sdl" = x ; then -- AC_MSG_RESULT(yes) -- ifelse([$2], , :, [$2]) -- else -- AC_MSG_RESULT(no) -- if test "$SDL_CONFIG" = "no" ; then -- echo "*** The sdl-config script installed by SDL could not be found" -- echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" -- echo "*** your path, or set the SDL_CONFIG environment variable to the" -- echo "*** full path to sdl-config." -- else -- if test -f conf.sdltest ; then -- : -- else -- echo "*** Could not run SDL test program, checking why..." -- CFLAGS="$CFLAGS $SDL_CFLAGS" -- LIBS="$LIBS $SDL_LIBS" -- AC_TRY_LINK([ --#include --#include "SDL.h" - --int main(int argc, char *argv[]) --{ return 0; } --#undef main --#define main K_and_R_C_main --], [ return 0; ], -- [ echo "*** The test program compiled, but did not run. This usually means" -- echo "*** that the run-time linker is not finding SDL or finding the wrong" -- echo "*** version of SDL. If it is not finding SDL, you'll need to set your" -- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -- echo "*** to the installed location Also, make sure you have run ldconfig if that" -- echo "*** is required on your system" -- echo "***" -- echo "*** If you have an old version installed, it is best to remove it, although" -- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], -- [ echo "*** The test program failed to compile or link. See the file config.log for the" -- echo "*** exact error that occured. This usually means SDL was incorrectly installed" -- echo "*** or that you have moved SDL since it was installed. In the latter case, you" -- echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) -- CFLAGS="$ac_save_CFLAGS" -- LIBS="$ac_save_LIBS" -- fi -- fi -- SDL_CFLAGS="" -- SDL_LIBS="" -- ifelse([$3], , :, [$3]) -+# Check for SunOS statfs brokenness wrt partitions 2GB and larger. -+# If exists and struct statfs has a member named f_spare, -+# enable the work-around code in fsusage.c. -+AC_DEFUN([jm_STATFS_TRUNCATES], -+[ -+ AC_MSG_CHECKING([for statfs that truncates block counts]) -+ AC_CACHE_VAL(fu_cv_sys_truncating_statfs, -+ [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -+#if !defined(sun) && !defined(__sun) -+choke -- this is a workaround for a Sun-specific problem -+#endif -+#include -+#include ]], -+ [[struct statfs t; long c = *(t.f_spare);]])], -+ [fu_cv_sys_truncating_statfs=yes], -+ [fu_cv_sys_truncating_statfs=no])]) -+ if test $fu_cv_sys_truncating_statfs = yes; then -+ AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS, 1, -+ [Define if the block counts reported by statfs may be truncated to 2GB -+ and the correct values may be stored in the f_spare array. -+ (SunOS 4.1.2, 4.1.3, and 4.1.3_U1 are reported to have this problem. -+ SunOS 4.1.1 seems not to be affected.)]) - fi -- AC_SUBST(SDL_CFLAGS) -- AC_SUBST(SDL_LIBS) -- rm -f conf.sdltest -+ AC_MSG_RESULT($fu_cv_sys_truncating_statfs) -+]) -+ -+ -+# Prerequisites of lib/fsusage.c not done by jm_FILE_SYSTEM_USAGE. -+AC_DEFUN([gl_PREREQ_FSUSAGE_EXTRA], -+[ -+ AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) -+ AC_CHECK_HEADERS(fcntl.h) -+ AC_CHECK_HEADERS(dustat.h sys/fs/s5param.h sys/filsys.h sys/statfs.h sys/statvfs.h) -+ jm_STATFS_TRUNCATES - ]) - - # Configure paths for GTK+ -@@ -1265,59 +1635,56 @@ - rm -f conf.gtktest - ]) - --# Configure paths for GTK+ --# Owen Taylor 97-11-3 -- - dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) - dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS - dnl --AC_DEFUN(AM_PATH_GTK, -+AC_DEFUN([AM_PATH_GTK], - [dnl --dnl Get the cflags and libraries from the gtk-config script -+dnl Get the cflags and libraries from the pkg-config script - dnl --AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)], -+AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK 2.0 is installed (optional)], - gtk_config_prefix="$withval", gtk_config_prefix="") --AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)], -+AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK 2.0 is installed (optional)], - gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") --AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program], -+AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK 2.0 program], - , enable_gtktest=yes) - - for module in . $4 - do - case "$module" in -- gthread) -- gtk_config_args="$gtk_config_args gthread" -+ gthread-2.0) -+ gtk_config_args="$gtk_config_args gthread-2.0" - ;; - esac - done - - if test x$gtk_config_exec_prefix != x ; then - gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" -- if test x${GTK_CONFIG+set} != xset ; then -- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config -+ if test x${PKG_CONFIG+set} != xset ; then -+ PKG_CONFIG=$gtk_config_exec_prefix/bin/pkg-config - fi - fi - if test x$gtk_config_prefix != x ; then - gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" -- if test x${GTK_CONFIG+set} != xset ; then -- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config -+ if test x${PKG_CONFIG+set} != xset ; then -+ PKG_CONFIG=$gtk_config_prefix/bin/pkg-config - fi - fi - -- AC_PATH_PROG(GTK_CONFIG, gtk-config, no) -- min_gtk_version=ifelse([$1], ,0.99.7,$1) -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ min_gtk_version=ifelse([$1], ,2.0,$1) - AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) - no_gtk="" -- if test "$GTK_CONFIG" = "no" ; then -+ if test "$PKG_CONFIG" = "no" ; then - no_gtk=yes - else -- GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags` -- GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs` -- gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ GTK_CFLAGS=`$PKG_CONFIG $gtk_config_args --cflags gtk+-2.0` -+ GTK_LIBS=`$PKG_CONFIG $gtk_config_args --libs gtk+-2.0` -+ gtk_config_major_version=`$PKG_CONFIG $gtk_config_args --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -- gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ gtk_config_minor_version=`$PKG_CONFIG $gtk_config_args --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -- gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \ -+ gtk_config_micro_version=`$PKG_CONFIG $gtk_config_args --modversion gtk+-2.0 | \ - sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` - if test "x$enable_gtktest" = "xyes" ; then - ac_save_CFLAGS="$CFLAGS" -@@ -1326,7 +1693,7 @@ - LIBS="$GTK_LIBS $LIBS" - dnl - dnl Now check if the installed GTK is sufficiently new. (Also sanity --dnl checks the results of gtk-config to some extent -+dnl checks the results of pkg-config to some extent - dnl - rm -f conf.gtktest - AC_TRY_RUN([ -@@ -1353,16 +1720,16 @@ - (gtk_minor_version != $gtk_config_minor_version) || - (gtk_micro_version != $gtk_config_micro_version)) - { -- printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", -+ printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", - $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, - gtk_major_version, gtk_minor_version, gtk_micro_version); -- printf ("*** was found! If gtk-config was correct, then it is best\n"); -+ printf ("*** was found! If pkg-config was correct, then it is best\n"); - printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); - printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); - printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); - printf("*** required on your system.\n"); -- printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n"); -- printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n"); -+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG\n"); -+ printf("*** to point to the correct copy of pkg-config, and remove the file config.cache\n"); - printf("*** before re-running configure\n"); - } - #if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) -@@ -1393,10 +1760,10 @@ - printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); - printf("***\n"); - printf("*** If you have already installed a sufficiently new version, this error\n"); -- printf("*** probably means that the wrong copy of the gtk-config shell script is\n"); -+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); - printf("*** being found. The easiest way to fix this is to remove the old version\n"); -- printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n"); -- printf("*** correct copy of gtk-config. (In this case, you will have to\n"); -+ printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); -+ printf("*** correct copy of pkg-config. (In this case, you will have to\n"); - printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); - printf("*** so that the correct libraries are found at run-time))\n"); - } -@@ -1413,16 +1780,16 @@ - ifelse([$2], , :, [$2]) - else - AC_MSG_RESULT(no) -- if test "$GTK_CONFIG" = "no" ; then -- echo "*** The gtk-config script installed by GTK could not be found" -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** The pkg-config script installed by GTK could not be found" - echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" -- echo "*** your path, or set the GTK_CONFIG environment variable to the" -- echo "*** full path to gtk-config." -+ echo "*** your path, or set the PKG_CONFIG environment variable to the" -+ echo "*** full path to pkg-config." - else - if test -f conf.gtktest ; then - : - else -- echo "*** Could not run GTK test program, checking why..." -+ echo "*** Could not run GTK 2.0 test program, checking why..." - CFLAGS="$CFLAGS $GTK_CFLAGS" - LIBS="$LIBS $GTK_LIBS" - AC_TRY_LINK([ -@@ -1438,15 +1805,11 @@ - echo "***" - echo "*** If you have an old version installed, it is best to remove it, although" - echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -- echo "***" -- echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that" -- echo "*** came with the system with the command" -- echo "***" -- echo "*** rpm --erase --nodeps gtk gtk-devel" ], -+ echo "***" ], - [ echo "*** The test program failed to compile or link. See the file config.log for the" - echo "*** exact error that occured. This usually means GTK was incorrectly installed" - echo "*** or that you have moved GTK since it was installed. In the latter case, you" -- echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ]) -+ echo "*** may want to edit the pkg-config script: $PKG_CONFIG" ]) - CFLAGS="$ac_save_CFLAGS" - LIBS="$ac_save_LIBS" - fi -@@ -1460,266 +1823,238 @@ - rm -f conf.gtktest - ]) - -- --# file-type.m4 serial 1 --dnl Copyright (C) 2002 Free Software Foundation, Inc. -+# inttypes_h.m4 serial 4 (gettext-0.11.4) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. - dnl This file is free software, distributed under the terms of the GNU - dnl General Public License. As a special exception to the GNU General - dnl Public License, this file may be distributed as part of a program - dnl that contains a configuration script generated by Autoconf, under - dnl the same distribution terms as the rest of that program. - --AC_DEFUN([gl_FILE_TYPE], --[ -- dnl Prerequisites of lib/file-type.h. -- AC_REQUIRE([AC_HEADER_STAT]) --]) -- --#serial 11 -+dnl From Paul Eggert. - --# From fileutils/configure.in -+# Define HAVE_INTTYPES_H_WITH_UINTMAX if exists, -+# doesn't clash with , and declares uintmax_t. - --AC_DEFUN([gl_FSUSAGE], -+AC_DEFUN([jm_AC_HEADER_INTTYPES_H], - [ -- AC_CHECK_HEADERS(sys/param.h) -- AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/fs_types.h) -- jm_FILE_SYSTEM_USAGE([gl_cv_fs_space=yes], [gl_cv_fs_space=no]) -- if test $gl_cv_fs_space = yes; then -- AC_LIBOBJ(fsusage) -- gl_PREREQ_FSUSAGE_EXTRA -+ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, -+ [AC_TRY_COMPILE( -+ [#include -+#include ], -+ [uintmax_t i = (uintmax_t) -1;], -+ jm_ac_cv_header_inttypes_h=yes, -+ jm_ac_cv_header_inttypes_h=no)]) -+ if test $jm_ac_cv_header_inttypes_h = yes; then -+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, -+[Define if exists, doesn't clash with , -+ and declares uintmax_t. ]) - fi - ]) - --# Try to determine how a program can obtain filesystem usage information. --# If successful, define the appropriate symbol (see fsusage.c) and --# execute ACTION-IF-FOUND. Otherwise, execute ACTION-IF-NOT-FOUND. --# --# jm_FILE_SYSTEM_USAGE([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) -- --AC_DEFUN([jm_FILE_SYSTEM_USAGE], --[ -+# Configure paths for SDL -+# Sam Lantinga 9/21/99 -+# stolen from Manish Singh -+# stolen back from Frank Belew -+# stolen from Manish Singh -+# Shamelessly stolen from Owen Taylor - --echo "checking how to get filesystem space usage..." --ac_fsusage_space=no -+dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -+dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS -+dnl -+AC_DEFUN([AM_PATH_SDL], -+[dnl -+dnl Get the cflags and libraries from the sdl-config script -+dnl -+AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], -+ sdl_prefix="$withval", sdl_prefix="") -+AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], -+ sdl_exec_prefix="$withval", sdl_exec_prefix="") -+AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], -+ , enable_sdltest=yes) - --# Perform only the link test since it seems there are no variants of the --# statvfs function. This check is more than just AC_CHECK_FUNCS(statvfs) --# because that got a false positive on SCO OSR5. Adding the declaration --# of a `struct statvfs' causes this test to fail (as it should) on such --# systems. That system is reported to work fine with STAT_STATFS4 which --# is what it gets when this test fails. --if test $ac_fsusage_space = no; then -- # SVR4 -- AC_CACHE_CHECK([for statvfs function (SVR4)], fu_cv_sys_stat_statvfs, -- [AC_TRY_LINK([#include --#ifdef __GLIBC__ --Do not use statvfs on systems with GNU libc, because that function stats --all preceding entries in /proc/mounts, and that makes df hang if even --one of the corresponding file systems is hard-mounted, but not available. --#endif --#include ], -- [struct statvfs fsd; statvfs (0, &fsd);], -- fu_cv_sys_stat_statvfs=yes, -- fu_cv_sys_stat_statvfs=no)]) -- if test $fu_cv_sys_stat_statvfs = yes; then -- ac_fsusage_space=yes -- AC_DEFINE(STAT_STATVFS, 1, -- [ Define if there is a function named statvfs. (SVR4)]) -+ if test x$sdl_exec_prefix != x ; then -+ sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" -+ if test x${SDL_CONFIG+set} != xset ; then -+ SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config -+ fi - fi --fi -- --if test $ac_fsusage_space = no; then -- # DEC Alpha running OSF/1 -- AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)]) -- AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1, -- [AC_TRY_RUN([ --#include --#include --#include -- main () -- { -- struct statfs fsd; -- fsd.f_fsize = 0; -- exit (statfs (".", &fsd, sizeof (struct statfs))); -- }], -- fu_cv_sys_stat_statfs3_osf1=yes, -- fu_cv_sys_stat_statfs3_osf1=no, -- fu_cv_sys_stat_statfs3_osf1=no)]) -- AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1) -- if test $fu_cv_sys_stat_statfs3_osf1 = yes; then -- ac_fsusage_space=yes -- AC_DEFINE(STAT_STATFS3_OSF1, 1, -- [ Define if statfs takes 3 args. (DEC Alpha running OSF/1)]) -+ if test x$sdl_prefix != x ; then -+ sdl_args="$sdl_args --prefix=$sdl_prefix" -+ if test x${SDL_CONFIG+set} != xset ; then -+ SDL_CONFIG=$sdl_prefix/bin/sdl-config -+ fi - fi --fi - --if test $ac_fsusage_space = no; then --# AIX -- AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl --member (AIX, 4.3BSD)]) -- AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize, -- [AC_TRY_RUN([ --#ifdef HAVE_SYS_PARAM_H --#include --#endif --#ifdef HAVE_SYS_MOUNT_H --#include --#endif --#ifdef HAVE_SYS_VFS_H --#include --#endif -- main () -- { -- struct statfs fsd; -- fsd.f_bsize = 0; -- exit (statfs (".", &fsd)); -- }], -- fu_cv_sys_stat_statfs2_bsize=yes, -- fu_cv_sys_stat_statfs2_bsize=no, -- fu_cv_sys_stat_statfs2_bsize=no)]) -- AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize) -- if test $fu_cv_sys_stat_statfs2_bsize = yes; then -- ac_fsusage_space=yes -- AC_DEFINE(STAT_STATFS2_BSIZE, 1, --[ Define if statfs takes 2 args and struct statfs has a field named f_bsize. -- (4.3BSD, SunOS 4, HP-UX, AIX PS/2)]) -- fi --fi -+ AC_REQUIRE([AC_CANONICAL_TARGET]) -+ PATH="$prefix/bin:$prefix/usr/bin:$PATH" -+ AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) -+ min_sdl_version=ifelse([$1], ,0.11.0,$1) -+ AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) -+ no_sdl="" -+ if test "$SDL_CONFIG" = "no" ; then -+ no_sdl=yes -+ else -+ SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` -+ SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` - --if test $ac_fsusage_space = no; then --# SVR3 -- AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)]) -- AC_CACHE_VAL(fu_cv_sys_stat_statfs4, -- [AC_TRY_RUN([#include --#include -- main () -- { -- struct statfs fsd; -- exit (statfs (".", &fsd, sizeof fsd, 0)); -- }], -- fu_cv_sys_stat_statfs4=yes, -- fu_cv_sys_stat_statfs4=no, -- fu_cv_sys_stat_statfs4=no)]) -- AC_MSG_RESULT($fu_cv_sys_stat_statfs4) -- if test $fu_cv_sys_stat_statfs4 = yes; then -- ac_fsusage_space=yes -- AC_DEFINE(STAT_STATFS4, 1, -- [ Define if statfs takes 4 args. (SVR3, Dynix, Irix, Dolphin)]) -- fi --fi -+ sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_sdltest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $SDL_CFLAGS" -+ LIBS="$LIBS $SDL_LIBS" -+dnl -+dnl Now check if the installed SDL is sufficiently new. (Also sanity -+dnl checks the results of sdl-config to some extent -+dnl -+ rm -f conf.sdltest -+ AC_TRY_RUN([ -+#include -+#include -+#include -+#include "SDL.h" - --if test $ac_fsusage_space = no; then --# 4.4BSD and NetBSD -- AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl --member (4.4BSD and NetBSD)]) -- AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize, -- [AC_TRY_RUN([#include --#ifdef HAVE_SYS_PARAM_H --#include --#endif --#ifdef HAVE_SYS_MOUNT_H --#include --#endif -- main () -- { -- struct statfs fsd; -- fsd.f_fsize = 0; -- exit (statfs (".", &fsd)); -- }], -- fu_cv_sys_stat_statfs2_fsize=yes, -- fu_cv_sys_stat_statfs2_fsize=no, -- fu_cv_sys_stat_statfs2_fsize=no)]) -- AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize) -- if test $fu_cv_sys_stat_statfs2_fsize = yes; then -- ac_fsusage_space=yes -- AC_DEFINE(STAT_STATFS2_FSIZE, 1, --[ Define if statfs takes 2 args and struct statfs has a field named f_fsize. -- (4.4BSD, NetBSD)]) -- fi --fi -+char* -+my_strdup (char *str) -+{ -+ char *new_str; -+ -+ if (str) -+ { -+ new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); -+ strcpy (new_str, str); -+ } -+ else -+ new_str = NULL; -+ -+ return new_str; -+} - --if test $ac_fsusage_space = no; then -- # Ultrix -- AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)]) -- AC_CACHE_VAL(fu_cv_sys_stat_fs_data, -- [AC_TRY_RUN([#include --#ifdef HAVE_SYS_PARAM_H --#include --#endif --#ifdef HAVE_SYS_MOUNT_H --#include --#endif --#ifdef HAVE_SYS_FS_TYPES_H --#include --#endif -- main () -- { -- struct fs_data fsd; -- /* Ultrix's statfs returns 1 for success, -- 0 for not mounted, -1 for failure. */ -- exit (statfs (".", &fsd) != 1); -- }], -- fu_cv_sys_stat_fs_data=yes, -- fu_cv_sys_stat_fs_data=no, -- fu_cv_sys_stat_fs_data=no)]) -- AC_MSG_RESULT($fu_cv_sys_stat_fs_data) -- if test $fu_cv_sys_stat_fs_data = yes; then -- ac_fsusage_space=yes -- AC_DEFINE(STAT_STATFS2_FS_DATA, 1, --[ Define if statfs takes 2 args and the second argument has -- type struct fs_data. (Ultrix)]) -- fi --fi -+int main (int argc, char *argv[]) -+{ -+ int major, minor, micro; -+ char *tmp_version; - --if test $ac_fsusage_space = no; then -- # SVR2 -- AC_TRY_CPP([#include -- ], -- AC_DEFINE(STAT_READ_FILSYS, 1, -- [Define if there is no specific function for reading filesystems usage -- information and you have the header file. (SVR2)]) -- ac_fsusage_space=yes) --fi -+ /* This hangs on some systems (?) -+ system ("touch conf.sdltest"); -+ */ -+ { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } - --AS_IF([test $ac_fsusage_space = yes], [$1], [$2]) -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = my_strdup("$min_sdl_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_sdl_version"); -+ exit(1); -+ } - --]) -+ if (($sdl_major_version > major) || -+ (($sdl_major_version == major) && ($sdl_minor_version > minor)) || -+ (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); -+ printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); -+ printf("*** best to upgrade to the required version.\n"); -+ printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); -+ printf("*** to point to the correct copy of sdl-config, and remove the file\n"); -+ printf("*** config.cache before re-running configure\n"); -+ return 1; -+ } -+} - -+],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_sdl" = x ; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$SDL_CONFIG" = "no" ; then -+ echo "*** The sdl-config script installed by SDL could not be found" -+ echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the SDL_CONFIG environment variable to the" -+ echo "*** full path to sdl-config." -+ else -+ if test -f conf.sdltest ; then -+ : -+ else -+ echo "*** Could not run SDL test program, checking why..." -+ CFLAGS="$CFLAGS $SDL_CFLAGS" -+ LIBS="$LIBS $SDL_LIBS" -+ AC_TRY_LINK([ -+#include -+#include "SDL.h" - --# Check for SunOS statfs brokenness wrt partitions 2GB and larger. --# If exists and struct statfs has a member named f_spare, --# enable the work-around code in fsusage.c. --AC_DEFUN([jm_STATFS_TRUNCATES], --[ -- AC_MSG_CHECKING([for statfs that truncates block counts]) -- AC_CACHE_VAL(fu_cv_sys_truncating_statfs, -- [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ --#if !defined(sun) && !defined(__sun) --choke -- this is a workaround for a Sun-specific problem --#endif --#include --#include ]], -- [[struct statfs t; long c = *(t.f_spare);]])], -- [fu_cv_sys_truncating_statfs=yes], -- [fu_cv_sys_truncating_statfs=no])]) -- if test $fu_cv_sys_truncating_statfs = yes; then -- AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS, 1, -- [Define if the block counts reported by statfs may be truncated to 2GB -- and the correct values may be stored in the f_spare array. -- (SunOS 4.1.2, 4.1.3, and 4.1.3_U1 are reported to have this problem. -- SunOS 4.1.1 seems not to be affected.)]) -+int main(int argc, char *argv[]) -+{ return 0; } -+#undef main -+#define main K_and_R_C_main -+], [ return 0; ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding SDL or finding the wrong" -+ echo "*** version of SDL. If it is not finding SDL, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means SDL was incorrectly installed" -+ echo "*** or that you have moved SDL since it was installed. In the latter case, you" -+ echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ SDL_CFLAGS="" -+ SDL_LIBS="" -+ ifelse([$3], , :, [$3]) - fi -- AC_MSG_RESULT($fu_cv_sys_truncating_statfs) -+ AC_SUBST(SDL_CFLAGS) -+ AC_SUBST(SDL_LIBS) -+ rm -f conf.sdltest - ]) - -+# stdint_h.m4 serial 2 (gettext-0.11.4) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. - --# Prerequisites of lib/fsusage.c not done by jm_FILE_SYSTEM_USAGE. --AC_DEFUN([gl_PREREQ_FSUSAGE_EXTRA], -+dnl From Paul Eggert. -+ -+# Define HAVE_STDINT_H_WITH_UINTMAX if exists, -+# doesn't clash with , and declares uintmax_t. -+ -+AC_DEFUN([jm_AC_HEADER_STDINT_H], - [ -- AC_REQUIRE([jm_AC_TYPE_UINTMAX_T]) -- AC_CHECK_HEADERS(fcntl.h) -- AC_CHECK_HEADERS(dustat.h sys/fs/s5param.h sys/filsys.h sys/statfs.h sys/statvfs.h) -- jm_STATFS_TRUNCATES -+ AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, -+ [AC_TRY_COMPILE( -+ [#include -+#include ], -+ [uintmax_t i = (uintmax_t) -1;], -+ jm_ac_cv_header_stdint_h=yes, -+ jm_ac_cv_header_stdint_h=no)]) -+ if test $jm_ac_cv_header_stdint_h = yes; then -+ AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, -+[Define if exists, doesn't clash with , -+ and declares uintmax_t. ]) -+ fi - ]) - - # uintmax_t.m4 serial 7 (gettext-0.12) -@@ -1755,66 +2090,8 @@ - fi - ]) - --# inttypes_h.m4 serial 5 (gettext-0.12) --dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. --dnl This file is free software, distributed under the terms of the GNU --dnl General Public License. As a special exception to the GNU General --dnl Public License, this file may be distributed as part of a program --dnl that contains a configuration script generated by Autoconf, under --dnl the same distribution terms as the rest of that program. -- --dnl From Paul Eggert. -- --# Define HAVE_INTTYPES_H_WITH_UINTMAX if exists, --# doesn't clash with , and declares uintmax_t. -- --AC_DEFUN([jm_AC_HEADER_INTTYPES_H], --[ -- AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, -- [AC_TRY_COMPILE( -- [#include --#include ], -- [uintmax_t i = (uintmax_t) -1;], -- jm_ac_cv_header_inttypes_h=yes, -- jm_ac_cv_header_inttypes_h=no)]) -- if test $jm_ac_cv_header_inttypes_h = yes; then -- AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, -- [Define if exists, doesn't clash with , -- and declares uintmax_t. ]) -- fi --]) -- --# stdint_h.m4 serial 3 (gettext-0.12) --dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. --dnl This file is free software, distributed under the terms of the GNU --dnl General Public License. As a special exception to the GNU General --dnl Public License, this file may be distributed as part of a program --dnl that contains a configuration script generated by Autoconf, under --dnl the same distribution terms as the rest of that program. -- --dnl From Paul Eggert. -- --# Define HAVE_STDINT_H_WITH_UINTMAX if exists, --# doesn't clash with , and declares uintmax_t. -- --AC_DEFUN([jm_AC_HEADER_STDINT_H], --[ -- AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, -- [AC_TRY_COMPILE( -- [#include --#include ], -- [uintmax_t i = (uintmax_t) -1;], -- jm_ac_cv_header_stdint_h=yes, -- jm_ac_cv_header_stdint_h=no)]) -- if test $jm_ac_cv_header_stdint_h = yes; then -- AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, -- [Define if exists, doesn't clash with , -- and declares uintmax_t. ]) -- fi --]) -- --# ulonglong.m4 serial 3 --dnl Copyright (C) 1999-2003 Free Software Foundation, Inc. -+# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40) -+dnl Copyright (C) 1999-2002 Free Software Foundation, Inc. - dnl This file is free software, distributed under the terms of the GNU - dnl General Public License. As a special exception to the GNU General - dnl Public License, this file may be distributed as part of a program -@@ -1823,272 +2100,17 @@ - - dnl From Paul Eggert. - --# Define HAVE_UNSIGNED_LONG_LONG if 'unsigned long long' works. -- - AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], - [ - AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, -- [AC_TRY_LINK([unsigned long long ull = 1ULL; int i = 63;], -+ [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;], - [unsigned long long ullmax = (unsigned long long) -1; - return ull << i | ull >> i | ullmax / ull | ullmax % ull;], - ac_cv_type_unsigned_long_long=yes, - ac_cv_type_unsigned_long_long=no)]) - if test $ac_cv_type_unsigned_long_long = yes; then - AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, -- [Define if you have the 'unsigned long long' type.]) -+ [Define if you have the unsigned long long type.]) - fi - ]) - --dnl Available from the GNU Autoconf Macro Archive at: --dnl http://www.gnu.org/software/ac-archive/htmldoc/check_zlib.html --dnl --AC_DEFUN([CHECK_ZLIB], --# --# Handle user hints --# --[AC_MSG_CHECKING(if zlib is wanted) --AC_ARG_WITH(zlib, --[ --with-zlib=DIR root directory path of zlib installation [defaults to -- /usr/local or /usr if not found in /usr/local] -- --without-zlib to disable zlib usage completely], --[if test "$withval" != no ; then -- AC_MSG_RESULT(yes) -- ZLIB_HOME="$withval" --else -- AC_MSG_RESULT(no) --fi], [ --AC_MSG_RESULT(yes) --ZLIB_HOME=/usr/local --if test ! -f "${ZLIB_HOME}/include/zlib.h" --then -- ZLIB_HOME=/usr --fi --]) -- --# --# Locate zlib, if wanted --# --if test -n "${ZLIB_HOME}" --then -- ZLIB_OLD_LDFLAGS=$LDFLAGS -- ZLIB_OLD_CPPFLAGS=$LDFLAGS -- LDFLAGS="$LDFLAGS -L${ZLIB_HOME}/lib" -- CPPFLAGS="$CPPFLAGS -I${ZLIB_HOME}/include" -- AC_LANG_SAVE -- AC_LANG_C -- AC_CHECK_LIB(z, inflateEnd, [zlib_cv_libz=yes], [zlib_cv_libz=no]) -- AC_CHECK_HEADER(zlib.h, [zlib_cv_zlib_h=yes], [zlib_cvs_zlib_h=no]) -- AC_LANG_RESTORE -- if test "$zlib_cv_libz" = "yes" -a "$zlib_cv_zlib_h" = "yes" -- then -- # -- # If both library and header were found, use them -- # -- AC_CHECK_LIB(z, inflateEnd) -- AC_MSG_CHECKING(zlib in ${ZLIB_HOME}) -- AC_MSG_RESULT(ok) -- else -- # -- # If either header or library was not found, revert and bomb -- # -- AC_MSG_CHECKING(zlib in ${ZLIB_HOME}) -- LDFLAGS="$ZLIB_OLD_LDFLAGS" -- CPPFLAGS="$ZLIB_OLD_CPPFLAGS" -- AC_MSG_RESULT(failed) -- AC_MSG_ERROR(either specify a valid zlib installation with --with-zlib=DIR or disable zlib usage with --without-zlib) -- fi --fi -- --]) -- --dnl Available from the GNU Autoconf Macro Archive at: --dnl http://www.gnu.org/software/ac-archive/htmldoc/acx_pthread.html --dnl --AC_DEFUN([ACX_PTHREAD], [ --AC_REQUIRE([AC_CANONICAL_HOST]) --AC_LANG_SAVE --AC_LANG_C --acx_pthread_ok=no -- --# We used to check for pthread.h first, but this fails if pthread.h --# requires special compiler flags (e.g. on True64 or Sequent). --# It gets checked for in the link test anyway. -- --# First of all, check if the user has set any of the PTHREAD_LIBS, --# etcetera environment variables, and if threads linking works using --# them: --if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -- save_LIBS="$LIBS" -- LIBS="$PTHREAD_LIBS $LIBS" -- AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS]) -- AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes) -- AC_MSG_RESULT($acx_pthread_ok) -- if test x"$acx_pthread_ok" = xno; then -- PTHREAD_LIBS="" -- PTHREAD_CFLAGS="" -- fi -- LIBS="$save_LIBS" -- CFLAGS="$save_CFLAGS" --fi -- --# We must check for the threads library under a number of different --# names; the ordering is very important because some systems --# (e.g. DEC) have both -lpthread and -lpthreads, where one of the --# libraries is broken (non-POSIX). -- --# Create a list of thread flags to try. Items starting with a "-" are --# C compiler flags, and other items are library names, except for "none" --# which indicates that we try without any flags at all. -- --acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt" -- --# The ordering *is* (sometimes) important. Some notes on the --# individual items follow: -- --# pthreads: AIX (must check this before -lpthread) --# none: in case threads are in libc; should be tried before -Kthread and --# other compiler flags to prevent continual compiler warnings --# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h) --# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able) --# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread) --# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads) --# -pthreads: Solaris/gcc --# -mthreads: Mingw32/gcc, Lynx/gcc --# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it --# doesn't hurt to check since this sometimes defines pthreads too; --# also defines -D_REENTRANT) --# pthread: Linux, etcetera --# --thread-safe: KAI C++ -- --case "${host_cpu}-${host_os}" in -- *solaris*) -- -- # On Solaris (at least, for some versions), libc contains stubbed -- # (non-functional) versions of the pthreads routines, so link-based -- # tests will erroneously succeed. (We need to link with -pthread or -- # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather -- # a function called by this macro, so we could check for that, but -- # who knows whether they'll stub that too in a future libc.) So, -- # we'll just look for -pthreads and -lpthread first: -- -- acx_pthread_flags="-pthread -pthreads pthread -mt $acx_pthread_flags" -- ;; --esac -- --if test x"$acx_pthread_ok" = xno; then --for flag in $acx_pthread_flags; do -- -- case $flag in -- none) -- AC_MSG_CHECKING([whether pthreads work without any flags]) -- ;; -- -- -*) -- AC_MSG_CHECKING([whether pthreads work with $flag]) -- PTHREAD_CFLAGS="$flag" -- ;; -- -- *) -- AC_MSG_CHECKING([for the pthreads library -l$flag]) -- PTHREAD_LIBS="-l$flag" -- ;; -- esac -- -- save_LIBS="$LIBS" -- save_CFLAGS="$CFLAGS" -- LIBS="$PTHREAD_LIBS $LIBS" -- CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -- -- # Check for various functions. We must include pthread.h, -- # since some functions may be macros. (On the Sequent, we -- # need a special flag -Kthread to make this header compile.) -- # We check for pthread_join because it is in -lpthread on IRIX -- # while pthread_create is in libc. We check for pthread_attr_init -- # due to DEC craziness with -lpthreads. We check for -- # pthread_cleanup_push because it is one of the few pthread -- # functions on Solaris that doesn't have a non-functional libc stub. -- # We try pthread_create on general principles. -- AC_TRY_LINK([#include ], -- [pthread_t th; pthread_join(th, 0); -- pthread_attr_init(0); pthread_cleanup_push(0, 0); -- pthread_create(0,0,0,0); pthread_cleanup_pop(0); ], -- [acx_pthread_ok=yes]) -- -- LIBS="$save_LIBS" -- CFLAGS="$save_CFLAGS" -- -- AC_MSG_RESULT($acx_pthread_ok) -- if test "x$acx_pthread_ok" = xyes; then -- break; -- fi -- -- PTHREAD_LIBS="" -- PTHREAD_CFLAGS="" --done --fi -- --# Various other checks: --if test "x$acx_pthread_ok" = xyes; then -- save_LIBS="$LIBS" -- LIBS="$PTHREAD_LIBS $LIBS" -- save_CFLAGS="$CFLAGS" -- CFLAGS="$CFLAGS $PTHREAD_CFLAGS" -- -- # Detect AIX lossage: threads are created detached by default -- # and the JOINABLE attribute has a nonstandard name (UNDETACHED). -- AC_MSG_CHECKING([for joinable pthread attribute]) -- AC_TRY_LINK([#include ], -- [int attr=PTHREAD_CREATE_JOINABLE;], -- ok=PTHREAD_CREATE_JOINABLE, ok=unknown) -- if test x"$ok" = xunknown; then -- AC_TRY_LINK([#include ], -- [int attr=PTHREAD_CREATE_UNDETACHED;], -- ok=PTHREAD_CREATE_UNDETACHED, ok=unknown) -- fi -- if test x"$ok" != xPTHREAD_CREATE_JOINABLE; then -- AC_DEFINE(PTHREAD_CREATE_JOINABLE, $ok, -- [Define to the necessary symbol if this constant -- uses a non-standard name on your system.]) -- fi -- AC_MSG_RESULT(${ok}) -- if test x"$ok" = xunknown; then -- AC_MSG_WARN([we do not know how to create joinable pthreads]) -- fi -- -- AC_MSG_CHECKING([if more special flags are required for pthreads]) -- flag=no -- case "${host_cpu}-${host_os}" in -- *-aix* | *-freebsd*) flag="-D_THREAD_SAFE";; -- *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";; -- esac -- AC_MSG_RESULT(${flag}) -- if test "x$flag" != xno; then -- PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS" -- fi -- -- LIBS="$save_LIBS" -- CFLAGS="$save_CFLAGS" -- -- # More AIX lossage: must compile with cc_r -- AC_CHECK_PROG(PTHREAD_CC, cc_r, cc_r, ${CC}) --else -- PTHREAD_CC="$CC" --fi -- --AC_SUBST(PTHREAD_LIBS) --AC_SUBST(PTHREAD_CFLAGS) --AC_SUBST(PTHREAD_CC) -- --# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND: --if test x"$acx_pthread_ok" = xyes; then -- ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1]) -- : --else -- acx_pthread_ok=no -- $2 --fi --AC_LANG_RESTORE --])dnl ACX_PTHREAD -- ---- tmp/base/uae-0.8.23-20040129-r0/uae-0.8.23-20040129/m4/gtk-2.0.m4 1969-12-31 19:00:00.000000000 -0500 -+++ uae-0.8.23-20040129/m4/gtk-2.0.m4 2004-03-05 17:17:05.000000000 -0500 -@@ -0,0 +1,196 @@ -+# Configure paths for GTK+ -+# Owen Taylor 1997-2001 -+ -+dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -+dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES, -+dnl pass to pkg-config -+dnl -+AC_DEFUN(AM_PATH_GTK_2_0, -+[dnl -+dnl Get the cflags and libraries from pkg-config -+dnl -+AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program], -+ , enable_gtktest=yes) -+ -+ pkg_config_args=gtk+-2.0 -+ for module in . $4 -+ do -+ case "$module" in -+ gthread) -+ pkg_config_args="$pkg_config_args gthread-2.0" -+ ;; -+ esac -+ done -+ -+ no_gtk="" -+ -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ -+ if test x$PKG_CONFIG != xno ; then -+ if pkg-config --atleast-pkgconfig-version 0.7 ; then -+ : -+ else -+ echo *** pkg-config too old; version 0.7 or better required. -+ no_gtk=yes -+ PKG_CONFIG=no -+ fi -+ else -+ no_gtk=yes -+ fi -+ -+ min_gtk_version=ifelse([$1], ,2.0.0,$1) -+ AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version) -+ -+ if test x$PKG_CONFIG != xno ; then -+ ## don't try to run the test against uninstalled libtool libs -+ if $PKG_CONFIG --uninstalled $pkg_config_args; then -+ echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH" -+ enable_gtktest=no -+ fi -+ -+ if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then -+ : -+ else -+ no_gtk=yes -+ fi -+ fi -+ -+ if test x"$no_gtk" = x ; then -+ GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags` -+ GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs` -+ gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_gtktest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$GTK_LIBS $LIBS" -+dnl -+dnl Now check if the installed GTK+ is sufficiently new. (Also sanity -+dnl checks the results of pkg-config to some extent) -+dnl -+ rm -f conf.gtktest -+ AC_TRY_RUN([ -+#include -+#include -+#include -+ -+int -+main () -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ system ("touch conf.gtktest"); -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = g_strdup("$min_gtk_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_gtk_version"); -+ exit(1); -+ } -+ -+ if ((gtk_major_version != $gtk_config_major_version) || -+ (gtk_minor_version != $gtk_config_minor_version) || -+ (gtk_micro_version != $gtk_config_micro_version)) -+ { -+ printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", -+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf ("*** was found! If pkg-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n"); -+ printf("*** to point to the correct configuration files\n"); -+ } -+ else if ((gtk_major_version != GTK_MAJOR_VERSION) || -+ (gtk_minor_version != GTK_MINOR_VERSION) || -+ (gtk_micro_version != GTK_MICRO_VERSION)) -+ { -+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n", -+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ } -+ else -+ { -+ if ((gtk_major_version > major) || -+ ((gtk_major_version == major) && (gtk_minor_version > minor)) || -+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); -+ printf("*** correct copy of pkg-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_gtk" = x ; then -+ AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version)) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** A new enough version of pkg-config was not found." -+ echo "*** See http://pkgconfig.sourceforge.net" -+ else -+ if test -f conf.gtktest ; then -+ : -+ else -+ echo "*** Could not run GTK+ test program, checking why..." -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$LIBS $GTK_LIBS" -+ AC_TRY_LINK([ -+#include -+#include -+], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GTK+ or finding the wrong" -+ echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GTK_CFLAGS="" -+ GTK_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(GTK_CFLAGS) -+ AC_SUBST(GTK_LIBS) -+ rm -f conf.gtktest -+]) ---- tmp/base/uae-0.8.23-20040129-r0/uae-0.8.23-20040129/m4/gtk.m4 1969-12-31 19:00:00.000000000 -0500 -+++ uae-0.8.23-20040129/m4/gtk.m4 2004-03-05 17:22:03.000000000 -0500 -@@ -0,0 +1,187 @@ -+dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]]) -+dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS -+dnl -+AC_DEFUN([AM_PATH_GTK], -+[dnl -+dnl Get the cflags and libraries from the pkg-config script -+dnl -+AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK 2.0 is installed (optional)], -+ gtk_config_prefix="$withval", gtk_config_prefix="") -+AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK 2.0 is installed (optional)], -+ gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="") -+AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK 2.0 program], -+ , enable_gtktest=yes) -+ -+ for module in . $4 -+ do -+ case "$module" in -+ gthread-2.0) -+ gtk_config_args="$gtk_config_args gthread-2.0" -+ ;; -+ esac -+ done -+ -+ if test x$gtk_config_exec_prefix != x ; then -+ gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix" -+ if test x${PKG_CONFIG+set} != xset ; then -+ PKG_CONFIG=$gtk_config_exec_prefix/bin/pkg-config -+ fi -+ fi -+ if test x$gtk_config_prefix != x ; then -+ gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix" -+ if test x${PKG_CONFIG+set} != xset ; then -+ PKG_CONFIG=$gtk_config_prefix/bin/pkg-config -+ fi -+ fi -+ -+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no) -+ min_gtk_version=ifelse([$1], ,2.0,$1) -+ AC_MSG_CHECKING(for GTK - version >= $min_gtk_version) -+ no_gtk="" -+ if test "$PKG_CONFIG" = "no" ; then -+ no_gtk=yes -+ else -+ GTK_CFLAGS=`$PKG_CONFIG $gtk_config_args --cflags gtk+-2.0` -+ GTK_LIBS=`$PKG_CONFIG $gtk_config_args --libs gtk+-2.0` -+ gtk_config_major_version=`$PKG_CONFIG $gtk_config_args --modversion gtk+-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ gtk_config_minor_version=`$PKG_CONFIG $gtk_config_args --modversion gtk+-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ gtk_config_micro_version=`$PKG_CONFIG $gtk_config_args --modversion gtk+-2.0 | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_gtktest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$GTK_LIBS $LIBS" -+dnl -+dnl Now check if the installed GTK is sufficiently new. (Also sanity -+dnl checks the results of pkg-config to some extent -+dnl -+ rm -f conf.gtktest -+ AC_TRY_RUN([ -+#include -+#include -+#include -+ -+int -+main () -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ system ("touch conf.gtktest"); -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = g_strdup("$min_gtk_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_gtk_version"); -+ exit(1); -+ } -+ -+ if ((gtk_major_version != $gtk_config_major_version) || -+ (gtk_minor_version != $gtk_config_minor_version) || -+ (gtk_micro_version != $gtk_config_micro_version)) -+ { -+ printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n", -+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version, -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf ("*** was found! If pkg-config was correct, then it is best\n"); -+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n"); -+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n"); -+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n"); -+ printf("*** required on your system.\n"); -+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG\n"); -+ printf("*** to point to the correct copy of pkg-config, and remove the file config.cache\n"); -+ printf("*** before re-running configure\n"); -+ } -+#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION) -+ else if ((gtk_major_version != GTK_MAJOR_VERSION) || -+ (gtk_minor_version != GTK_MINOR_VERSION) || -+ (gtk_micro_version != GTK_MICRO_VERSION)) -+ { -+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n", -+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION); -+ printf("*** library (version %d.%d.%d)\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ } -+#endif /* defined (GTK_MAJOR_VERSION) ... */ -+ else -+ { -+ if ((gtk_major_version > major) || -+ ((gtk_major_version == major) && (gtk_minor_version > minor)) || -+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n", -+ gtk_major_version, gtk_minor_version, gtk_micro_version); -+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n", -+ major, minor, micro); -+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n"); -+ printf("***\n"); -+ printf("*** If you have already installed a sufficiently new version, this error\n"); -+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n"); -+ printf("*** being found. The easiest way to fix this is to remove the old version\n"); -+ printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n"); -+ printf("*** correct copy of pkg-config. (In this case, you will have to\n"); -+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n"); -+ printf("*** so that the correct libraries are found at run-time))\n"); -+ } -+ } -+ return 1; -+} -+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_gtk" = x ; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$PKG_CONFIG" = "no" ; then -+ echo "*** The pkg-config script installed by GTK could not be found" -+ echo "*** If GTK was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the PKG_CONFIG environment variable to the" -+ echo "*** full path to pkg-config." -+ else -+ if test -f conf.gtktest ; then -+ : -+ else -+ echo "*** Could not run GTK 2.0 test program, checking why..." -+ CFLAGS="$CFLAGS $GTK_CFLAGS" -+ LIBS="$LIBS $GTK_LIBS" -+ AC_TRY_LINK([ -+#include -+#include -+], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding GTK or finding the wrong" -+ echo "*** version of GTK. If it is not finding GTK, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" -+ echo "***" ], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means GTK was incorrectly installed" -+ echo "*** or that you have moved GTK since it was installed. In the latter case, you" -+ echo "*** may want to edit the pkg-config script: $PKG_CONFIG" ]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ GTK_CFLAGS="" -+ GTK_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(GTK_CFLAGS) -+ AC_SUBST(GTK_LIBS) -+ rm -f conf.gtktest -+]) ---- tmp/base/uae-0.8.23-20040129-r0/uae-0.8.23-20040129/m4/inttypes_h.m4 1969-12-31 19:00:00.000000000 -0500 -+++ uae-0.8.23-20040129/m4/inttypes_h.m4 2004-03-05 17:11:55.000000000 -0500 -@@ -0,0 +1,28 @@ -+# inttypes_h.m4 serial 4 (gettext-0.11.4) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+# Define HAVE_INTTYPES_H_WITH_UINTMAX if exists, -+# doesn't clash with , and declares uintmax_t. -+ -+AC_DEFUN([jm_AC_HEADER_INTTYPES_H], -+[ -+ AC_CACHE_CHECK([for inttypes.h], jm_ac_cv_header_inttypes_h, -+ [AC_TRY_COMPILE( -+ [#include -+#include ], -+ [uintmax_t i = (uintmax_t) -1;], -+ jm_ac_cv_header_inttypes_h=yes, -+ jm_ac_cv_header_inttypes_h=no)]) -+ if test $jm_ac_cv_header_inttypes_h = yes; then -+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H_WITH_UINTMAX, 1, -+[Define if exists, doesn't clash with , -+ and declares uintmax_t. ]) -+ fi -+]) ---- tmp/base/uae-0.8.23-20040129-r0/uae-0.8.23-20040129/m4/inttypes.m4 1969-12-31 19:00:00.000000000 -0500 -+++ uae-0.8.23-20040129/m4/inttypes.m4 2004-03-05 17:11:55.000000000 -0500 -@@ -0,0 +1,27 @@ -+# inttypes.m4 serial 1 (gettext-0.11.4) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+# Define HAVE_INTTYPES_H if exists and doesn't clash with -+# . -+ -+AC_DEFUN([gt_HEADER_INTTYPES_H], -+[ -+ AC_CACHE_CHECK([for inttypes.h], gt_cv_header_inttypes_h, -+ [ -+ AC_TRY_COMPILE( -+ [#include -+#include ], -+ [], gt_cv_header_inttypes_h=yes, gt_cv_header_inttypes_h=no) -+ ]) -+ if test $gt_cv_header_inttypes_h = yes; then -+ AC_DEFINE_UNQUOTED(HAVE_INTTYPES_H, 1, -+ [Define if exists and doesn't clash with .]) -+ fi -+]) ---- tmp/base/uae-0.8.23-20040129-r0/uae-0.8.23-20040129/m4/inttypes-pri.m4 1969-12-31 19:00:00.000000000 -0500 -+++ uae-0.8.23-20040129/m4/inttypes-pri.m4 2004-03-05 17:11:55.000000000 -0500 -@@ -0,0 +1,32 @@ -+# inttypes-pri.m4 serial 1 (gettext-0.11.4) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Bruno Haible. -+ -+# Define PRI_MACROS_BROKEN if exists and defines the PRI* -+# macros to non-string values. This is the case on AIX 4.3.3. -+ -+AC_DEFUN([gt_INTTYPES_PRI], -+[ -+ AC_REQUIRE([gt_HEADER_INTTYPES_H]) -+ if test $gt_cv_header_inttypes_h = yes; then -+ AC_CACHE_CHECK([whether the inttypes.h PRIxNN macros are broken], -+ gt_cv_inttypes_pri_broken, -+ [ -+ AC_TRY_COMPILE([#include -+#ifdef PRId32 -+char *p = PRId32; -+#endif -+], [], gt_cv_inttypes_pri_broken=no, gt_cv_inttypes_pri_broken=yes) -+ ]) -+ fi -+ if test "$gt_cv_inttypes_pri_broken" = yes; then -+ AC_DEFINE_UNQUOTED(PRI_MACROS_BROKEN, 1, -+ [Define if exists and defines unusable PRI* macros.]) -+ fi -+]) ---- tmp/base/uae-0.8.23-20040129-r0/uae-0.8.23-20040129/m4/sdl.m4 1969-12-31 19:00:00.000000000 -0500 -+++ uae-0.8.23-20040129/m4/sdl.m4 2004-03-05 17:12:16.000000000 -0500 -@@ -0,0 +1,175 @@ -+# Configure paths for SDL -+# Sam Lantinga 9/21/99 -+# stolen from Manish Singh -+# stolen back from Frank Belew -+# stolen from Manish Singh -+# Shamelessly stolen from Owen Taylor -+ -+dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) -+dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS -+dnl -+AC_DEFUN([AM_PATH_SDL], -+[dnl -+dnl Get the cflags and libraries from the sdl-config script -+dnl -+AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], -+ sdl_prefix="$withval", sdl_prefix="") -+AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], -+ sdl_exec_prefix="$withval", sdl_exec_prefix="") -+AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], -+ , enable_sdltest=yes) -+ -+ if test x$sdl_exec_prefix != x ; then -+ sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" -+ if test x${SDL_CONFIG+set} != xset ; then -+ SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config -+ fi -+ fi -+ if test x$sdl_prefix != x ; then -+ sdl_args="$sdl_args --prefix=$sdl_prefix" -+ if test x${SDL_CONFIG+set} != xset ; then -+ SDL_CONFIG=$sdl_prefix/bin/sdl-config -+ fi -+ fi -+ -+ AC_REQUIRE([AC_CANONICAL_TARGET]) -+ PATH="$prefix/bin:$prefix/usr/bin:$PATH" -+ AC_PATH_PROG(SDL_CONFIG, sdl-config, no, [$PATH]) -+ min_sdl_version=ifelse([$1], ,0.11.0,$1) -+ AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) -+ no_sdl="" -+ if test "$SDL_CONFIG" = "no" ; then -+ no_sdl=yes -+ else -+ SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` -+ SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` -+ -+ sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` -+ sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` -+ sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ -+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` -+ if test "x$enable_sdltest" = "xyes" ; then -+ ac_save_CFLAGS="$CFLAGS" -+ ac_save_LIBS="$LIBS" -+ CFLAGS="$CFLAGS $SDL_CFLAGS" -+ LIBS="$LIBS $SDL_LIBS" -+dnl -+dnl Now check if the installed SDL is sufficiently new. (Also sanity -+dnl checks the results of sdl-config to some extent -+dnl -+ rm -f conf.sdltest -+ AC_TRY_RUN([ -+#include -+#include -+#include -+#include "SDL.h" -+ -+char* -+my_strdup (char *str) -+{ -+ char *new_str; -+ -+ if (str) -+ { -+ new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); -+ strcpy (new_str, str); -+ } -+ else -+ new_str = NULL; -+ -+ return new_str; -+} -+ -+int main (int argc, char *argv[]) -+{ -+ int major, minor, micro; -+ char *tmp_version; -+ -+ /* This hangs on some systems (?) -+ system ("touch conf.sdltest"); -+ */ -+ { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } -+ -+ /* HP/UX 9 (%@#!) writes to sscanf strings */ -+ tmp_version = my_strdup("$min_sdl_version"); -+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { -+ printf("%s, bad version string\n", "$min_sdl_version"); -+ exit(1); -+ } -+ -+ if (($sdl_major_version > major) || -+ (($sdl_major_version == major) && ($sdl_minor_version > minor)) || -+ (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) -+ { -+ return 0; -+ } -+ else -+ { -+ printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); -+ printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); -+ printf("*** best to upgrade to the required version.\n"); -+ printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); -+ printf("*** to point to the correct copy of sdl-config, and remove the file\n"); -+ printf("*** config.cache before re-running configure\n"); -+ return 1; -+ } -+} -+ -+],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ if test "x$no_sdl" = x ; then -+ AC_MSG_RESULT(yes) -+ ifelse([$2], , :, [$2]) -+ else -+ AC_MSG_RESULT(no) -+ if test "$SDL_CONFIG" = "no" ; then -+ echo "*** The sdl-config script installed by SDL could not be found" -+ echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" -+ echo "*** your path, or set the SDL_CONFIG environment variable to the" -+ echo "*** full path to sdl-config." -+ else -+ if test -f conf.sdltest ; then -+ : -+ else -+ echo "*** Could not run SDL test program, checking why..." -+ CFLAGS="$CFLAGS $SDL_CFLAGS" -+ LIBS="$LIBS $SDL_LIBS" -+ AC_TRY_LINK([ -+#include -+#include "SDL.h" -+ -+int main(int argc, char *argv[]) -+{ return 0; } -+#undef main -+#define main K_and_R_C_main -+], [ return 0; ], -+ [ echo "*** The test program compiled, but did not run. This usually means" -+ echo "*** that the run-time linker is not finding SDL or finding the wrong" -+ echo "*** version of SDL. If it is not finding SDL, you'll need to set your" -+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" -+ echo "*** to the installed location Also, make sure you have run ldconfig if that" -+ echo "*** is required on your system" -+ echo "***" -+ echo "*** If you have an old version installed, it is best to remove it, although" -+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], -+ [ echo "*** The test program failed to compile or link. See the file config.log for the" -+ echo "*** exact error that occured. This usually means SDL was incorrectly installed" -+ echo "*** or that you have moved SDL since it was installed. In the latter case, you" -+ echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) -+ CFLAGS="$ac_save_CFLAGS" -+ LIBS="$ac_save_LIBS" -+ fi -+ fi -+ SDL_CFLAGS="" -+ SDL_LIBS="" -+ ifelse([$3], , :, [$3]) -+ fi -+ AC_SUBST(SDL_CFLAGS) -+ AC_SUBST(SDL_LIBS) -+ rm -f conf.sdltest -+]) ---- tmp/base/uae-0.8.23-20040129-r0/uae-0.8.23-20040129/m4/stdint_h.m4 1969-12-31 19:00:00.000000000 -0500 -+++ uae-0.8.23-20040129/m4/stdint_h.m4 2004-03-05 17:11:44.000000000 -0500 -@@ -0,0 +1,28 @@ -+# stdint_h.m4 serial 2 (gettext-0.11.4) -+dnl Copyright (C) 1997-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+# Define HAVE_STDINT_H_WITH_UINTMAX if exists, -+# doesn't clash with , and declares uintmax_t. -+ -+AC_DEFUN([jm_AC_HEADER_STDINT_H], -+[ -+ AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, -+ [AC_TRY_COMPILE( -+ [#include -+#include ], -+ [uintmax_t i = (uintmax_t) -1;], -+ jm_ac_cv_header_stdint_h=yes, -+ jm_ac_cv_header_stdint_h=no)]) -+ if test $jm_ac_cv_header_stdint_h = yes; then -+ AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, -+[Define if exists, doesn't clash with , -+ and declares uintmax_t. ]) -+ fi -+]) ---- tmp/base/uae-0.8.23-20040129-r0/uae-0.8.23-20040129/m4/ulonglong.m4 1969-12-31 19:00:00.000000000 -0500 -+++ uae-0.8.23-20040129/m4/ulonglong.m4 2004-03-05 17:11:37.000000000 -0500 -@@ -0,0 +1,23 @@ -+# ulonglong.m4 serial 2 (fileutils-4.0.32, gettext-0.10.40) -+dnl Copyright (C) 1999-2002 Free Software Foundation, Inc. -+dnl This file is free software, distributed under the terms of the GNU -+dnl General Public License. As a special exception to the GNU General -+dnl Public License, this file may be distributed as part of a program -+dnl that contains a configuration script generated by Autoconf, under -+dnl the same distribution terms as the rest of that program. -+ -+dnl From Paul Eggert. -+ -+AC_DEFUN([jm_AC_TYPE_UNSIGNED_LONG_LONG], -+[ -+ AC_CACHE_CHECK([for unsigned long long], ac_cv_type_unsigned_long_long, -+ [AC_TRY_LINK([unsigned long long ull = 1; int i = 63;], -+ [unsigned long long ullmax = (unsigned long long) -1; -+ return ull << i | ull >> i | ullmax / ull | ullmax % ull;], -+ ac_cv_type_unsigned_long_long=yes, -+ ac_cv_type_unsigned_long_long=no)]) -+ if test $ac_cv_type_unsigned_long_long = yes; then -+ AC_DEFINE(HAVE_UNSIGNED_LONG_LONG, 1, -+ [Define if you have the unsigned long long type.]) -+ fi -+]) ---- tmp/base/uae-0.8.23-20040129-r0/uae-0.8.23-20040129/src/tools/aclocal.m4 2003-12-22 05:12:37.000000000 -0500 -+++ uae-0.8.23-20040129/src/tools/aclocal.m4 1969-12-31 19:00:00.000000000 -0500 -@@ -1,858 +0,0 @@ --dnl aclocal.m4 generated automatically by aclocal 1.4-p6 -- --dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. --dnl This file is free software; the Free Software Foundation --dnl gives unlimited permission to copy and/or distribute it, --dnl with or without modifications, as long as this notice is preserved. -- --dnl This program is distributed in the hope that it will be useful, --dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without --dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A --dnl PARTICULAR PURPOSE. -- --# lib-prefix.m4 serial 3 (gettext-0.12.2) --dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. --dnl This file is free software, distributed under the terms of the GNU --dnl General Public License. As a special exception to the GNU General --dnl Public License, this file may be distributed as part of a program --dnl that contains a configuration script generated by Autoconf, under --dnl the same distribution terms as the rest of that program. -- --dnl From Bruno Haible. -- --dnl AC_LIB_ARG_WITH is synonymous to AC_ARG_WITH in autoconf-2.13, and --dnl similar to AC_ARG_WITH in autoconf 2.52...2.57 except that is doesn't --dnl require excessive bracketing. --ifdef([AC_HELP_STRING], --[AC_DEFUN([AC_LIB_ARG_WITH], [AC_ARG_WITH([$1],[[$2]],[$3],[$4])])], --[AC_DEFUN([AC_][LIB_ARG_WITH], [AC_ARG_WITH([$1],[$2],[$3],[$4])])]) -- --dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed --dnl to access previously installed libraries. The basic assumption is that --dnl a user will want packages to use other packages he previously installed --dnl with the same --prefix option. --dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate --dnl libraries, but is otherwise very convenient. --AC_DEFUN([AC_LIB_PREFIX], --[ -- AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) -- AC_REQUIRE([AC_PROG_CC]) -- AC_REQUIRE([AC_CANONICAL_HOST]) -- AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) -- dnl By default, look in $includedir and $libdir. -- use_additional=yes -- AC_LIB_WITH_FINAL_PREFIX([ -- eval additional_includedir=\"$includedir\" -- eval additional_libdir=\"$libdir\" -- ]) -- AC_LIB_ARG_WITH([lib-prefix], --[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib -- --without-lib-prefix don't search for libraries in includedir and libdir], --[ -- if test "X$withval" = "Xno"; then -- use_additional=no -- else -- if test "X$withval" = "X"; then -- AC_LIB_WITH_FINAL_PREFIX([ -- eval additional_includedir=\"$includedir\" -- eval additional_libdir=\"$libdir\" -- ]) -- else -- additional_includedir="$withval/include" -- additional_libdir="$withval/lib" -- fi -- fi --]) -- if test $use_additional = yes; then -- dnl Potentially add $additional_includedir to $CPPFLAGS. -- dnl But don't add it -- dnl 1. if it's the standard /usr/include, -- dnl 2. if it's already present in $CPPFLAGS, -- dnl 3. if it's /usr/local/include and we are using GCC on Linux, -- dnl 4. if it doesn't exist as a directory. -- if test "X$additional_includedir" != "X/usr/include"; then -- haveit= -- for x in $CPPFLAGS; do -- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -- if test "X$x" = "X-I$additional_includedir"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- if test "X$additional_includedir" = "X/usr/local/include"; then -- if test -n "$GCC"; then -- case $host_os in -- linux*) haveit=yes;; -- esac -- fi -- fi -- if test -z "$haveit"; then -- if test -d "$additional_includedir"; then -- dnl Really add $additional_includedir to $CPPFLAGS. -- CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" -- fi -- fi -- fi -- fi -- dnl Potentially add $additional_libdir to $LDFLAGS. -- dnl But don't add it -- dnl 1. if it's the standard /usr/lib, -- dnl 2. if it's already present in $LDFLAGS, -- dnl 3. if it's /usr/local/lib and we are using GCC on Linux, -- dnl 4. if it doesn't exist as a directory. -- if test "X$additional_libdir" != "X/usr/lib"; then -- haveit= -- for x in $LDFLAGS; do -- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -- if test "X$x" = "X-L$additional_libdir"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- if test "X$additional_libdir" = "X/usr/local/lib"; then -- if test -n "$GCC"; then -- case $host_os in -- linux*) haveit=yes;; -- esac -- fi -- fi -- if test -z "$haveit"; then -- if test -d "$additional_libdir"; then -- dnl Really add $additional_libdir to $LDFLAGS. -- LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" -- fi -- fi -- fi -- fi -- fi --]) -- --dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, --dnl acl_final_exec_prefix, containing the values to which $prefix and --dnl $exec_prefix will expand at the end of the configure script. --AC_DEFUN([AC_LIB_PREPARE_PREFIX], --[ -- dnl Unfortunately, prefix and exec_prefix get only finally determined -- dnl at the end of configure. -- if test "X$prefix" = "XNONE"; then -- acl_final_prefix="$ac_default_prefix" -- else -- acl_final_prefix="$prefix" -- fi -- if test "X$exec_prefix" = "XNONE"; then -- acl_final_exec_prefix='${prefix}' -- else -- acl_final_exec_prefix="$exec_prefix" -- fi -- acl_save_prefix="$prefix" -- prefix="$acl_final_prefix" -- eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" -- prefix="$acl_save_prefix" --]) -- --dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the --dnl variables prefix and exec_prefix bound to the values they will have --dnl at the end of the configure script. --AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], --[ -- acl_save_prefix="$prefix" -- prefix="$acl_final_prefix" -- acl_save_exec_prefix="$exec_prefix" -- exec_prefix="$acl_final_exec_prefix" -- $1 -- exec_prefix="$acl_save_exec_prefix" -- prefix="$acl_save_prefix" --]) -- --# lib-link.m4 serial 4 (gettext-0.12) --dnl Copyright (C) 2001-2003 Free Software Foundation, Inc. --dnl This file is free software, distributed under the terms of the GNU --dnl General Public License. As a special exception to the GNU General --dnl Public License, this file may be distributed as part of a program --dnl that contains a configuration script generated by Autoconf, under --dnl the same distribution terms as the rest of that program. -- --dnl From Bruno Haible. -- --dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and --dnl the libraries corresponding to explicit and implicit dependencies. --dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and --dnl augments the CPPFLAGS variable. --AC_DEFUN([AC_LIB_LINKFLAGS], --[ -- AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) -- AC_REQUIRE([AC_LIB_RPATH]) -- define([Name],[translit([$1],[./-], [___])]) -- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], -- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) -- AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ -- AC_LIB_LINKFLAGS_BODY([$1], [$2]) -- ac_cv_lib[]Name[]_libs="$LIB[]NAME" -- ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" -- ac_cv_lib[]Name[]_cppflags="$INC[]NAME" -- ]) -- LIB[]NAME="$ac_cv_lib[]Name[]_libs" -- LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" -- INC[]NAME="$ac_cv_lib[]Name[]_cppflags" -- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) -- AC_SUBST([LIB]NAME) -- AC_SUBST([LTLIB]NAME) -- dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the -- dnl results of this search when this library appears as a dependency. -- HAVE_LIB[]NAME=yes -- undefine([Name]) -- undefine([NAME]) --]) -- --dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) --dnl searches for libname and the libraries corresponding to explicit and --dnl implicit dependencies, together with the specified include files and --dnl the ability to compile and link the specified testcode. If found, it --dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and --dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and --dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs --dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. --AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], --[ -- AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) -- AC_REQUIRE([AC_LIB_RPATH]) -- define([Name],[translit([$1],[./-], [___])]) -- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], -- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) -- -- dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME -- dnl accordingly. -- AC_LIB_LINKFLAGS_BODY([$1], [$2]) -- -- dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, -- dnl because if the user has installed lib[]Name and not disabled its use -- dnl via --without-lib[]Name-prefix, he wants to use it. -- ac_save_CPPFLAGS="$CPPFLAGS" -- AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) -- -- AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ -- ac_save_LIBS="$LIBS" -- LIBS="$LIBS $LIB[]NAME" -- AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) -- LIBS="$ac_save_LIBS" -- ]) -- if test "$ac_cv_lib[]Name" = yes; then -- HAVE_LIB[]NAME=yes -- AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) -- AC_MSG_CHECKING([how to link with lib[]$1]) -- AC_MSG_RESULT([$LIB[]NAME]) -- else -- HAVE_LIB[]NAME=no -- dnl If $LIB[]NAME didn't lead to a usable library, we don't need -- dnl $INC[]NAME either. -- CPPFLAGS="$ac_save_CPPFLAGS" -- LIB[]NAME= -- LTLIB[]NAME= -- fi -- AC_SUBST([HAVE_LIB]NAME) -- AC_SUBST([LIB]NAME) -- AC_SUBST([LTLIB]NAME) -- undefine([Name]) -- undefine([NAME]) --]) -- --dnl Determine the platform dependent parameters needed to use rpath: --dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, --dnl hardcode_direct, hardcode_minus_L. --AC_DEFUN([AC_LIB_RPATH], --[ -- AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS -- AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld -- AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host -- AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir -- AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ -- CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ -- ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh -- . ./conftest.sh -- rm -f ./conftest.sh -- acl_cv_rpath=done -- ]) -- wl="$acl_cv_wl" -- libext="$acl_cv_libext" -- shlibext="$acl_cv_shlibext" -- hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" -- hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" -- hardcode_direct="$acl_cv_hardcode_direct" -- hardcode_minus_L="$acl_cv_hardcode_minus_L" -- dnl Determine whether the user wants rpath handling at all. -- AC_ARG_ENABLE(rpath, -- [ --disable-rpath do not hardcode runtime library paths], -- :, enable_rpath=yes) --]) -- --dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and --dnl the libraries corresponding to explicit and implicit dependencies. --dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. --AC_DEFUN([AC_LIB_LINKFLAGS_BODY], --[ -- define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], -- [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) -- dnl By default, look in $includedir and $libdir. -- use_additional=yes -- AC_LIB_WITH_FINAL_PREFIX([ -- eval additional_includedir=\"$includedir\" -- eval additional_libdir=\"$libdir\" -- ]) -- AC_LIB_ARG_WITH([lib$1-prefix], --[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib -- --without-lib$1-prefix don't search for lib$1 in includedir and libdir], --[ -- if test "X$withval" = "Xno"; then -- use_additional=no -- else -- if test "X$withval" = "X"; then -- AC_LIB_WITH_FINAL_PREFIX([ -- eval additional_includedir=\"$includedir\" -- eval additional_libdir=\"$libdir\" -- ]) -- else -- additional_includedir="$withval/include" -- additional_libdir="$withval/lib" -- fi -- fi --]) -- dnl Search the library and its dependencies in $additional_libdir and -- dnl $LDFLAGS. Using breadth-first-seach. -- LIB[]NAME= -- LTLIB[]NAME= -- INC[]NAME= -- rpathdirs= -- ltrpathdirs= -- names_already_handled= -- names_next_round='$1 $2' -- while test -n "$names_next_round"; do -- names_this_round="$names_next_round" -- names_next_round= -- for name in $names_this_round; do -- already_handled= -- for n in $names_already_handled; do -- if test "$n" = "$name"; then -- already_handled=yes -- break -- fi -- done -- if test -z "$already_handled"; then -- names_already_handled="$names_already_handled $name" -- dnl See if it was already located by an earlier AC_LIB_LINKFLAGS -- dnl or AC_LIB_HAVE_LINKFLAGS call. -- uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` -- eval value=\"\$HAVE_LIB$uppername\" -- if test -n "$value"; then -- if test "$value" = yes; then -- eval value=\"\$LIB$uppername\" -- test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" -- eval value=\"\$LTLIB$uppername\" -- test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" -- else -- dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined -- dnl that this library doesn't exist. So just drop it. -- : -- fi -- else -- dnl Search the library lib$name in $additional_libdir and $LDFLAGS -- dnl and the already constructed $LIBNAME/$LTLIBNAME. -- found_dir= -- found_la= -- found_so= -- found_a= -- if test $use_additional = yes; then -- if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then -- found_dir="$additional_libdir" -- found_so="$additional_libdir/lib$name.$shlibext" -- if test -f "$additional_libdir/lib$name.la"; then -- found_la="$additional_libdir/lib$name.la" -- fi -- else -- if test -f "$additional_libdir/lib$name.$libext"; then -- found_dir="$additional_libdir" -- found_a="$additional_libdir/lib$name.$libext" -- if test -f "$additional_libdir/lib$name.la"; then -- found_la="$additional_libdir/lib$name.la" -- fi -- fi -- fi -- fi -- if test "X$found_dir" = "X"; then -- for x in $LDFLAGS $LTLIB[]NAME; do -- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -- case "$x" in -- -L*) -- dir=`echo "X$x" | sed -e 's/^X-L//'` -- if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then -- found_dir="$dir" -- found_so="$dir/lib$name.$shlibext" -- if test -f "$dir/lib$name.la"; then -- found_la="$dir/lib$name.la" -- fi -- else -- if test -f "$dir/lib$name.$libext"; then -- found_dir="$dir" -- found_a="$dir/lib$name.$libext" -- if test -f "$dir/lib$name.la"; then -- found_la="$dir/lib$name.la" -- fi -- fi -- fi -- ;; -- esac -- if test "X$found_dir" != "X"; then -- break -- fi -- done -- fi -- if test "X$found_dir" != "X"; then -- dnl Found the library. -- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" -- if test "X$found_so" != "X"; then -- dnl Linking with a shared library. We attempt to hardcode its -- dnl directory into the executable's runpath, unless it's the -- dnl standard /usr/lib. -- if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then -- dnl No hardcoding is needed. -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" -- else -- dnl Use an explicit option to hardcode DIR into the resulting -- dnl binary. -- dnl Potentially add DIR to ltrpathdirs. -- dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. -- haveit= -- for x in $ltrpathdirs; do -- if test "X$x" = "X$found_dir"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- ltrpathdirs="$ltrpathdirs $found_dir" -- fi -- dnl The hardcoding into $LIBNAME is system dependent. -- if test "$hardcode_direct" = yes; then -- dnl Using DIR/libNAME.so during linking hardcodes DIR into the -- dnl resulting binary. -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" -- else -- if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then -- dnl Use an explicit option to hardcode DIR into the resulting -- dnl binary. -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" -- dnl Potentially add DIR to rpathdirs. -- dnl The rpathdirs will be appended to $LIBNAME at the end. -- haveit= -- for x in $rpathdirs; do -- if test "X$x" = "X$found_dir"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- rpathdirs="$rpathdirs $found_dir" -- fi -- else -- dnl Rely on "-L$found_dir". -- dnl But don't add it if it's already contained in the LDFLAGS -- dnl or the already constructed $LIBNAME -- haveit= -- for x in $LDFLAGS $LIB[]NAME; do -- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -- if test "X$x" = "X-L$found_dir"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" -- fi -- if test "$hardcode_minus_L" != no; then -- dnl FIXME: Not sure whether we should use -- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" -- dnl here. -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" -- else -- dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH -- dnl here, because this doesn't fit in flags passed to the -- dnl compiler. So give up. No hardcoding. This affects only -- dnl very old systems. -- dnl FIXME: Not sure whether we should use -- dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" -- dnl here. -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" -- fi -- fi -- fi -- fi -- else -- if test "X$found_a" != "X"; then -- dnl Linking with a static library. -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" -- else -- dnl We shouldn't come here, but anyway it's good to have a -- dnl fallback. -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" -- fi -- fi -- dnl Assume the include files are nearby. -- additional_includedir= -- case "$found_dir" in -- */lib | */lib/) -- basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` -- additional_includedir="$basedir/include" -- ;; -- esac -- if test "X$additional_includedir" != "X"; then -- dnl Potentially add $additional_includedir to $INCNAME. -- dnl But don't add it -- dnl 1. if it's the standard /usr/include, -- dnl 2. if it's /usr/local/include and we are using GCC on Linux, -- dnl 3. if it's already present in $CPPFLAGS or the already -- dnl constructed $INCNAME, -- dnl 4. if it doesn't exist as a directory. -- if test "X$additional_includedir" != "X/usr/include"; then -- haveit= -- if test "X$additional_includedir" = "X/usr/local/include"; then -- if test -n "$GCC"; then -- case $host_os in -- linux*) haveit=yes;; -- esac -- fi -- fi -- if test -z "$haveit"; then -- for x in $CPPFLAGS $INC[]NAME; do -- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -- if test "X$x" = "X-I$additional_includedir"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- if test -d "$additional_includedir"; then -- dnl Really add $additional_includedir to $INCNAME. -- INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" -- fi -- fi -- fi -- fi -- fi -- dnl Look for dependencies. -- if test -n "$found_la"; then -- dnl Read the .la file. It defines the variables -- dnl dlname, library_names, old_library, dependency_libs, current, -- dnl age, revision, installed, dlopen, dlpreopen, libdir. -- save_libdir="$libdir" -- case "$found_la" in -- */* | *\\*) . "$found_la" ;; -- *) . "./$found_la" ;; -- esac -- libdir="$save_libdir" -- dnl We use only dependency_libs. -- for dep in $dependency_libs; do -- case "$dep" in -- -L*) -- additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` -- dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. -- dnl But don't add it -- dnl 1. if it's the standard /usr/lib, -- dnl 2. if it's /usr/local/lib and we are using GCC on Linux, -- dnl 3. if it's already present in $LDFLAGS or the already -- dnl constructed $LIBNAME, -- dnl 4. if it doesn't exist as a directory. -- if test "X$additional_libdir" != "X/usr/lib"; then -- haveit= -- if test "X$additional_libdir" = "X/usr/local/lib"; then -- if test -n "$GCC"; then -- case $host_os in -- linux*) haveit=yes;; -- esac -- fi -- fi -- if test -z "$haveit"; then -- haveit= -- for x in $LDFLAGS $LIB[]NAME; do -- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -- if test "X$x" = "X-L$additional_libdir"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- if test -d "$additional_libdir"; then -- dnl Really add $additional_libdir to $LIBNAME. -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" -- fi -- fi -- haveit= -- for x in $LDFLAGS $LTLIB[]NAME; do -- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -- if test "X$x" = "X-L$additional_libdir"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- if test -d "$additional_libdir"; then -- dnl Really add $additional_libdir to $LTLIBNAME. -- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" -- fi -- fi -- fi -- fi -- ;; -- -R*) -- dir=`echo "X$dep" | sed -e 's/^X-R//'` -- if test "$enable_rpath" != no; then -- dnl Potentially add DIR to rpathdirs. -- dnl The rpathdirs will be appended to $LIBNAME at the end. -- haveit= -- for x in $rpathdirs; do -- if test "X$x" = "X$dir"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- rpathdirs="$rpathdirs $dir" -- fi -- dnl Potentially add DIR to ltrpathdirs. -- dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. -- haveit= -- for x in $ltrpathdirs; do -- if test "X$x" = "X$dir"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- ltrpathdirs="$ltrpathdirs $dir" -- fi -- fi -- ;; -- -l*) -- dnl Handle this in the next round. -- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` -- ;; -- *.la) -- dnl Handle this in the next round. Throw away the .la's -- dnl directory; it is already contained in a preceding -L -- dnl option. -- names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` -- ;; -- *) -- dnl Most likely an immediate library name. -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" -- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" -- ;; -- esac -- done -- fi -- else -- dnl Didn't find the library; assume it is in the system directories -- dnl known to the linker and runtime loader. (All the system -- dnl directories known to the linker should also be known to the -- dnl runtime loader, otherwise the system is severely misconfigured.) -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" -- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" -- fi -- fi -- fi -- done -- done -- if test "X$rpathdirs" != "X"; then -- if test -n "$hardcode_libdir_separator"; then -- dnl Weird platform: only the last -rpath option counts, the user must -- dnl pass all path elements in one option. We can arrange that for a -- dnl single library, but not when more than one $LIBNAMEs are used. -- alldirs= -- for found_dir in $rpathdirs; do -- alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" -- done -- dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. -- acl_save_libdir="$libdir" -- libdir="$alldirs" -- eval flag=\"$hardcode_libdir_flag_spec\" -- libdir="$acl_save_libdir" -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" -- else -- dnl The -rpath options are cumulative. -- for found_dir in $rpathdirs; do -- acl_save_libdir="$libdir" -- libdir="$found_dir" -- eval flag=\"$hardcode_libdir_flag_spec\" -- libdir="$acl_save_libdir" -- LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" -- done -- fi -- fi -- if test "X$ltrpathdirs" != "X"; then -- dnl When using libtool, the option that works for both libraries and -- dnl executables is -R. The -R options are cumulative. -- for found_dir in $ltrpathdirs; do -- LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" -- done -- fi --]) -- --dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, --dnl unless already present in VAR. --dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes --dnl contains two or three consecutive elements that belong together. --AC_DEFUN([AC_LIB_APPENDTOVAR], --[ -- for element in [$2]; do -- haveit= -- for x in $[$1]; do -- AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) -- if test "X$x" = "X$element"; then -- haveit=yes -- break -- fi -- done -- if test -z "$haveit"; then -- [$1]="${[$1]}${[$1]:+ }$element" -- fi -- done --]) -- --# lib-ld.m4 serial 2 (gettext-0.12) --dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. --dnl This file is free software, distributed under the terms of the GNU --dnl General Public License. As a special exception to the GNU General --dnl Public License, this file may be distributed as part of a program --dnl that contains a configuration script generated by Autoconf, under --dnl the same distribution terms as the rest of that program. -- --dnl Subroutines of libtool.m4, --dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision --dnl with libtool.m4. -- --dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. --AC_DEFUN([AC_LIB_PROG_LD_GNU], --[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, --[# I'd rather use --version here, but apparently some GNU ld's only accept -v. --if $LD -v 2>&1 &5; then -- acl_cv_prog_gnu_ld=yes --else -- acl_cv_prog_gnu_ld=no --fi]) --with_gnu_ld=$acl_cv_prog_gnu_ld --]) -- --dnl From libtool-1.4. Sets the variable LD. --AC_DEFUN([AC_LIB_PROG_LD], --[AC_ARG_WITH(gnu-ld, --[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], --test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) --AC_REQUIRE([AC_PROG_CC])dnl --AC_REQUIRE([AC_CANONICAL_HOST])dnl --# Prepare PATH_SEPARATOR. --# The user is always right. --if test "${PATH_SEPARATOR+set}" != set; then -- echo "#! /bin/sh" >conf$$.sh -- echo "exit 0" >>conf$$.sh -- chmod +x conf$$.sh -- if (PATH="/nonexistent;."; conf$$.sh) >/dev/null 2>&1; then -- PATH_SEPARATOR=';' -- else -- PATH_SEPARATOR=: -- fi -- rm -f conf$$.sh --fi --ac_prog=ld --if test "$GCC" = yes; then -- # Check if gcc -print-prog-name=ld gives a path. -- AC_MSG_CHECKING([for ld used by GCC]) -- case $host in -- *-*-mingw*) -- # gcc leaves a trailing carriage return which upsets mingw -- ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; -- *) -- ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; -- esac -- case $ac_prog in -- # Accept absolute paths. -- [[\\/]* | [A-Za-z]:[\\/]*)] -- [re_direlt='/[^/][^/]*/\.\./'] -- # Canonicalize the path of ld -- ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` -- while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do -- ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` -- done -- test -z "$LD" && LD="$ac_prog" -- ;; -- "") -- # If it fails, then pretend we aren't using GCC. -- ac_prog=ld -- ;; -- *) -- # If it is relative, then search for the first ld in PATH. -- with_gnu_ld=unknown -- ;; -- esac --elif test "$with_gnu_ld" = yes; then -- AC_MSG_CHECKING([for GNU ld]) --else -- AC_MSG_CHECKING([for non-GNU ld]) --fi --AC_CACHE_VAL(acl_cv_path_LD, --[if test -z "$LD"; then -- IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" -- for ac_dir in $PATH; do -- test -z "$ac_dir" && ac_dir=. -- if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then -- acl_cv_path_LD="$ac_dir/$ac_prog" -- # Check to see if the program is GNU ld. I'd rather use --version, -- # but apparently some GNU ld's only accept -v. -- # Break only if it was the GNU/non-GNU ld that we prefer. -- if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then -- test "$with_gnu_ld" != no && break -- else -- test "$with_gnu_ld" != yes && break -- fi -- fi -- done -- IFS="$ac_save_ifs" --else -- acl_cv_path_LD="$LD" # Let the user override the test with a path. --fi]) --LD="$acl_cv_path_LD" --if test -n "$LD"; then -- AC_MSG_RESULT($LD) --else -- AC_MSG_RESULT(no) --fi --test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) --AC_LIB_PROG_LD_GNU --]) -- --# isc-posix.m4 serial 2 (gettext-0.11.2) --dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. --dnl This file is free software, distributed under the terms of the GNU --dnl General Public License. As a special exception to the GNU General --dnl Public License, this file may be distributed as part of a program --dnl that contains a configuration script generated by Autoconf, under --dnl the same distribution terms as the rest of that program. -- --# This file is not needed with autoconf-2.53 and newer. Remove it in 2005. -- --# This test replaces the one in autoconf. --# Currently this macro should have the same name as the autoconf macro --# because gettext's gettext.m4 (distributed in the automake package) --# still uses it. Otherwise, the use in gettext.m4 makes autoheader --# give these diagnostics: --# configure.in:556: AC_TRY_COMPILE was called before AC_ISC_POSIX --# configure.in:556: AC_TRY_RUN was called before AC_ISC_POSIX -- --undefine([AC_ISC_POSIX]) -- --AC_DEFUN([AC_ISC_POSIX], -- [ -- dnl This test replaces the obsolescent AC_ISC_POSIX kludge. -- AC_CHECK_LIB(cposix, strerror, [LIBS="$LIBS -lcposix"]) -- ] --) -- diff --git a/uae/uae-0.8.23-20040129/uaerc b/uae/uae-0.8.23-20040129/uaerc deleted file mode 100644 index 7a21f286e4..0000000000 --- a/uae/uae-0.8.23-20040129/uaerc +++ /dev/null @@ -1,61 +0,0 @@ -config_description=UAE default configuration -32bit_blits=true -32bit_blits=true -x11.rom_path=./ -x11.floppy_path=./ -x11.hardfile_path=./ -x11.low_bandwidth=false -x11.use_mitshm=false -x11.hide_cursor=true -use_gui=yes -use_debugger=false -kickstart_rom_file=kick.rom -kickstart_ext_rom_file= -kickstart_key_file= -kickshifter=false -floppy0= -floppy1= -floppy2= -floppy3= -nr_floppies=4 -parallel_on_demand=false -serial_on_demand=false -sound_output=normal -sound_channels=mono -sound_bits=8 -sound_min_buff=1024 -sound_max_buff=1024 -sound_frequency=16000 -sound_interpol=none -sound_pri_time=0 -sound_pri_cutoff=0 -joyport0=mouse -joyport1=kbd2 -bsdsocket_emu=false -gfx_framerate=4 -gfx_width=640 -gfx_height=480 -gfx_lores=true -gfx_linemode=none -gfx_correct_aspect=false -gfx_fullscreen_amiga=false -gfx_fullscreen_picasso=false -gfx_center_horizontal=smart -gfx_center_vertical=smart -gfx_colour_mode=16bit -immediate_blits=true -ntsc=true -chipset=ocs -collision_level=sprites -fastmem_size=2 -a3000mem_size=0 -z3mem_size=0 -bogomem_size=0 -gfxcard_size=0 -chipmem_size=1 -cpu_speed=real -cpu_type=68000 -cpu_compatible=false -accuracy=2 -log_illegal_mem=false -kbd_lang=us -- cgit v1.2.3