From 5656743cc64450bb9473db21ea632fbe090b5587 Mon Sep 17 00:00:00 2001 From: mdw Date: Sun, 3 Feb 2002 19:15:15 +0000 Subject: [PATCH] Add SDL-finding equipment. Quote some macro names which need it. Add long-overdue macros for expanding configured paths (and do it properly). --- aclocal.glob | 264 +++++++++++++++++++++++++++++++++++++++++++++++++++++++---- 1 file changed, 246 insertions(+), 18 deletions(-) diff --git a/aclocal.glob b/aclocal.glob index 3041b42..a04a9a6 100644 --- a/aclocal.glob +++ b/aclocal.glob @@ -1,6 +1,6 @@ dnl -*-fundamental-*- *@--GLOB-HEADER--@* dnl -dnl $Id: aclocal.glob,v 1.13 2001/02/23 09:07:24 mdw Exp $ +dnl $Id: aclocal.glob,v 1.14 2002/02/03 19:15:15 mdw Exp $ dnl dnl Common library of autoconf macros dnl @@ -28,6 +28,11 @@ dnl Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. dnl----- Revision history --------------------------------------------------- dnl dnl $Log: aclocal.glob,v $ +dnl Revision 1.14 2002/02/03 19:15:15 mdw +dnl Add SDL-finding equipment. Quote some macro names which need it. Add +dnl long-overdue macros for expanding configured paths (and do it +dnl properly). +dnl dnl Revision 1.13 2001/02/23 09:07:24 mdw dnl Restore temporary variable on exit. dnl @@ -71,7 +76,7 @@ dnl dnl----- Common files distribution --------------------------- *@--NOTICE--@* dnl -dnl $Id: aclocal.glob,v 1.13 2001/02/23 09:07:24 mdw Exp $ +dnl $Id: aclocal.glob,v 1.14 2002/02/03 19:15:15 mdw Exp $ dnl --- *@-AM_PROG_CC_STDC-@* --- dnl @@ -828,6 +833,187 @@ main () rm -f conf.gtktest ]) +dnl --- *@-AM_PATH_SDL-@* --- +dnl +dnl Author: Sam Langinga +dnl +dnl Synopsis: AM_PATH_SDL([VERSION, [IF-FOUND, [IF-NOT-FOUND]]]) +dnl +dnl Arguments: VERSION = minimum required version +dnl IF-FOUND = what to do if found +dnl IF-NOT-FOUND = what to do if not found +dnl +dnl Use: Test for SDL, and define SDL_CFLAGS and SDL_LIBS + +# Configure paths for SDL +# Sam Lantinga 9/21/99 +# stolen from Manish Singh +# stolen back from Frank Belew +# stolen from Manish Singh +# Shamelessly stolen from Owen Taylor + +dnl AM_PATH_SDL([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND]]]) +dnl Test for SDL, and define SDL_CFLAGS and SDL_LIBS +dnl +AC_DEFUN(AM_PATH_SDL, +[dnl +dnl Get the cflags and libraries from the sdl-config script +dnl +AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)], + sdl_prefix="$withval", sdl_prefix="") +AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)], + sdl_exec_prefix="$withval", sdl_exec_prefix="") +AC_ARG_ENABLE(sdltest, [ --disable-sdltest Do not try to compile and run a test SDL program], + , enable_sdltest=yes) + + if test x$sdl_exec_prefix != x ; then + sdl_args="$sdl_args --exec-prefix=$sdl_exec_prefix" + if test x${SDL_CONFIG+set} != xset ; then + SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config + fi + fi + if test x$sdl_prefix != x ; then + sdl_args="$sdl_args --prefix=$sdl_prefix" + if test x${SDL_CONFIG+set} != xset ; then + SDL_CONFIG=$sdl_prefix/bin/sdl-config + fi + fi + + AC_PATH_PROG(SDL_CONFIG, sdl-config, no) + min_sdl_version=ifelse([$1], ,0.11.0,$1) + AC_MSG_CHECKING(for SDL - version >= $min_sdl_version) + no_sdl="" + if test "$SDL_CONFIG" = "no" ; then + no_sdl=yes + else + SDL_CFLAGS=`$SDL_CONFIG $sdlconf_args --cflags` + SDL_LIBS=`$SDL_CONFIG $sdlconf_args --libs` + + sdl_major_version=`$SDL_CONFIG $sdl_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` + sdl_minor_version=`$SDL_CONFIG $sdl_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` + sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \ + sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` + if test "x$enable_sdltest" = "xyes" ; then + ac_save_CFLAGS="$CFLAGS" + ac_save_LIBS="$LIBS" + CFLAGS="$CFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" +dnl +dnl Now check if the installed SDL is sufficiently new. (Also sanity +dnl checks the results of sdl-config to some extent +dnl + rm -f conf.sdltest + AC_TRY_RUN([ +#include +#include +#include +#include "SDL.h" + +char* +my_strdup (char *str) +{ + char *new_str; + + if (str) + { + new_str = (char *)malloc ((strlen (str) + 1) * sizeof(char)); + strcpy (new_str, str); + } + else + new_str = NULL; + + return new_str; +} + +int main (int argc, char *argv[]) +{ + int major, minor, micro; + char *tmp_version; + + /* This hangs on some systems (?) + system ("touch conf.sdltest"); + */ + { FILE *fp = fopen("conf.sdltest", "a"); if ( fp ) fclose(fp); } + + /* HP/UX 9 (%@#!) writes to sscanf strings */ + tmp_version = my_strdup("$min_sdl_version"); + if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) { + printf("%s, bad version string\n", "$min_sdl_version"); + exit(1); + } + + if (($sdl_major_version > major) || + (($sdl_major_version == major) && ($sdl_minor_version > minor)) || + (($sdl_major_version == major) && ($sdl_minor_version == minor) && ($sdl_micro_version >= micro))) + { + return 0; + } + else + { + printf("\n*** 'sdl-config --version' returned %d.%d.%d, but the minimum version\n", $sdl_major_version, $sdl_minor_version, $sdl_micro_version); + printf("*** of SDL required is %d.%d.%d. If sdl-config is correct, then it is\n", major, minor, micro); + printf("*** best to upgrade to the required version.\n"); + printf("*** If sdl-config was wrong, set the environment variable SDL_CONFIG\n"); + printf("*** to point to the correct copy of sdl-config, and remove the file\n"); + printf("*** config.cache before re-running configure\n"); + return 1; + } +} + +],, no_sdl=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + if test "x$no_sdl" = x ; then + AC_MSG_RESULT(yes) + ifelse([$2], , :, [$2]) + else + AC_MSG_RESULT(no) + if test "$SDL_CONFIG" = "no" ; then + echo "*** The sdl-config script installed by SDL could not be found" + echo "*** If SDL was installed in PREFIX, make sure PREFIX/bin is in" + echo "*** your path, or set the SDL_CONFIG environment variable to the" + echo "*** full path to sdl-config." + else + if test -f conf.sdltest ; then + : + else + echo "*** Could not run SDL test program, checking why..." + CFLAGS="$CFLAGS $SDL_CFLAGS" + LIBS="$LIBS $SDL_LIBS" + AC_TRY_LINK([ +#include +#include "SDL.h" +], [ return 0; ], + [ echo "*** The test program compiled, but did not run. This usually means" + echo "*** that the run-time linker is not finding SDL or finding the wrong" + echo "*** version of SDL. If it is not finding SDL, you'll need to set your" + echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" + echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** is required on your system" + echo "***" + echo "*** If you have an old version installed, it is best to remove it, although" + echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"], + [ echo "*** The test program failed to compile or link. See the file config.log for the" + echo "*** exact error that occured. This usually means SDL was incorrectly installed" + echo "*** or that you have moved SDL since it was installed. In the latter case, you" + echo "*** may want to edit the sdl-config script: $SDL_CONFIG" ]) + CFLAGS="$ac_save_CFLAGS" + LIBS="$ac_save_LIBS" + fi + fi + SDL_CFLAGS="" + SDL_LIBS="" + ifelse([$3], , :, [$3]) + fi + AC_SUBST(SDL_CFLAGS) + AC_SUBST(SDL_LIBS) + rm -f conf.sdltest +]) + dnl --- *@-AC_TYPE_PTRDIFF_T-@* --- dnl dnl Author: Ulrich Drepper @@ -1042,7 +1228,7 @@ dnl ARGS = arguments to pass dnl dnl Use: Like `AC_REQUIRE', only it handles arguments. -AC_DEFUN(mdw_REQUIRE, +AC_DEFUN([mdw_REQUIRE], [ifdef([AC_PROVIDE_$1], , [AC_DIVERT_PUSH(builtin(eval, AC_DIVERSION_CURRENT - 1))dnl indir($@) @@ -1066,7 +1252,7 @@ dnl and the appropriate preprocessor symbol is defined. dnl Finally, a check is made for the function `wresize' using dnl AC_CHECK_FUNCS. -AC_DEFUN(mdw_CURSES, +AC_DEFUN([mdw_CURSES], [mdw_CHECK_MANYLIBS(newwin, ncurses curses, AC_DEFINE(HAVE_CURSES)) if test $mdw_cv_lib_newwin != no; then AC_CHECK_HEADERS([ncurses.h ncurses/ncurses.h curses.h], [break]) @@ -1090,7 +1276,7 @@ dnl dnl Use: Checks whether the Posix type `ssize_t' is defined. If not, dnl it defaults to `int'. -AC_DEFUN(mdw_TYPE_SSIZE_T, +AC_DEFUN([mdw_TYPE_SSIZE_T], [AC_REQUIRE([AC_HEADER_STDC]) AC_CACHE_CHECK(for ssize_t, mdw_cv_ssize_t, [AC_EGREP_CPP(ssize_t, @@ -1119,7 +1305,7 @@ dnl Use: Searches for a declaration of the global `environ' variable. dnl If one is found in one of the `usual' places, DECL_ENVIRON dnl is defined as a preprocessor symbol. -AC_DEFUN(mdw_DECL_ENVIRON, +AC_DEFUN([mdw_DECL_ENVIRON], [AC_CACHE_CHECK([for declaration of \`environ'], mdw_cv_environ, [AC_EGREP_CPP(environ, [#include @@ -1157,7 +1343,7 @@ dnl This is particularly handy under DIREIX: if you link with dnl `-lnsl' then you get non-NIS-aware versions of getpwnam and dnl so on, which is clearly a Bad Thing. -AC_DEFUN(mdw_CHECK_MANYLIBS, +AC_DEFUN([mdw_CHECK_MANYLIBS], [AC_CACHE_CHECK([for library containing $1], [mdw_cv_lib_$1], [mdw_save_LIBS="$LIBS" mdw_cv_lib_$1="no" @@ -1181,7 +1367,7 @@ dnl dnl AC_DEFUN relies on `[', `]' being quotes, so I have to drop down a level. changequote(<<, >>) -define(mdw__PERL_VERSION, <<$1 -e 'exit ($] < $2);' >&5 2>&5>>) +define([mdw__PERL_VERSION], <<$1 -e 'exit ($] < $2);' >&5 2>&5>>) changequote([, ]) dnl --- *@-mdw_PROG_PERL-@* --- @@ -1204,7 +1390,7 @@ dnl put into the `PERL' environment variable; `AC_SUBST' is used dnl to substitute its value into Perl scripts. If there is no dnl Perl to be found, the value of `PERL' is set to be `none'. -AC_DEFUN(mdw_PROG_PERL, +AC_DEFUN([mdw_PROG_PERL], [AC_ARG_WITH([perl], [ --with-perl=PERL specify path to Perl version $1 or newer], [PERL="$withval"], @@ -1244,7 +1430,7 @@ dnl Use: Verifies that the Perl interpreter in the `PERL' shell dnl variable actually works and is of the right version. If it's dnl not, an error is raised and configuration is aborted. -AC_DEFUN(mdw_CHECK_PERL, +AC_DEFUN([mdw_CHECK_PERL], [mdw_REQUIRE([mdw_PROG_PERL], [$1]) AC_MSG_CHECKING([whether Perl ($PERL) works]) if test "$PERL" != "none" && mdw__PERL_VERSION("$PERL", $1); then @@ -1276,12 +1462,12 @@ dnl dnl This macro isn't terribly useful in the general case. It dnl Also implicitly assumes that `$PERL' is Perl 5 or later. -AC_DEFUN(mdw__PERLLIB_INIT, +AC_DEFUN([mdw__PERLLIB_INIT], [AC_SUBST(INC_PERLLIBS)dnl AC_SUBST(NEEDED_PERLLIBS)dnl ]) -AC_DEFUN(mdw_PERLLIB_CHECK, +AC_DEFUN([mdw_PERLLIB_CHECK], [AC_REQUIRE([mdw__PERLLIB_INIT]) mdw_REQUIRE([mdw_CHECK_PERL], 5) AC_CACHE_CHECK([for Perl library $1], mdw_cv_perllib_$1, @@ -1321,7 +1507,7 @@ dnl `-fhandle-exceptions'). dnl dnl Use: If the C compiler is GCC, add the compiler flags. -AC_DEFUN(mdw_GCC_FLAGS, +AC_DEFUN([mdw_GCC_FLAGS], [if test "$GCC" = "yes"; then CFLAGS="$CFLAGS ifelse([$1], [], [-pedantic -Wall], [$1])" CFLAGS="$CFLAGS ifelse([$2], [], [], [$2])" @@ -1470,7 +1656,7 @@ dnl dnl Use: Turns on the `NDEBUG' flag, to disable useful things like dnl assertions. -AC_DEFUN(mdw_OPT_NDEBUG, +AC_DEFUN([mdw_OPT_NDEBUG], [AC_ARG_ENABLE(debugging, [ --disable-debugging spews vast swathes of useless information], [if test "$enableval" = "no"; then @@ -1487,7 +1673,7 @@ dnl Arguments: --- dnl dnl Use: Links with the Electric Fence library. -AC_DEFUN(mdw_OPT_EFENCE, +AC_DEFUN([mdw_OPT_EFENCE], [AC_ARG_WITH(electric-fence, [ --with-electric-fence link programs with Electric Fence], [if test "$withval" = "yes"; then @@ -1505,7 +1691,7 @@ dnl dnl Use: Turns on the `NTRACE' flag, to disable useful things like dnl trace outputs. -AC_DEFUN(mdw_OPT_TRACE, +AC_DEFUN([mdw_OPT_TRACE], [AC_ARG_ENABLE(tracing, [ --disable-tracing disable output of trace information], [if test "$enableval" = "no"; then @@ -1532,7 +1718,7 @@ dnl propagated properly. This is an obsolete feature from the dnl days when mLib was provided as a subdirectory of other dnl packages. -AC_DEFUN(mdw_OPT_mLib_TRACK, +AC_DEFUN([mdw_OPT_mLib_TRACK], [AC_REQUIRE([mdw_OPT_TRACE]) AC_ARG_ENABLE(track, [ --enable-track enable tracking of malloc and free], @@ -1552,8 +1738,50 @@ dnl Arguments: PROGRAM = name of this program or package. dnl dnl Use: Provides all of the above debugging options. -AC_DEFUN(mdw_OPT_mLib_DEBUG, +AC_DEFUN([mdw_OPT_mLib_DEBUG], [mdw_REQUIRE([mdw_OPT_NDEBUG]) mdw_REQUIRE([mdw_OPT_mLib_TRACK], [$1])]) +dnl --- *@-mdw_DEFINE_PATHS-@* +dnl +dnl Author: Mark Wooding +dnl +dnl Synopsys: mdw_DEFINE_FILES(CODE) +dnl +dnl Arguments: CODE = shell script code to execute +dnl +dnl Use: Fixes up various variables so that pathname defines can be +dnl defined. Within CODE, you may use the following macros: +dnl +dnl mdw_PROG(NAME) Transformed program name +dnl +dnl mdw_PATH(PATH) Expanded path (may contain variables) +dnl +dnl mdw_DEFINE_PROG(SYMBOL, PROG) +dnl Define a symbol as a transformed +dnl program name. +dnl +dnl mdw_DEFINE_PATH(SYMBOL, NAME) +dnl Define a symbol as an expanded path + +AC_DEFUN([mdw_DEFINE_PATHS], +[mdw_prefix=$prefix mdw_exec_prefix=$exec_prefix +mdw_transform=`echo "$program_transform_name"|sed 's,\\\\\\\\,\\\\,g; s,\\$\\$,$,g'` +test "$prefix" = "NONE" && prefix=$ac_default_prefix +test "$exec_prefix" = "NONE" && exec_prefix=$prefix +$1 +prefix=$mdw_prefix exec_prefix=$mdw_exec_prefix]) + +AC_DEFUN([mdw_PROG], [`echo "$1"|sed "$mdw_transform"`]) +AC_DEFUN([mdw_PATH], [dnl +`t="$1"; dnl +while :; do dnl +case "$t" in dnl +*\\$[]*) t=\`eval echo "$t"\`;; dnl +*) break;; dnl +esac; done; dnl +echo "$t"`]) +AC_DEFUN([mdw_DEFINE_PROG], [AC_DEFINE_UNQUOTED([$1], ["mdw_PROG([$2])"])]) +AC_DEFUN([mdw_DEFINE_PATH], [AC_DEFINE_UNQUOTED([$1], ["mdw_PATH([$2])"])]) + dnl----- That's all, folks --------------------------------- *@--GLOB-END--@* -- 2.11.0