From 5b02e5942da42b438d0474dc5a1f12f877297360 Mon Sep 17 00:00:00 2001 From: Nick Gasson Date: Sun, 1 Aug 2010 11:18:28 +0100 Subject: [PATCH] Add configure checks suggested by autoscan --- .gitignore | 2 ++ config.h.in | 9 ++++++--- configure.ac | 13 ++++++++++--- 3 files changed, 18 insertions(+), 6 deletions(-) diff --git a/.gitignore b/.gitignore index 4f07a1a..81c9ea3 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,5 @@ depcomp install-sh missing po/*.gmo +autoscan.log +configure.scan diff --git a/config.h.in b/config.h.in index 4c88b6d..cd8dbd7 100644 --- a/config.h.in +++ b/config.h.in @@ -59,9 +59,6 @@ /* Define to 1 if you have the `setlocale' function. */ #undef HAVE_SETLOCALE -/* Define to 1 if you have the `sqrt' function. */ -#undef HAVE_SQRT - /* Define to 1 if `stat' has the bug that it succeeds when given the zero-length file name argument. */ #undef HAVE_STAT_EMPTY_STRING_BUG @@ -78,12 +75,18 @@ /* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H +/* Define to 1 if you have the `strdup' function. */ +#undef HAVE_STRDUP + /* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H /* Define to 1 if you have the header file. */ #undef HAVE_STRING_H +/* Define to 1 if you have the `strrchr' function. */ +#undef HAVE_STRRCHR + /* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H diff --git a/configure.ac b/configure.ac index d3268a2..295a809 100644 --- a/configure.ac +++ b/configure.ac @@ -2,9 +2,14 @@ AC_INIT([Lunar Lander], [0.6.1], [Nick Gasson ], [lander]) AM_INIT_AUTOMAKE([-Wall -Werror]) + AC_PROG_CC +AC_PROG_AWK AC_PROG_CXX AC_PROG_LN_S +AC_PROG_INSTALL +AC_PROG_CPP +AC_PROG_MKDIR_P AM_GNU_GETTEXT([external]) AM_GNU_GETTEXT_VERSION @@ -24,7 +29,9 @@ AC_TYPE_UINT32_T # Checks for library functions. AC_FUNC_MALLOC AC_FUNC_STAT -AC_CHECK_FUNCS([atexit memset pow setlocale sqrt]) +AC_CHECK_FUNCS([atexit memset pow setlocale strdup strrchr]) + +AC_CHECK_HEADERS([libintl.h unistd.h]) dnl Check for Boost AX_BOOST_BASE(1.33) @@ -44,10 +51,10 @@ AC_CHECK_LIB(SDL_image, IMG_Load, [], dnl Check for SDL_Mixer AC_CHECK_LIB(SDL_mixer, Mix_OpenAudio, [], AC_MSG_ERROR([*** SDL_mixer not found!])) - - + dnl Check for Freetype and libpng PKG_CHECK_MODULES(LANDER, freetype2 libpng) + AC_CONFIG_HEADERS([config.h]) AC_CONFIG_FILES([Makefile data/Makefile src/Makefile po/Makefile.in]) -- 2.39.2