[Scummvm-cvs-logs] SF.net SVN: scummvm: [30815] scummvm/trunk/configure

[jvprat at users.sourceforge.net]

Revision: 30815
          http://scummvm.svn.sourceforge.net/scummvm/?rev=30815&view=rev
Author:   jvprat
Date:     2008-02-07 07:15:10 -0800 (Thu, 07 Feb 2008)

Log Message:
-----------
Use sdl-config --prefix to enable better detection of include paths.

Modified Paths:
--------------
    scummvm/trunk/configure

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2008-02-07 12:49:46 UTC (rev 30814)
+++ scummvm/trunk/configure	2008-02-07 15:15:10 UTC (rev 30815)
@@ -238,6 +238,11 @@
 			if test -x "$path_dir/$sdlconfig" ; then
 				_sdlconfig="$path_dir/$sdlconfig"
 				echo $_sdlconfig
+				# Save the prefix
+				_sdlpath=$path_dir
+				if test `basename $path_dir` = bin ; then
+					_sdlpath=`dirname $path_dir`
+				fi
 				# break at first sdl-config found in path
 				break 2
 			fi
@@ -1572,15 +1577,15 @@
 		;;
 	sdl)
 		find_sdlconfig
-		INCLUDES="$INCLUDES `$_sdlconfig --cflags`"
-		LIBS="$LIBS `$_sdlconfig --libs`"
+		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
+		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
 		DEFINES="$DEFINES -DSDL_BACKEND"
 		MODULES="$MODULES backends/platform/sdl"
 		;;
 	gp2x)
 		find_sdlconfig
-		INCLUDES="$INCLUDES `$_sdlconfig --cflags`"
-		LIBS="$LIBS `$_sdlconfig --libs`"
+		INCLUDES="$INCLUDES `$_sdlconfig --prefix="$_sdlpath" --cflags`"
+		LIBS="$LIBS `$_sdlconfig --prefix="$_sdlpath" --libs`"
 		LDFLAGS="$LDFLAGS -static"
 		CXXFLAGS="$CXXFLAGS -march=armv4t"
 		MODULES="$MODULES backends/platform/gp2x"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.