Update of /cvsroot/fink/experimental/fangism/finkinfo
In directory sfp-cvsdas-3.v30.ch3.sourceforge.com:/tmp/cvs-serv3253
Modified Files:
wesnoth-devel.info
Added Files:
wesnoth-devel.patch
Log Message:
disable another configure-time SDL test, mmmm... m4
Index: wesnoth-devel.info
===================================================================
RCS file: /cvsroot/fink/experimental/fangism/finkinfo/wesnoth-devel.info,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- wesnoth-devel.info 16 Sep 2010 18:21:05 -0000 1.6
+++ wesnoth-devel.info 16 Sep 2010 20:40:33 -0000 1.7
@@ -71,18 +71,16 @@
PKG_CONFIG_PATH="%p/lib/pango-ft219/lib/pkgconfig:%p/lib/fontconfig2/lib/pkgconfig:%p/lib/freetype219/lib/pkgconfig:$PKG_CONFIG_PATH"
\
FREETYPE_CONFIG=%p/lib/freetype219/bin/freetype-config
<<
-# PatchFile: %n.patch
-# PatchFile-MD5: 12ba1e8b79608f4c05d49ae6da56d96b
+PatchFile: %n.patch
+PatchFile-MD5: 86297e172816dded4b5454e12cff4377
+# PatchComments:
+# configure(.ac) is missing check for CPP before it is used
+# honor disable-sdltest when checking for SDL_image+PNG support
PatchScript: <<
#!/bin/sh -ev
-# %{default_script}
+ %{default_script}
# properly link against built libraries via direct reference
perl -pi -e 's/-L. -l(wesnoth-core)/lib\1.a/' src/Makefile.am
- # configure(.ac) is missing check for CPP before it is used
- file=configure.ac
- mv $file $file.orig
- sed -e '/^AC_PROG_CXX/i \
-AC_PROG_CPP' $file.orig > $file
# properly link against built libraries via direct reference
file=src/Makefile.am
mv $file $file.orig
--- NEW FILE: wesnoth-devel.patch ---
--- wesnoth-1.9.1/configure.ac.orig 2010-09-15 10:41:59.000000000 -0700
+++ wesnoth-1.9.1/configure.ac 2010-09-16 11:37:58.000000000 -0700
@@ -381,6 +381,7 @@
# Checks for programs. #
#######################################################################
+AC_PROG_CPP
AC_PROG_CXX
AC_PROG_CC
AC_PROG_INSTALL
@@ -770,7 +771,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
@@ -804,6 +805,9 @@
CPPFLAGS=$OLD_CPPFLAGS
CFLAGS=$OLD_CFLAGS
LIBS=$OLD_LIBS
+else
+ AC_MSG_RESULT([test skipped])
+fi
#######################################################################
------------------------------------------------------------------------------
Start uncovering the many advantages of virtual appliances
and start using them to simplify application deployment and
accelerate your shift to cloud computing.
http://p.sf.net/sfu/novell-sfdev2dev
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
