From b54aa71f3a024ffd7ecc040b76b2738c05d25cb6 Mon Sep 17 00:00:00 2001 From: Jason Woofenden Date: Mon, 22 Jun 2009 15:31:21 -0400 Subject: [PATCH 1/1] gnu autoconf docs say input should be named configure.ac --- .gitignore | 5 +++++ configure.ac | 41 +++++++++++++++++++++++++++++++++++++++++ configure.in | 41 ----------------------------------------- 3 files changed, 46 insertions(+), 41 deletions(-) create mode 100644 configure.ac delete mode 100644 configure.in diff --git a/.gitignore b/.gitignore index 84971a6..3fe8d7d 100644 --- a/.gitignore +++ b/.gitignore @@ -10,3 +10,8 @@ data/life.png data/font.png tags log +config.h +configure +config.status +config.log +autom4te.cache diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..1804a30 --- /dev/null +++ b/configure.ac @@ -0,0 +1,41 @@ +# -*- Autoconf -*- +# Process this file with autoconf to produce a configure script. + +AC_PREREQ([2.63]) +AC_INIT(VoR, 0.5.4, jason@jasonwoof.com, vor) +AC_CONFIG_SRCDIR([config.h.in]) +AC_CONFIG_HEADERS([config.h]) + +# Checks for programs. +AC_PROG_CC +AC_PROG_INSTALL +AC_PROG_MAKE_SET + +# Checks for libraries. +AC_CHECK_LIB([SDL_image], [IMG_LoadPNG_RW]) +AC_CHECK_LIB([SDL_mixer], [Mix_OpenAudio]) + +SDL_VERSION=1.2.0 +AM_PATH_SDL($SDL_VERSION, + :, + AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) +) + +# Checks for header files. +AC_CHECK_HEADERS([inttypes.h stddef.h stdlib.h string.h unistd.h]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_HEADER_STDBOOL +AC_C_INLINE +AC_TYPE_INT8_T +AC_TYPE_SIZE_T +AC_TYPE_UINT16_T +AC_TYPE_UINT32_T +AC_TYPE_UINT8_T + +# Checks for library functions. +AC_FUNC_MALLOC +AC_CHECK_FUNCS([atexit memset sqrt strdup]) + +AC_CONFIG_FILES([Makefile]) +AC_OUTPUT diff --git a/configure.in b/configure.in deleted file mode 100644 index 1804a30..0000000 --- a/configure.in +++ /dev/null @@ -1,41 +0,0 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. - -AC_PREREQ([2.63]) -AC_INIT(VoR, 0.5.4, jason@jasonwoof.com, vor) -AC_CONFIG_SRCDIR([config.h.in]) -AC_CONFIG_HEADERS([config.h]) - -# Checks for programs. -AC_PROG_CC -AC_PROG_INSTALL -AC_PROG_MAKE_SET - -# Checks for libraries. -AC_CHECK_LIB([SDL_image], [IMG_LoadPNG_RW]) -AC_CHECK_LIB([SDL_mixer], [Mix_OpenAudio]) - -SDL_VERSION=1.2.0 -AM_PATH_SDL($SDL_VERSION, - :, - AC_MSG_ERROR([*** SDL version $SDL_VERSION not found!]) -) - -# Checks for header files. -AC_CHECK_HEADERS([inttypes.h stddef.h stdlib.h string.h unistd.h]) - -# Checks for typedefs, structures, and compiler characteristics. -AC_HEADER_STDBOOL -AC_C_INLINE -AC_TYPE_INT8_T -AC_TYPE_SIZE_T -AC_TYPE_UINT16_T -AC_TYPE_UINT32_T -AC_TYPE_UINT8_T - -# Checks for library functions. -AC_FUNC_MALLOC -AC_CHECK_FUNCS([atexit memset sqrt strdup]) - -AC_CONFIG_FILES([Makefile]) -AC_OUTPUT -- 1.7.10.4