Changeset 84

Show
Ignore:
Timestamp:
04/26/07 19:25:49 (1 year ago)
Author:
takkaria
Message:
  • Add support for systems which don't have proper checking for ?int*_t types.
  • Check for the SDL_ttf header.
Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/configure.ac

    r78 r84  
    138138if test "$enable_sdl" = "yes"; then 
    139139        AM_PATH_SDL(1.2.0,,) 
     140        AC_CHECK_HEADERS([SDL/SDL_ttf.h]) 
    140141        if test "$SDL_CONFIG" = "no"; then 
    141142                with_sdl=no 

  • trunk/m4/stdint_h.m4

    r78 r84  
    2525  fi 
    2626]) 
    27 # stdint_h.m4 serial 6 
    28 dnl Copyright (C) 1997-2004, 2006 Free Software Foundation, Inc. 
    29 dnl This file is free software; the Free Software Foundation 
    30 dnl gives unlimited permission to copy and/or distribute it, 
    31 dnl with or without modifications, as long as this notice is preserved. 
    3227 
    33 dnl From Paul Eggert. 
     28AC_CACHE_CHECK(for int16_t, gl_cv_type_int16_t, 
     29    [AC_TRY_COMPILE( 
     30         [#include <stdint.h>], 
     31         [int16_t s;], 
     32         [gl_cv_type_int16_t=yes], 
     33         [gl_cv_type_int16_t=no] 
     34     ) 
     35    ] 
     36) 
     37AC_CACHE_CHECK(for uint16_t, gl_cv_type_uint16_t, 
     38    [AC_TRY_COMPILE( 
     39         [#include <stdint.h>], 
     40         [uint16_t s;], 
     41         [gl_cv_type_uint16_t=yes], 
     42         [gl_cv_type_uint16_t=no] 
     43     ) 
     44    ] 
     45) 
     46AC_CACHE_CHECK(for int32_t, gl_cv_type_int32_t, 
     47    [AC_TRY_COMPILE( 
     48         [#include <stdint.h>], 
     49         [int32_t s;], 
     50         [gl_cv_type_int32_t=yes], 
     51         [gl_cv_type_int32_t=no] 
     52     ) 
     53    ] 
     54) 
     55AC_CACHE_CHECK(for uint32_t_t, gl_cv_type_uint32_t, 
     56    [AC_TRY_COMPILE( 
     57         [#include <stdint.h>], 
     58         [uint32_t s;], 
     59         [gl_cv_type_uint32_t=yes], 
     60         [gl_cv_type_uint32_t=no] 
     61     ) 
     62    ] 
     63) 
    3464 
    35 # Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists, 
    36 # doesn't clash with <sys/types.h>, and declares uintmax_t. 
    37  
    38 AC_DEFUN([gl_AC_HEADER_STDINT_H], 
    39 [ 
    40   AC_CACHE_CHECK([for stdint.h], gl_cv_header_stdint_h, 
    41   [AC_TRY_COMPILE( 
    42     [#include <sys/types.h> 
    43 #include <stdint.h>], 
    44     [uintmax_t i = (uintmax_t) -1; return !i;], 
    45     gl_cv_header_stdint_h=yes, 
    46     gl_cv_header_stdint_h=no)]) 
    47   if test $gl_cv_header_stdint_h = yes; then 
    48     AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, 
    49       [Define if <stdint.h> exists, doesn't clash with <sys/types.h>, 
    50        and declares uintmax_t. ]) 
    51   fi 
    52 ]) 
    53 # stdint_h.m4 serial 3 (gettext-0.12) 
    54 dnl Copyright (C) 1997-2003 Free Software Foundation, Inc. 
    55 dnl This file is free software, distributed under the terms of the GNU 
    56 dnl General Public License.  As a special exception to the GNU General 
    57 dnl Public License, this file may be distributed as part of a program 
    58 dnl that contains a configuration script generated by Autoconf, under 
    59 dnl the same distribution terms as the rest of that program. 
    60  
    61 dnl From Paul Eggert. 
    62  
    63 # Define HAVE_STDINT_H_WITH_UINTMAX if <stdint.h> exists, 
    64 # doesn't clash with <sys/types.h>, and declares uintmax_t. 
    65  
    66 AC_DEFUN([jm_AC_HEADER_STDINT_H], 
    67 [ 
    68   AC_CACHE_CHECK([for stdint.h], jm_ac_cv_header_stdint_h, 
    69   [AC_TRY_COMPILE( 
    70     [#include <sys/types.h> 
    71 #include <stdint.h>], 
    72     [uintmax_t i = (uintmax_t) -1;], 
    73     jm_ac_cv_header_stdint_h=yes, 
    74     jm_ac_cv_header_stdint_h=no)]) 
    75   if test $jm_ac_cv_header_stdint_h = yes; then 
    76     AC_DEFINE_UNQUOTED(HAVE_STDINT_H_WITH_UINTMAX, 1, 
    77       [Define if <stdint.h> exists, doesn't clash with <sys/types.h>, 
    78        and declares uintmax_t. ]) 
    79   fi 
    80 ])