[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[paragui-cvs] CVS: paragui/src/physfs aclocal.m4,1.1.2.3,1.1.2.4 config.
From: |
Teunis Peters <address@hidden> |
Subject: |
[paragui-cvs] CVS: paragui/src/physfs aclocal.m4,1.1.2.3,1.1.2.4 config.h.in,1.1.2.1,1.1.2.2 |
Date: |
Thu, 24 Oct 2002 12:08:15 -0400 |
Update of /cvsroot/paragui/paragui/src/physfs
In directory subversions:/tmp/cvs-serv4924/src/physfs
Modified Files:
Tag: devel-opengl
aclocal.m4 config.h.in
Log Message:
A number of updates - please review. Probably will remove some of these
features. Almost solved the OpenGL driver problems....
Index: aclocal.m4
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/Attic/aclocal.m4,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.4
diff -C2 -r1.1.2.3 -r1.1.2.4
*** aclocal.m4 8 Oct 2002 17:41:49 -0000 1.1.2.3
--- aclocal.m4 24 Oct 2002 16:08:13 -0000 1.1.2.4
***************
*** 1,162 ****
! # generated automatically by aclocal 1.7 -*- Autoconf -*-
! # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
! # Free Software Foundation, Inc.
! # This file is free software; the Free Software Foundation
! # gives unlimited permission to copy and/or distribute it,
! # with or without modifications, as long as this notice is preserved.
! # This program is distributed in the hope that it will be useful,
! # but WITHOUT ANY WARRANTY, to the extent permitted by law; without
! # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
! # PARTICULAR PURPOSE.
!
! # Like AC_CONFIG_HEADER, but automatically create stamp file. -*- Autoconf -*-
!
! # 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.
!
! # 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_PREREQ([2.52])
!
! # serial 6
!
! # AM_CONFIG_HEADER is obsolete. It has been replaced by AC_CONFIG_HEADERS.
! AU_DEFUN([AM_CONFIG_HEADER], [AC_CONFIG_HEADERS($@)])
!
! # 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 1996, 1997, 1998, 1999, 2000, 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 8
- # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
- # written in clear, in which case automake, when reading aclocal.m4,
- # will think it sees a *use*, and therefore will trigger all it's
- # C support machinery. Also note that it means that autoscan, seeing
- # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
-
-
- 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
!
! _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],
! [_am_stamp_count=`expr ${_am_stamp_count-0} + 1`
! echo "timestamp for $1" >`AS_DIRNAME([$1])`/stamp-h[]$_am_stamp_count])
# Copyright 2002 Free Software Foundation, Inc.
--- 1,70 ----
! 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.
!
! # Like AC_CONFIG_HEADER, but automatically create stamp file.
!
! AC_DEFUN([AM_CONFIG_HEADER],
! [AC_PREREQ([2.12])
! AC_CONFIG_HEADER([$1])
! dnl When config.status generates a header, we must update the stamp-h file.
! dnl This file resides in the same directory as the config header
! dnl that is generated. We must strip everything past the first ":",
! dnl and everything past the last "/".
! AC_OUTPUT_COMMANDS(changequote(<<,>>)dnl
! ifelse(patsubst(<<$1>>, <<[^ ]>>, <<>>), <<>>,
! <<test -z "<<$>>CONFIG_HEADERS" || echo timestamp > patsubst(<<$1>>,
<<^\([^:]*/\)?.*>>, <<\1>>)stamp-h<<>>dnl>>,
! <<am_indx=1
! for am_file in <<$1>>; do
! case " <<$>>CONFIG_HEADERS " in
! *" <<$>>am_file "*<<)>>
! echo timestamp > `echo <<$>>am_file | sed -e 's%:.*%%' -e
's%[^/]*$%%'`stamp-h$am_indx
! ;;
! esac
! am_indx=`expr "<<$>>am_indx" + 1`
! done<<>>dnl>>)
! changequote([,]))])
!
! # Do all the work for Automake. 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.
! # serial 1
! dnl Usage:
! dnl AM_INIT_AUTOMAKE(package,version, [no-define])
AC_DEFUN([AM_INIT_AUTOMAKE],
[AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl
! AC_REQUIRE([AC_PROG_INSTALL])
! PACKAGE=[$1]
! AC_SUBST(PACKAGE)
! VERSION=[$2]
! AC_SUBST(VERSION)
! 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
! ifelse([$3],,
! AC_DEFINE_UNQUOTED(PACKAGE, "$PACKAGE", [Name of package])
! AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Version number of package]))
! AC_REQUIRE([AM_SANITY_CHECK])
! AC_REQUIRE([AC_ARG_PROGRAM])
! dnl FIXME This is truly gross.
! missing_dir=`cd $ac_aux_dir && pwd`
! AM_MISSING_PROG(ACLOCAL, aclocal-${am__api_version}, $missing_dir)
! AM_MISSING_PROG(AUTOCONF, autoconf, $missing_dir)
! AM_MISSING_PROG(AUTOMAKE, automake-${am__api_version}, $missing_dir)
! AM_MISSING_PROG(AUTOHEADER, autoheader, $missing_dir)
! AM_MISSING_PROG(MAKEINFO, makeinfo, $missing_dir)
! AC_REQUIRE([AC_PROG_MAKE_SET])])
# Copyright 2002 Free Software Foundation, Inc.
***************
*** 180,184 ****
# 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"])
# AM_SET_CURRENT_AUTOMAKE_VERSION
--- 88,92 ----
# 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.4"])
# AM_SET_CURRENT_AUTOMAKE_VERSION
***************
*** 187,235 ****
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
! [AM_AUTOMAKE_VERSION([1.7])])
!
! # 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])])
#
--- 95,99 ----
# This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
! [AM_AUTOMAKE_VERSION([1.4-p6])])
#
***************
*** 237,266 ****
#
- # 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.
-
- # 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 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
--- 101,109 ----
#
AC_DEFUN([AM_SANITY_CHECK],
[AC_MSG_CHECKING([whether build environment is sane])
# Just in case
sleep 1
! echo timestamp > conftestfile
# 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
***************
*** 269,280 ****
# 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
--- 112,122 ----
# directory).
if (
! set X `ls -Lt $srcdir/configure conftestfile 2> /dev/null`
! if test "[$]*" = "X"; then
# -L didn't work.
! set X `ls -t $srcdir/configure conftestfile`
fi
! if test "[$]*" != "X $srcdir/configure conftestfile" \
! && test "[$]*" != "X conftestfile $srcdir/configure"; then
# If neither matched, then we have a broken ls. This can happen
***************
*** 286,290 ****
fi
! test "$[2]" = conftest.file
)
then
--- 128,132 ----
fi
! test "[$]2" = conftestfile
)
then
***************
*** 295,812 ****
Check your system clock])
fi
AC_MSG_RESULT(yes)])
! # -*- Autoconf -*-
!
!
! # Copyright 1997, 1999, 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.
!
! # 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 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_AUX_DIR_EXPAND
!
! # 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.
!
! # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
! # $ac_aux_dir to `$srcdir/foo'. In other projects, it is set to
! # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
! #
! # Of course, Automake must honor this variable whenever it calls a
! # tool from the auxiliary directory. The problem is that $srcdir (and
! # therefore $ac_aux_dir as well) can be either absolute or relative,
! # depending on how configure is run. This is pretty annoying, since
! # it makes $ac_aux_dir quite unusable in subdirectories: in the top
! # source directory, any form will work fine, but in subdirectories a
! # relative path needs to be adjusted first.
! #
! # $ac_aux_dir/missing
! # fails when called from a subdirectory if $ac_aux_dir is relative
! # $top_srcdir/$ac_aux_dir/missing
! # fails if $ac_aux_dir is absolute,
! # fails when called from a subdirectory in a VPATH build with
! # a relative $ac_aux_dir
! #
! # The reason of the latter failure is that $top_srcdir and $ac_aux_dir
! # are both prefixed by $srcdir. In an in-source build this is usually
! # harmless because $srcdir is `.', but things will broke when you
! # start a VPATH build or use an absolute $srcdir.
! #
! # So we could use something similar to $top_srcdir/$ac_aux_dir/missing,
! # iff we strip the leading $srcdir from $ac_aux_dir. That would be:
! # am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"`
! # and then we would define $MISSING as
! # MISSING="\${SHELL} $am_aux_dir/missing"
! # This will work as long as MISSING is not called from configure, because
! # unfortunately $(top_srcdir) has no meaning in configure.
! # However there are other variables, like CC, which are often used in
! # configure, and could therefore not use this "fixed" $ac_aux_dir.
! #
! # Another solution, used here, is to always expand $ac_aux_dir to an
! # 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], [
! # 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])])
!
! # serial 4 -*- Autoconf -*-
!
! # Copyright 1999, 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.
!
! # 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.
!
!
! # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
! # written in clear, in which case automake, when reading aclocal.m4,
! # will think it sees a *use*, and therefore will trigger all it's
! # C support machinery. Also note that it means that autoscan, seeing
! # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
!
!
!
! # _AM_DEPENDENCIES(NAME)
! # ----------------------
! # See how the compiler implements dependency checking.
! # NAME is "CC", "CXX", "GCJ", or "OBJC".
! # We try a few techniques and use that to set a single cache variable.
! #
! # We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was
! # modified to invoke _AM_DEPENDENCIES(CC); we would have a circular
! # dependency, and given that the user is not expected to run this macro,
! # just rely on AC_PROG_CC.
! AC_DEFUN([_AM_DEPENDENCIES],
! [AC_REQUIRE([AM_SET_DEPDIR])dnl
! AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl
! AC_REQUIRE([AM_MAKE_INCLUDE])dnl
! AC_REQUIRE([AM_DEP_TRACK])dnl
!
! ifelse([$1], CC, [depcc="$CC" am_compiler_list=],
! [$1], CXX, [depcc="$CXX" am_compiler_list=],
! [$1], OBJC, [depcc="$OBJC" am_compiler_list='gcc3 gcc'],
! [$1], GCJ, [depcc="$GCJ" am_compiler_list='gcc3 gcc'],
! [depcc="$$1" am_compiler_list=])
!
! AC_CACHE_CHECK([dependency style of $depcc],
! [am_cv_$1_dependencies_compiler_type],
! [if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
! # We make a subdir and do the tests there. Otherwise we can end up
! # making bogus files that we don't know about and never remove. For
! # instance it was reported that on HP-UX the gcc test will end up
! # making a dummy file named `D' -- because `-MD' means `put the output
! # in D'.
! mkdir conftest.dir
! # Copy depcomp to subdir because otherwise we won't find it if we're
! # using a relative directory.
! cp "$am_depcomp" conftest.dir
! cd conftest.dir
!
! am_cv_$1_dependencies_compiler_type=none
! if test "$am_compiler_list" = ""; then
! am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp`
! fi
! for depmode in $am_compiler_list; do
! # We need to recreate these files for each test, as the compiler may
! # overwrite some of them when testing with obscure command lines.
! # This happens at least with the AIX C compiler.
! echo '#include "conftest.h"' > conftest.c
! echo 'int i;' > conftest.h
! echo "${am__include} ${am__quote}conftest.Po${am__quote}" > confmf
!
! case $depmode in
! nosideeffect)
! # after this tag, mechanisms are not by side-effect, so they'll
! # only be used when explicitly requested
! if test "x$enable_dependency_tracking" = xyes; then
! continue
! else
! break
! fi
! ;;
! none) break ;;
! esac
! # We check with `-c' and `-o' for the sake of the "dashmstdout"
! # mode. It turns out that the SunPro C++ compiler does not properly
! # handle `-M -o', and we need to detect this.
! if depmode=$depmode \
! source=conftest.c object=conftest.o \
! depfile=conftest.Po tmpdepfile=conftest.TPo \
! $SHELL ./depcomp $depcc -c conftest.c -o conftest.o >/dev/null 2>&1 &&
! grep conftest.h conftest.Po > /dev/null 2>&1 &&
! ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
! am_cv_$1_dependencies_compiler_type=$depmode
! break
! fi
! done
!
! cd ..
! rm -rf conftest.dir
! else
! am_cv_$1_dependencies_compiler_type=none
! fi
! ])
! AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type])
! AM_CONDITIONAL([am__fastdep$1], [
! test "x$enable_dependency_tracking" != xno \
! && test "$am_cv_$1_dependencies_compiler_type" = gcc3])
! ])
!
!
! # AM_SET_DEPDIR
! # -------------
! # Choose a directory name for dependency files.
! # This macro is AC_REQUIREd in _AM_DEPENDENCIES
! AC_DEFUN([AM_SET_DEPDIR],
! [rm -f .deps 2>/dev/null
! mkdir .deps 2>/dev/null
! if test -d .deps; then
! DEPDIR=.deps
! else
! # MS-DOS does not allow filenames that begin with a dot.
! DEPDIR=_deps
! fi
! rmdir .deps 2>/dev/null
! AC_SUBST([DEPDIR])
! ])
!
!
! # AM_DEP_TRACK
! # ------------
! 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])
! if test "x$enable_dependency_tracking" != xno; then
! am_depcomp="$ac_aux_dir/depcomp"
! AMDEPBACKSLASH='\'
! fi
! AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
! AC_SUBST([AMDEPBACKSLASH])
! ])
!
! # Generate code to set up dependency tracking. -*- Autoconf -*-
!
! # Copyright 1999, 2000, 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_OUTPUT_DEPENDENCY_COMMANDS
! # ------------------------------
! AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS],
! [for mf in $CONFIG_FILES; do
! # Strip MF so we end up with the name of the file.
! mf=`echo "$mf" | sed -e 's/:.*$//'`
! # Check whether this is an Automake generated Makefile or not.
! # We used to match only the files named `Makefile.in', but
! # some people rename them; so instead we look at the file content.
! # Grep'ing the first line is not enough: some people post-process
! # each Makefile.in and add a new line on top of each file to say so.
! # So let's grep whole file.
! if grep '^#.*generated by automake' $mf > /dev/null 2>&1; then
! dirpart=`AS_DIRNAME("$mf")`
! else
! continue
! fi
! grep '^DEP_FILES *= *[[^ @%:@]]' < "$mf" > /dev/null || continue
! # Extract the definition of DEP_FILES from the Makefile without
! # running `make'.
! DEPDIR=`sed -n -e '/^DEPDIR = / s///p' < "$mf"`
! test -z "$DEPDIR" && continue
! # When using ansi2knr, U may be empty or an underscore; expand it
! U=`sed -n -e '/^U = / s///p' < "$mf"`
! test -d "$dirpart/$DEPDIR" || mkdir "$dirpart/$DEPDIR"
! # We invoke sed twice because it is the simplest approach to
! # changing $(DEPDIR) to its actual value in the expansion.
! for file in `sed -n -e '
! /^DEP_FILES = .*\\\\$/ {
! s/^DEP_FILES = //
! :loop
! s/\\\\$//
! p
! n
! /\\\\$/ b loop
! p
! }
! /^DEP_FILES = / s/^DEP_FILES = //p' < "$mf" | \
! sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g' -e 's/\$U/'"$U"'/g'`; do
! # Make sure the directory exists.
! test -f "$dirpart/$file" && continue
! fdir=`AS_DIRNAME(["$file"])`
! AS_MKDIR_P([$dirpart/$fdir])
! # echo "creating $dirpart/$file"
! echo '# dummy' > "$dirpart/$file"
! done
! done
! ])# _AM_OUTPUT_DEPENDENCY_COMMANDS
!
!
! # AM_OUTPUT_DEPENDENCY_COMMANDS
! # -----------------------------
! # This macro should only be invoked once -- use via AC_REQUIRE.
! #
! # This code is only required when automatic dependency tracking
! # is enabled. FIXME. This creates each `.P' file that we will
! # need in order to bootstrap the dependency handling code.
! AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS],
! [AC_CONFIG_COMMANDS([depfiles],
! [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS],
! [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"])
! ])
!
! # Check to see how 'make' treats includes. -*- Autoconf -*-
!
! # Copyright (C) 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_MAKE_INCLUDE()
! # -----------------
! # Check to see how make treats includes.
! AC_DEFUN([AM_MAKE_INCLUDE],
! [am_make=${MAKE-make}
! cat > confinc << 'END'
! doit:
! @echo done
! END
! # If we don't find an include directive, just comment out the code.
! AC_MSG_CHECKING([for style of include used by $am_make])
! am__include="#"
! am__quote=
! _am_result=none
! # First try GNU make style include.
! echo "include confinc" > confmf
! # We grep out `Entering directory' and `Leaving directory'
! # messages which can occur if `w' ends up in MAKEFLAGS.
! # In particular we don't look at `^make:' because GNU make might
! # be invoked under some other name (usually "gmake"), in which
! # case it prints its new name instead of `make'.
! if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" =
"done"; then
! am__include=include
! am__quote=
! _am_result=GNU
! fi
! # Now try BSD make style include.
! if test "$am__include" = "#"; then
! echo '.include "confinc"' > confmf
! if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
! am__include=.include
! am__quote="\""
! _am_result=BSD
! fi
! fi
! AC_SUBST(am__include)
! AC_SUBST(am__quote)
! AC_MSG_RESULT($_am_result)
! rm -f confinc confmf
! ])
!
! # AM_CONDITIONAL -*- Autoconf -*-
!
! # Copyright 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.
!
! # 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 5
!
! AC_PREREQ(2.52)
!
! # 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='#'
! else
! $1_TRUE='#'
! $1_FALSE=
! 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])])
# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
--- 137,158 ----
Check your system clock])
fi
+ rm -f conftest*
AC_MSG_RESULT(yes)])
! dnl AM_MISSING_PROG(NAME, PROGRAM, DIRECTORY)
! dnl The program must properly implement --version.
AC_DEFUN([AM_MISSING_PROG],
! [AC_MSG_CHECKING(for working $2)
! # Run test in a subshell; some versions of sh will print an error if
! # an executable is not found, even if stderr is redirected.
! # Redirect stdin to placate older versions of autoconf. Sigh.
! if ($2 --version) < /dev/null > /dev/null 2>&1; then
! $1=$2
! AC_MSG_RESULT(found)
else
! $1="$3/missing $2"
! AC_MSG_RESULT(missing)
fi
! AC_SUBST($1)])
# libtool.m4 - Configure libtool for the host system. -*-Shell-script-*-
***************
*** 4419,4421 ****
--- 3765,3780 ----
AC_MSG_RESULT([$SED])
])
+
+ # Define a conditional.
+
+ AC_DEFUN([AM_CONDITIONAL],
+ [AC_SUBST($1_TRUE)
+ AC_SUBST($1_FALSE)
+ if $2; then
+ $1_TRUE=
+ $1_FALSE='#'
+ else
+ $1_TRUE='#'
+ $1_FALSE=
+ fi])
Index: config.h.in
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/Attic/config.h.in,v
retrieving revision 1.1.2.1
retrieving revision 1.1.2.2
diff -C2 -r1.1.2.1 -r1.1.2.2
*** config.h.in 31 Aug 2002 04:01:23 -0000 1.1.2.1
--- config.h.in 24 Oct 2002 16:08:13 -0000 1.1.2.2
***************
*** 1,87 ****
! /* config.h.in. Generated from configure.in by autoheader. */
!
! #undef DEBUG
! #undef DEBUG_CHATTER
! #undef NDEBUG
! #undef PHYSFS_SUPPORTS_ZIP
! #undef PHYSFS_SUPPORTS_GRP
! #undef PHYSFS_HAVE_READLINE
! #undef PHYSFS_HAVE_LLSEEK
! /* define if debug build is enabled */
! #undef DEBUG
! /* define if debug chatter is enabled */
! #undef DEBUG_CHATTER
! /* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
! /* Define to 1 if you have the <inttypes.h> header file. */
! #undef HAVE_INTTYPES_H
!
! /* Define to 1 if you have the <memory.h> header file. */
! #undef HAVE_MEMORY_H
!
! /* Define to 1 if you have the `memset' function. */
! #undef HAVE_MEMSET
!
! /* Define to 1 if you have the <stdint.h> header file. */
! #undef HAVE_STDINT_H
!
! /* Define to 1 if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
! /* Define to 1 if you have the <strings.h> header file. */
! #undef HAVE_STRINGS_H
!
! /* Define to 1 if you have the <string.h> header file. */
#undef HAVE_STRING_H
! /* Define to 1 if you have the `strrchr' function. */
! #undef HAVE_STRRCHR
! /* Define to 1 if you have the <sys/stat.h> header file. */
! #undef HAVE_SYS_STAT_H
! /* Define to 1 if you have the <sys/types.h> header file. */
! #undef HAVE_SYS_TYPES_H
! /* Define to 1 if you have the <unistd.h> header file. */
! #undef HAVE_UNISTD_H
/* define if debug build is disabled */
#undef NDEBUG
! /* Name of package */
! #undef PACKAGE
!
! /* Define to the address where bug reports for this package should be sent. */
! #undef PACKAGE_BUGREPORT
!
! /* Define to the full name of this package. */
! #undef PACKAGE_NAME
!
! /* Define to the full name and version of this package. */
! #undef PACKAGE_STRING
! /* Define to the one symbol short name of this package. */
! #undef PACKAGE_TARNAME
! /* Define to the version of this package. */
! #undef PACKAGE_VERSION
/* define if we have llseek */
#undef PHYSFS_HAVE_LLSEEK
/* define if we have mntent.h */
#undef PHYSFS_HAVE_MNTENT_H
! /* define if we have readline */
! #undef PHYSFS_HAVE_READLINE
! /* define if we have sys/ucred.h */
! #undef PHYSFS_HAVE_SYS_UCRED_H
/* define desired natural language */
--- 1,72 ----
! /* config.h.in. Generated automatically from configure.in by autoheader
2.13. */
+ /* Define if you have the ANSI C header files. */
+ #undef STDC_HEADERS
! /* Define if you have the memset function. */
! #undef HAVE_MEMSET
! /* Define if you have the strrchr function. */
! #undef HAVE_STRRCHR
! /* Define if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H
! /* Define if you have the <stdlib.h> header file. */
#undef HAVE_STDLIB_H
! /* Define if you have the <string.h> header file. */
#undef HAVE_STRING_H
! /* Name of package */
! #undef PACKAGE
! /* Version number of package */
! #undef VERSION
! /* define if debug build is enabled */
! #undef DEBUG
! /* define if debug chatter is enabled */
! #undef DEBUG_CHATTER
/* define if debug build is disabled */
#undef NDEBUG
! /* define if zip support is enabled */
! #undef PHYSFS_SUPPORTS_ZIP
! /* define if grp support is enabled */
! #undef PHYSFS_SUPPORTS_GRP
! /* define if we have readline */
! #undef PHYSFS_HAVE_READLINE
/* define if we have llseek */
#undef PHYSFS_HAVE_LLSEEK
+ /* define if we have sys/ucred.h */
+ #undef PHYSFS_HAVE_SYS_UCRED_H
+
/* define if we have mntent.h */
#undef PHYSFS_HAVE_MNTENT_H
! /* define desired natural language */
! #undef PHYSFS_LANG
! /* define desired natural language */
! #undef PHYSFS_LANG
!
! /* define desired natural language */
! #undef PHYSFS_LANG
!
! /* define desired natural language */
! #undef PHYSFS_LANG
!
! /* define desired natural language */
! #undef PHYSFS_LANG
!
! /* define desired natural language */
! #undef PHYSFS_LANG
/* define desired natural language */
***************
*** 94,106 ****
#undef PHYSFS_NO_PTHREADS_SUPPORT
- /* define if grp support is enabled */
- #undef PHYSFS_SUPPORTS_GRP
-
- /* define if zip support is enabled */
- #undef PHYSFS_SUPPORTS_ZIP
-
- /* Define to 1 if you have the ANSI C header files. */
- #undef STDC_HEADERS
-
- /* Version number of package */
- #undef VERSION
--- 79,80 ----
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [paragui-cvs] CVS: paragui/src/physfs aclocal.m4,1.1.2.3,1.1.2.4 config.h.in,1.1.2.1,1.1.2.2,
Teunis Peters <address@hidden> <=
- Prev by Date:
[paragui-cvs] CVS: paragui/src/draw draw.cpp,1.1.2.7,1.1.2.8 drawable.cpp,1.1.2.5,1.1.2.6 drawtile.cpp,1.3.2.4,1.3.2.5
- Next by Date:
[paragui-cvs] CVS: paragui/test animation.cpp,1.2.2.4,1.2.2.5 dblbuffer.cpp,1.4.2.5,1.4.2.6 gltest.cpp,1.1.2.5,1.1.2.6 windowresize.cpp,1.1.2.2,1.1.2.3
- Previous by thread:
[paragui-cvs] CVS: paragui/src/draw draw.cpp,1.1.2.7,1.1.2.8 drawable.cpp,1.1.2.5,1.1.2.6 drawtile.cpp,1.3.2.4,1.3.2.5
- Next by thread:
[paragui-cvs] CVS: paragui/test animation.cpp,1.2.2.4,1.2.2.5 dblbuffer.cpp,1.4.2.5,1.4.2.6 gltest.cpp,1.1.2.5,1.1.2.6 windowresize.cpp,1.1.2.2,1.1.2.3
- Index(es):