Package: guichan / 0.8.2-13

01-sdl-dependent-link.diff Patch series | download
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
Description: Added dependent link libraries to SDL back end to prevent missing
 symbols at run time due to newer linker.  Affects configure.in and some
 Makefile.am file, other files are regenerated.
Author:  Stephen M. Webb <stephen.webb@bregmasoft.ca>
Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/guichan/+bug/871548

diff -Naur guichan-0.8.2.orig/configure.in guichan-0.8.2/configure.in
--- guichan-0.8.2.orig/configure.in	2009-10-05 20:34:58.000000000 +0200
+++ guichan-0.8.2/configure.in	2012-06-05 20:00:49.639904026 +0200
@@ -114,8 +114,7 @@
 HaveSDLImage()
 {
   SDLIMAGE="yes"
-  SDL_LIBS="$SDL_LIBS -lSDL_image"
-  CPPFLAGS="$CPPFLAGS `sdl-config --cflags`"
+  PKG_CHECK_MODULES([SDL], [sdl SDL_image])
 }
 
 ForceSDLImage()
diff -Naur guichan-0.8.2.orig/src/Makefile.am guichan-0.8.2/src/Makefile.am
--- guichan-0.8.2.orig/src/Makefile.am	2009-09-03 22:35:02.000000000 +0200
+++ guichan-0.8.2/src/Makefile.am	2012-06-05 20:00:49.639904026 +0200
@@ -1,4 +1,4 @@
-SUBDIRS = widgets @GUICHAN_EXTRADIRS@ hge openlayer contrib
+SUBDIRS = widgets . @GUICHAN_EXTRADIRS@ hge openlayer contrib
 
 INCLUDES = -I$(top_srcdir)/include
 
diff -Naur guichan-0.8.2.orig/src/opengl/Makefile.am guichan-0.8.2/src/opengl/Makefile.am
--- guichan-0.8.2.orig/src/opengl/Makefile.am	2009-09-03 22:35:02.000000000 +0200
+++ guichan-0.8.2/src/opengl/Makefile.am	2012-06-05 20:00:49.639904026 +0200
@@ -2,6 +2,7 @@
 
 INCLUDES = -I$(top_srcdir)/include
 
+libguichan_opengl_la_LIBADD  = $(top_builddir)/src/libguichan.la
 libguichan_opengl_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) 
 
 libguichan_opengl_la_SOURCES =	\
diff -Naur guichan-0.8.2.orig/src/sdl/Makefile.am guichan-0.8.2/src/sdl/Makefile.am
--- guichan-0.8.2.orig/src/sdl/Makefile.am	2009-09-03 22:35:02.000000000 +0200
+++ guichan-0.8.2/src/sdl/Makefile.am	2012-06-05 20:00:49.639904026 +0200
@@ -4,6 +4,8 @@
 
 INCLUDES = -I$(top_srcdir)/include
 
+libguichan_sdl_la_CPPFLAGS = $(SDL_CFLAGS)
+libguichan_sdl_la_LIBADD  = $(top_builddir)/src/libguichan.la $(SDL_LIBS)
 libguichan_sdl_la_LDFLAGS = -no-undefined -release $(LT_RELEASE) -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 libguichan_sdl_la_SOURCES =	\