summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSamuli Suominen <ssuominen@gentoo.org>2010-03-09 18:05:33 +0000
committerSamuli Suominen <ssuominen@gentoo.org>2010-03-09 18:05:33 +0000
commit458a2b3d6c0282c5e6bf64c6e97e171fa8116daf (patch)
tree07bb577a5cd8ddc27872f199fbf01b45cb37b06d /games-arcade/criticalmass/files/criticalmass-1.0.0-system_curl.patch
parentStabilize sys-fs/ntfs3g-2010.1.16 on amd64. (diff)
downloadgentoo-2-458a2b3d6c0282c5e6bf64c6e97e171fa8116daf.tar.gz
gentoo-2-458a2b3d6c0282c5e6bf64c6e97e171fa8116daf.tar.bz2
gentoo-2-458a2b3d6c0282c5e6bf64c6e97e171fa8116daf.zip
Use system libcurl and fix building with libpng14 by Locke Shinseiko (Wizzleby).
(Portage version: 2.2_rc66/cvs/Linux x86_64)
Diffstat (limited to 'games-arcade/criticalmass/files/criticalmass-1.0.0-system_curl.patch')
-rw-r--r--games-arcade/criticalmass/files/criticalmass-1.0.0-system_curl.patch33
1 files changed, 33 insertions, 0 deletions
diff --git a/games-arcade/criticalmass/files/criticalmass-1.0.0-system_curl.patch b/games-arcade/criticalmass/files/criticalmass-1.0.0-system_curl.patch
new file mode 100644
index 000000000000..02307ad7d8fc
--- /dev/null
+++ b/games-arcade/criticalmass/files/criticalmass-1.0.0-system_curl.patch
@@ -0,0 +1,33 @@
+--- configure.in
++++ configure.in
+@@ -115,8 +115,6 @@ fi
+ AC_CHECK_LIB(m, sin,,
+ AC_MSG_ERROR(libm is needed))
+
+-AC_CONFIG_SUBDIRS(curl)
+-
+ AC_OUTPUT(Makefile utils/Makefile utilssdl/Makefile utilsgl/Makefile game/Makefile tools/Makefile data/Makefile data/music/Makefile tinyxml/Makefile)
+
+ echo "Configuration:
+--- game/Makefile.am
++++ game/Makefile.am
+@@ -41,7 +41,7 @@ critter_SOURCES = \
+ main.cpp
+
+ LDADD = \
+- ../curl/lib/libcurl.a \
++ -lcurl \
+ ../utils/libutils.a \
+ ../utilssdl/libutilssdl.a \
+ ../utilsgl/libutilsgl.a \
+--- Makefile.am
++++ Makefile.am
+@@ -4,7 +4,7 @@
+ AUTOMAKE_OPTIONS = 1.4
+
+ ## Any directories that you want built and installed should go here.
+-SUBDIRS = curl tinyxml utils utilssdl utilsgl tools data game
++SUBDIRS = tinyxml utils utilssdl utilsgl tools data game
+
+ ## Any directories you want a part of the distribution should be listed
+ ## here, as well as have a Makefile generated at the end of configure.in