Sergey Popov <[EMAIL PROTECTED]> writes:

> На Fri, 22 Aug 2008 14:53:28 -0700
> Jesse Alama <[EMAIL PROTECTED]> записано:
>
>> I would like to propose that in the configure script we test for
>> enable_sdltest before carrying on with the test for PNG and OGG support:
>> 
>
> Patches for configure make no sense because this script is autogenerated by 
> autoconf. You'll need to work on configure.ac instead.

Oh, I didn't know that.  Here's the relevant patch applied to
configure.ac:

diff -Naur --exclude='*~' wesnoth-1.4.4/configure.ac 
wesnoth-1.4.4.scratch/configure.ac
--- wesnoth-1.4.4/configure.ac  2008-07-22 12:44:11.000000000 -0700
+++ wesnoth-1.4.4.scratch/configure.ac  2008-08-23 02:18:18.000000000 -0700
@@ -854,6 +854,7 @@
 AC_LANG([C])
 AC_MSG_CHECKING([for PNG support in SDL_image])
 
+if test "x$enable_sdltest" = "xyes" ; then
 OLD_CPPFLAGS=$CPPFLAGS
 OLD_CFLAGS=$CFLAGS
 OLD_LIBS=$LIBS
@@ -887,7 +888,7 @@
 CPPFLAGS=$OLD_CPPFLAGS
 CFLAGS=$OLD_CFLAGS
 LIBS=$OLD_LIBS
-
+fi
 
 #######################################################################
 # Check for OGG support in SDL_mixer                                  #
@@ -898,6 +899,7 @@
         AC_LANG([C])
        AC_MSG_CHECKING([for OGG support in SDL_mixer])
 
+       if test "x$enable_sdltest" = "xyes" ; then
         OLD_CPPFLAGS=$CPPFLAGS
        OLD_CFLAGS=$CFLAGS
         OLD_LIBS=$LIBS
@@ -929,6 +931,7 @@
         CPPFLAGS=$OLD_CPPFLAGS
         CFLAGS=$OLD_CFLAGS
         LIBS=$OLD_LIBS
+       fi
     fi
 fi

-- 
Jesse Alama ([EMAIL PROTECTED])


_______________________________________________
Wesnoth-dev mailing list
Wesnoth-dev@gna.org
https://mail.gna.org/listinfo/wesnoth-dev

Reply via email to