[paragui-cvs] CVS: paragui/src/physfs aclocal.m4,1.1.2.2,1.1.2.3

[Teunis Peters <address@hidden>]

Update of /cvsroot/paragui/paragui/src/physfs
In directory subversions:/tmp/cvs-serv10434/src/physfs

Modified Files:
      Tag: devel-opengl
        aclocal.m4 
Log Message:
Fixed crash-on-exit bug


Index: aclocal.m4
===================================================================
RCS file: /cvsroot/paragui/paragui/src/physfs/Attic/aclocal.m4,v
retrieving revision 1.1.2.2
retrieving revision 1.1.2.3
diff -C2 -r1.1.2.2 -r1.1.2.3
*** aclocal.m4  7 Oct 2002 22:23:26 -0000       1.1.2.2
--- aclocal.m4  8 Oct 2002 17:41:49 -0000       1.1.2.3
***************
*** 1,5 ****
! # aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*-
  
! # Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002
  # Free Software Foundation, Inc.
  # This file is free software; the Free Software Foundation
--- 1,5 ----
! # 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
***************
*** 35,92 ****
  # serial 6
  
! # 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.  We must strip everything past the first ":",
! # and everything past the last "/".
! 
! # _AM_DIRNAME(PATH)
! # -----------------
! # Like AS_DIRNAME, only do it during macro expansion
! AC_DEFUN([_AM_DIRNAME],
!        [m4_if(regexp([$1], [^.*[^/]//*[^/][^/]*/*$]), -1,
!             m4_if(regexp([$1], [^//\([^/]\|$\)]), -1,
!                   m4_if(regexp([$1], [^/.*]), -1,
!                         [.],
!                         patsubst([$1], [^\(/\).*], [\1])),
!                   patsubst([$1], [^\(//\)\([^/].*\|$\)], [\1])),
!             patsubst([$1], [^\(.*[^/]\)//*[^/][^/]*/*$], [\1]))[]dnl
! ])# _AM_DIRNAME
! 
! 
! # The stamp files are numbered to have different names.
! # We could number them on a directory basis, but that's additional
! # complications, let's have a unique counter.
! m4_define([_AM_STAMP_Count], [0])
! 
! 
! # _AM_STAMP(HEADER)
! # -----------------
! # The name of the stamp file for HEADER.
! AC_DEFUN([_AM_STAMP],
! [m4_define([_AM_STAMP_Count], m4_incr(_AM_STAMP_Count))dnl
! AS_ESCAPE(_AM_DIRNAME(patsubst([$1],
!                                [:.*])))/stamp-h[]_AM_STAMP_Count])
! 
! 
! # _AM_CONFIG_HEADER(HEADER[:SOURCES], COMMANDS, INIT-COMMANDS)
! # ------------------------------------------------------------
! # We used to try to get a real timestamp in stamp-h.  But the fear is that
! # that will cause unnecessary cvs conflicts.
! AC_DEFUN([_AM_CONFIG_HEADER],
! [# Add the stamp file to the list of files AC keeps track of,
! # along with our hook.
! AC_CONFIG_HEADERS([$1],
!                   [# update the timestamp
! echo 'timestamp for $1' >"_AM_STAMP([$1])"
! $2],
!                   [$3])
! ])# _AM_CONFIG_HEADER
! 
! 
! # AM_CONFIG_HEADER(HEADER[:SOURCES]..., COMMANDS, INIT-COMMANDS)
! # --------------------------------------------------------------
! AC_DEFUN([AM_CONFIG_HEADER],
! [AC_FOREACH([_AM_File], [$1], [_AM_CONFIG_HEADER(_AM_File, [$2], [$3])])
! ])# AM_CONFIG_HEADER
  
  # Do all the work for Automake.                            -*- Autoconf -*-
--- 35,40 ----
  # 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 -*-
***************
*** 122,126 ****
  
  
! AC_PREREQ([2.52])
  
  # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
--- 70,74 ----
  
  
! AC_PREREQ([2.54])
  
  # Autoconf 2.50 wants to disallow AM_ names.  We explicitly allow
***************
*** 148,151 ****
--- 96,109 ----
  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.
***************
*** 179,193 ****
  
  _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
  ])
  ])
  
  # Copyright 2002  Free Software Foundation, Inc.
  
--- 137,163 ----
  
  _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.
  
***************
*** 210,214 ****
  # 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.6"])
  
  # AM_SET_CURRENT_AUTOMAKE_VERSION
--- 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
***************
*** 217,221 ****
  # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
!        [AM_AUTOMAKE_VERSION([1.6.3])])
  
  # Helper functions for option handling.                    -*- Autoconf -*-
--- 187,191 ----
  # 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 -*-
***************
*** 612,615 ****
--- 582,588 ----
  ])
  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])
  ])
  
***************
*** 731,735 ****
  ])
  
! # Copyright 2001 Free Software Foundation, Inc.             -*- Autoconf -*-
  
  # This program is free software; you can redistribute it and/or modify
--- 704,710 ----
  ])
  
! # 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
***************
*** 771,775 ****
  # 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 | fgrep -v 'ing directory'`" = 
"done"; then
     am__include=include
     am__quote=
--- 746,750 ----
  # 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=
***************
*** 831,835 ****
  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])])
--- 806,810 ----
  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])])