[82508] trunk/dports/games/wesnoth

[jmr at macports.org]

Revision: 82508
          http://trac.macports.org/changeset/82508
Author:   jmr at macports.org
Date:     2011-08-14 21:55:02 -0700 (Sun, 14 Aug 2011)
Log Message:
-----------
wesnoth: don't link SDL image and mixer tests against SDLmain

Modified Paths:
--------------
    trunk/dports/games/wesnoth/Portfile

Added Paths:
-----------
    trunk/dports/games/wesnoth/files/patch-configure.ac.diff

Modified: trunk/dports/games/wesnoth/Portfile
===================================================================
--- trunk/dports/games/wesnoth/Portfile	2011-08-15 04:51:28 UTC (rev 82507)
+++ trunk/dports/games/wesnoth/Portfile	2011-08-15 04:55:02 UTC (rev 82508)
@@ -43,7 +43,8 @@
                         port:gettext \
                         port:zlib
 
-patchfiles              patch-m4-boost.m4.diff
+patchfiles              patch-m4-boost.m4.diff \
+                        patch-configure.ac.diff
 
 use_autoreconf          yes
 

Added: trunk/dports/games/wesnoth/files/patch-configure.ac.diff
===================================================================
--- trunk/dports/games/wesnoth/files/patch-configure.ac.diff	                        (rev 0)
+++ trunk/dports/games/wesnoth/files/patch-configure.ac.diff	2011-08-15 04:55:02 UTC (rev 82508)
@@ -0,0 +1,30 @@
+--- configure.ac.orig	2010-09-25 03:37:41.000000000 +1000
++++ configure.ac	2011-08-15 14:42:09.000000000 +1000
+@@ -769,11 +769,12 @@
+ 
+ CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
+ CFLAGS="$CFLAGS $SDL_CFLAGS"
+-LIBS="$LIBS $SDL_LIBS $SDL_IMAGE_LIBS -lz"
++LIBS="`echo $LIBS $SDL_LIBS $SDL_IMAGE_LIBS -lz | sed 's/-lSDLmain//'`"
+ 
+ ac_link="$LDPREFIX $ac_link"
+ AC_RUN_IFELSE([AC_LANG_SOURCE([
+ #include <SDL_image.h>
++#undef main
+ #include <stdlib.h>
+ 
+ int main(int argc, char **argv)
+@@ -813,11 +814,12 @@
+ 
+     CPPFLAGS="$CPPFLAGS $SDL_CFLAGS"
+     CFLAGS="$CFLAGS $SDL_CFLAGS"
+-    LIBS="$LIBS $SDL_LIBS $SDL_MIXER_LIBS"
++    LIBS="`echo $LIBS $SDL_LIBS $SDL_MIXER_LIBS | sed 's/-lSDLmain//'`"
+ 
+     ac_link="$LDPREFIX $ac_link"
+     AC_RUN_IFELSE([AC_LANG_SOURCE([
+     #include <SDL_mixer.h>
++    #undef main
+     #include <stdlib.h>
+ 
+     int main(int argc, char **argv)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20110814/cac3f680/attachment.html>