changeset 46:858cb0e04ae5

cleanup.
author Robert McIntyre <rlm@mit.edu>
date Thu, 21 Mar 2013 17:48:45 +0000
parents 6803cb8a6ebf
children 3907aac7df1c
files configure.ac
diffstat 1 files changed, 11 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
     1.1 --- a/configure.ac	Thu Mar 21 17:21:54 2013 +0000
     1.2 +++ b/configure.ac	Thu Mar 21 17:48:45 2013 +0000
     1.3 @@ -1,13 +1,13 @@
     1.4  AC_PREREQ([2.68])
     1.5  
     1.6 -AC_INIT([vba-rlm], [1.0])
     1.7 +AC_INIT([VisualBoyAdvance], [1.7.2])
     1.8  
     1.9  AC_CONFIG_AUX_DIR([build-aux])
    1.10  
    1.11  AM_INIT_AUTOMAKE([foreign dist-bzip2])
    1.12  
    1.13 -dnl TODO: change this to gba.cpp or something
    1.14 -AC_CONFIG_SRCDIR([src/lua/lopcodes.c])
    1.15 +AC_CONFIG_SRCDIR([src/gb/GB.cpp])
    1.16 +
    1.17  AC_CONFIG_HEADERS([config.h])
    1.18  
    1.19  # Checks for programs.
    1.20 @@ -23,25 +23,24 @@
    1.21  # Checks for libraries.
    1.22  AC_CHECK_LIB(z, gzopen,
    1.23    , AC_MSG_ERROR([*** Cannot compile without zlib.]))
    1.24 +
    1.25  AC_CHECK_LIB(png, png_create_write_struct,
    1.26 -  , AC_MSG_ERROR([*** Cannot compile without libpng.]), [-lz])
    1.27 +  , AC_MSG_ERROR([*** Cannot compile without libpng.]))
    1.28  
    1.29  SDL_VERSION=1.2.2
    1.30  AM_PATH_SDL($SDL_VERSION, :,
    1.31              AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]))
    1.32 +
    1.33  AC_CHECK_LIB([SDL], [SDL_Init])
    1.34  
    1.35  AC_CHECK_LIB([pthread], [pthread_create])
    1.36  
    1.37 -
    1.38 -
    1.39  # Checks for header files.
    1.40  AC_FUNC_ALLOCA
    1.41  
    1.42  AC_CHECK_HEADERS([arpa/inet.h limits.h locale.h malloc.h netdb.h \
    1.43 -			      netinet/in.h stddef.h stdint.h stdlib.h \
    1.44 -			      string.h strings.h sys/socket.h unistd.h \
    1.45 -			      libintl.h])
    1.46 +	          netinet/in.h stddef.h stdint.h stdlib.h string.h \
    1.47 +	          strings.h sys/socket.h unistd.h libintl.h])
    1.48  
    1.49  # Checks for typedefs, structures, and compiler characteristics.
    1.50  AC_HEADER_STDBOOL
    1.51 @@ -66,9 +65,9 @@
    1.52  AC_FUNC_STRCOLL
    1.53  
    1.54  AC_CHECK_FUNCS([floor ftruncate gethostbyname gethostname inet_ntoa \
    1.55 -		      localeconv memchr memset modf pow setlocale \
    1.56 -		      socket sqrt strcasecmp strchr strcspn strdup \
    1.57 -		      strerror strpbrk strrchr strstr strtoul])
    1.58 +		localeconv memchr memset modf pow setlocale  socket \
    1.59 +		sqrt strcasecmp strchr strcspn strdup strerror \
    1.60 +		strpbrk strrchr strstr strtoul])
    1.61  
    1.62  AC_CONFIG_FILES([Makefile 
    1.63  	         src/Makefile