Fixed bug #531 SDL-1.2
authorSam Lantinga <slouken@libsdl.org>
Tue, 01 Jan 2008 15:23:59 +0000
branchSDL-1.2
changeset 4132 f7e5a35a1d0d
parent 4131 7c2589fb8d4d
child 4133 2130d625816f
Fixed bug #531 The static libs should include all the other libraries the dynamic SDL library links with. sdl.pc should include these so "pkg-config sdl --libs --static" works
configure.in
sdl.pc.in
--- a/configure.in	Mon Dec 31 06:18:12 2007 +0000
+++ b/configure.in	Tue Jan 01 15:23:59 2008 +0000
@@ -2749,7 +2749,7 @@
     SDL_STATIC_LIBS="\${libdir}/libSDLmain.a \${libdir}/libSDL.a $EXTRA_LDFLAGS"
     ;;
   *)
-    SDL_STATIC_LIBS="$SDL_LIBS"
+    SDL_STATIC_LIBS="$SDL_LIBS $EXTRA_LDFLAGS"
     ;;
 esac
 
--- a/sdl.pc.in	Mon Dec 31 06:18:12 2007 +0000
+++ b/sdl.pc.in	Tue Jan 01 15:23:59 2008 +0000
@@ -11,4 +11,5 @@
 Requires:
 Conflicts:
 Libs: -L${libdir} @SDL_RLD_FLAGS@ @SDL_LIBS@
+Libs.private: @SDL_STATIC_LIBS@
 Cflags: -I${includedir}/SDL @SDL_CFLAGS@