We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Replaces SDL_CONFIG with SDL2_CONFIG in sdl2.m4 to allow AM_PATH_SDL2 to work with AM_PATH_SDL independently

sdl2_m4.diff (text/plain), 4.12 KB, created by Edgar Simo on 2013-07-16 16:58:46 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Edgar Simo

Created: 2013-07-16 16:58:46 UTC

Size: 4.12 KB

patch

obsolete

>diff -r 1aee27b573d8 sdl2.m4
>--- a/sdl2.m4	Sun Jul 14 15:55:34 2013 -0700
>+++ b/sdl2.m4	Tue Jul 16 15:57:01 2013 -0500
>@@ -31,42 +31,42 @@
>     sdl_pc=no
>     if test x$sdl_exec_prefix != x ; then
>       sdl_config_args="$sdl_config_args --exec-prefix=$sdl_exec_prefix"
>-      if test x${SDL_CONFIG+set} != xset ; then
>-        SDL_CONFIG=$sdl_exec_prefix/bin/sdl2-config
>+      if test x${SDL2_CONFIG+set} != xset ; then
>+        SDL2_CONFIG=$sdl_exec_prefix/bin/sdl2-config
>       fi
>     fi
>     if test x$sdl_prefix != x ; then
>       sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
>-      if test x${SDL_CONFIG+set} != xset ; then
>-        SDL_CONFIG=$sdl_prefix/bin/sdl2-config
>+      if test x${SDL2_CONFIG+set} != xset ; then
>+        SDL2_CONFIG=$sdl_prefix/bin/sdl2-config
>       fi
>     fi
>   fi
> 
>   if test "x$sdl_pc" = xyes ; then
>     no_sdl=""
>-    SDL_CONFIG="pkg-config sdl2"
>+    SDL2_CONFIG="pkg-config sdl2"
>   else
>     as_save_PATH="$PATH"
>     if test "x$prefix" != xNONE && test "$cross_compiling" != yes; then
>       PATH="$prefix/bin:$prefix/usr/bin:$PATH"
>     fi
>-    AC_PATH_PROG(SDL_CONFIG, sdl2-config, no, [$PATH])
>+    AC_PATH_PROG(SDL2_CONFIG, sdl2-config, no, [$PATH])
>     PATH="$as_save_PATH"
>     AC_MSG_CHECKING(for SDL - version >= $min_sdl_version)
>     no_sdl=""
> 
>-    if test "$SDL_CONFIG" = "no" ; then
>+    if test "$SDL2_CONFIG" = "no" ; then
>       no_sdl=yes
>     else
>-      SDL_CFLAGS=`$SDL_CONFIG $sdl_config_args --cflags`
>-      SDL_LIBS=`$SDL_CONFIG $sdl_config_args --libs`
>+      SDL_CFLAGS=`$SDL2_CONFIG $sdl_config_args --cflags`
>+      SDL_LIBS=`$SDL2_CONFIG $sdl_config_args --libs`
> 
>-      sdl_major_version=`$SDL_CONFIG $sdl_config_args --version | \
>+      sdl_major_version=`$SDL2_CONFIG $sdl_config_args --version | \
>              sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\1/'`
>-      sdl_minor_version=`$SDL_CONFIG $sdl_config_args --version | \
>+      sdl_minor_version=`$SDL2_CONFIG $sdl_config_args --version | \
>              sed 's/$[[0-9]]*$.$[[0-9]]*$.$[[0-9]]*$/\2/'`
>-      sdl_micro_version=`$SDL_CONFIG $sdl_config_args --version | \
>+      sdl_micro_version=`$SDL2_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"
>@@ -130,7 +130,7 @@
>       printf("\n*** 'sdl2-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 sdl2-config is correct, then it is\n", major, minor, micro);
>       printf("*** best to upgrade to the required version.\n");
>-      printf("*** If sdl2-config was wrong, set the environment variable SDL_CONFIG\n");
>+      printf("*** If sdl2-config was wrong, set the environment variable SDL2_CONFIG\n");
>       printf("*** to point to the correct copy of sdl2-config, and remove the file\n");
>       printf("*** config.cache before re-running configure\n");
>       return 1;
>@@ -152,10 +152,10 @@
>   if test "x$no_sdl" = x ; then
>      ifelse([$2], , :, [$2])
>   else
>-     if test "$SDL_CONFIG" = "no" ; then
>+     if test "$SDL2_CONFIG" = "no" ; then
>        echo "*** The sdl2-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 "*** your path, or set the SDL2_CONFIG environment variable to the"
>        echo "*** full path to sdl2-config."
>      else
>        if test -f conf.sdltest ; then
>@@ -186,7 +186,7 @@
>         [ 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 sdl2-config script: $SDL_CONFIG" ])
>+          echo "*** may want to edit the sdl2-config script: $SDL2_CONFIG" ])
>           CFLAGS="$ac_save_CFLAGS"
>           CXXFLAGS="$ac_save_CXXFLAGS"
>           LIBS="$ac_save_LIBS"

Actions: View | Diff

Attachments on bug 1976: 1240

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.