[Enigma-cvs] enigma aclocal.m4,1.7,1.8

[Johannes Fortmann <address@hidden>]

Update of /cvsroot/enigma/enigma
In directory subversions:/tmp/cvs-serv14797

Modified Files:
        aclocal.m4 
Log Message:
Endian fixes to PNG save code (please test on little-endian)
PNG saving moved to Surface::save_surface


Index: aclocal.m4
===================================================================
RCS file: /cvsroot/enigma/enigma/aclocal.m4,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** aclocal.m4  20 Oct 2003 08:05:44 -0000      1.7
--- aclocal.m4  19 Nov 2003 16:22:35 -0000      1.8
***************
*** 1,3 ****
! # generated automatically by aclocal 1.7.7 -*- Autoconf -*-
  
  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
--- 1,3 ----
! # generated automatically by aclocal 1.7.4 -*- Autoconf -*-
  
  # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002
***************
*** 180,184 ****
  # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
!        [AM_AUTOMAKE_VERSION([1.7.7])])
  
  # Helper functions for option handling.                    -*- Autoconf -*-
--- 180,184 ----
  # This function is AC_REQUIREd by AC_INIT_AUTOMAKE.
  AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
!        [AM_AUTOMAKE_VERSION([1.7.4])])
  
  # Helper functions for option handling.                    -*- Autoconf -*-
***************
*** 562,572 ****
    cp "$am_depcomp" conftest.dir
    cd conftest.dir
-   # We will build objects and dependencies in a subdirectory because
-   # it helps to detect inapplicable dependency modes.  For instance
-   # both Tru64's cc and ICC support -MD to output dependencies as a
-   # side effect of compilation, but ICC will put the dependencies in
-   # the current directory while Tru64 will put them in the object
-   # directory.
-   mkdir sub
  
    am_cv_$1_dependencies_compiler_type=none
--- 562,565 ----
***************
*** 575,591 ****
    fi
    for depmode in $am_compiler_list; do
-     # Setup a source with many dependencies, because some compilers
-     # like to wrap large dependency lists on column 80 (with \), and
-     # we should not choose a depcomp mode which is confused by this.
-     #
      # 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.
!     : > sub/conftest.c
!     for i in 1 2 3 4 5 6; do
!       echo '#include "conftst'$i'.h"' >> sub/conftest.c
!       : > sub/conftst$i.h
!     done
!     echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
      case $depmode in
--- 568,577 ----
    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
***************
*** 605,614 ****
      # handle `-M -o', and we need to detect this.
      if depmode=$depmode \
!        source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
!        depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
!        $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
           >/dev/null 2>conftest.err &&
!        grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
!        grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
--- 591,599 ----
      # 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 -o conftest.o conftest.c \
           >/dev/null 2>conftest.err &&
!        grep conftest.h conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
***************
*** 745,749 ****
  # Check to see how 'make' treats includes.    -*- Autoconf -*-
  
! # Copyright (C) 2001, 2002, 2003 Free Software Foundation, Inc.
  
  # This program is free software; you can redistribute it and/or modify
--- 730,734 ----
  # 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
***************
*** 770,776 ****
  [am_make=${MAKE-make}
  cat > confinc << 'END'
! am__doit:
        @echo done
- .PHONY: am__doit
  END
  # If we don't find an include directive, just comment out the code.
--- 755,760 ----
  [am_make=${MAKE-make}
  cat > confinc << 'END'
! doit:
        @echo done
  END
  # If we don't find an include directive, just comment out the code.
***************
*** 800,806 ****
     fi
  fi
! AC_SUBST([am__include])
! AC_SUBST([am__quote])
! AC_MSG_RESULT([$_am_result])
  rm -f confinc confmf
  ])
--- 784,790 ----
     fi
  fi
! AC_SUBST(am__include)
! AC_SUBST(am__quote)
! AC_MSG_RESULT($_am_result)
  rm -f confinc confmf
  ])
***************
*** 911,915 ****
  
    AC_REQUIRE([AC_CANONICAL_TARGET])
!   AC_PATH_PROG(SDL_CONFIG, sdl-config, no)
    min_sdl_version=ifelse([$1], ,0.11.0,$1)
    AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
--- 895,900 ----
  
    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)