[Scummvm-cvs-logs] scummvm master -> a4acaeb32726ccdafd744aefa28210bf36581c1e

[tsoliman]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
6a08869838 CONFIGURE: Don't link against libpng by default
a4acaeb327 MAEMO: Don't explicitly link to libpthread


Commit: 6a08869838cc81f703c9a7a3c055805b07393ea1
    https://github.com/scummvm/scummvm/commit/6a08869838cc81f703c9a7a3c055805b07393ea1
Author: Tarek Soliman (tsoliman at scummvm.org)
Date: 2011-12-15T08:41:20-08:00

Commit Message:
CONFIGURE: Don't link against libpng by default

Except for the PSP port, nothing is actually using libpng symbols.
It is being linked against if it is available at compile time.
This needlessly creates a dependency.

Changed paths:
    configure



diff --git a/configure b/configure
index baf213f..5afcc2e 100755
--- a/configure
+++ b/configure
@@ -137,7 +137,7 @@ _seq_midi=auto
 _timidity=auto
 _zlib=auto
 _sparkle=auto
-_png=auto
+_png=no
 _theoradec=auto
 _faad=auto
 _fluidsynth=auto


Commit: a4acaeb32726ccdafd744aefa28210bf36581c1e
    https://github.com/scummvm/scummvm/commit/a4acaeb32726ccdafd744aefa28210bf36581c1e
Author: Tarek Soliman (tsoliman at scummvm.org)
Date: 2011-12-15T08:41:21-08:00

Commit Message:
MAEMO: Don't explicitly link to libpthread

Changed paths:
    configure



diff --git a/configure b/configure
index 5afcc2e..ea85885 100755
--- a/configure
+++ b/configure
@@ -2292,7 +2292,6 @@ if test -n "$_host"; then
 			CXXFLAGS="$CXXFLAGS -mcpu=arm926ej-s"
 			CXXFLAGS="$CXXFLAGS -fomit-frame-pointer"
 			INCLUDES="$INCLUDES -I/usr/X11R6/include"
-			LIBS="$LIBS -lpthread"
 			LIBS="$LIBS -lX11"
 			LIBS="$LIBS -L/usr/lib"