Changeset 159

Show
Ignore:
Timestamp:
06/06/07 12:00:20 (2 years ago)
Author:
takkaria
Message:

#145: move m4/ contents into acinclude.m4, re-run autoconf and such.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/aclocal.m4

    r78 r159  
    1 # generated automatically by aclocal 1.10 -*- Autoconf -*- 
     1# generated automatically by aclocal 1.9.6 -*- Autoconf -*- 
    22 
    33# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 
    4 # 2005, 2006  Free Software Foundation, Inc. 
     4# 2005  Free Software Foundation, Inc. 
    55# This file is free software; the Free Software Foundation 
    66# gives unlimited permission to copy and/or distribute it, 
    …… 
    1212# PARTICULAR PURPOSE. 
    1313 
    14 m4_include([m4/acinclude.m4]) 
    15 m4_include([m4/pkg.m4]) 
    16 m4_include([m4/sdl.m4]) 
    17 m4_include([m4/stdint_h.m4]) 
     14m4_include([acinclude.m4]) 

  • trunk/autogen.sh

    r75 r159  
    4747cd $TOP_DIR 
    4848 
    49 run_or_die $ACLOCAL -I m4 
     49run_or_die $ACLOCAL 
    5050run_or_die $AUTOHEADER 
    5151run_or_die $AUTOCONF 

  • trunk/configure.ac

    r141 r159  
    197197dnl Check for types. 
    198198AC_TYPE_SIGNAL 
    199 AC_TYPE_INT16_T 
    200 AC_TYPE_INT32_T 
    201 AC_TYPE_UINT16_T 
    202 AC_TYPE_UINT32_T 
    203199 
    204200dnl Check for structs. 

  • trunk/src/autoconf.h.in

    r136 r159  
    108108#undef RETSIGTYPE 
    109109 
     110/* Disabled SDL_mixer sound support */ 
     111#undef SDL_SOUND 
     112 
    110113/* Define to the type of arg 1 for `select'. */ 
    111114#undef SELECT_TYPE_ARG1