etr: set correct path to sdl-config and freetype-config
Signed-off-by: Marko Lindqvist <cazfi74@gmail.com>
This commit is contained in:
@@ -1,24 +0,0 @@
|
||||
diff -Nurd -X.diff_ignore etr/m4/sdl.m4 etr/m4/sdl.m4
|
||||
--- etr/m4/sdl.m4 2013-04-17 13:54:01.642150470 +0300
|
||||
+++ etr/m4/sdl.m4 2013-08-15 10:24:11.957364160 +0300
|
||||
@@ -14,6 +14,8 @@
|
||||
[dnl
|
||||
dnl Get the cflags and libraries from the sdl-config script
|
||||
dnl
|
||||
+AC_ARG_WITH(sdl-prefix,[ --with-sdl-config=path Path to sdl-config],
|
||||
+ sdl_config="$withval", sdl_config="")
|
||||
AC_ARG_WITH(sdl-prefix,[ --with-sdl-prefix=PFX Prefix where SDL is installed (optional)],
|
||||
sdl_prefix="$withval", sdl_prefix="")
|
||||
AC_ARG_WITH(sdl-exec-prefix,[ --with-sdl-exec-prefix=PFX Exec prefix where SDL is installed (optional)],
|
||||
@@ -27,6 +29,11 @@
|
||||
SDL_CONFIG=$sdl_exec_prefix/bin/sdl-config
|
||||
fi
|
||||
fi
|
||||
+ if test x$sdl_config != x ; then
|
||||
+ if test x${SDL_CONFIG+set} != xset ; then
|
||||
+ SDL_CONFIG=$sdl_config
|
||||
+ fi
|
||||
+ fi
|
||||
if test x$sdl_prefix != x ; then
|
||||
sdl_config_args="$sdl_config_args --prefix=$sdl_prefix"
|
||||
if test x${SDL_CONFIG+set} != xset ; then
|
||||
@@ -9,7 +9,6 @@ SECTION = "games"
|
||||
SRCREV = "401"
|
||||
|
||||
SRC_URI = "svn://svn.code.sf.net/p/extremetuxracer/code/;module=trunk \
|
||||
file://sdl_config.patch \
|
||||
"
|
||||
|
||||
PV = "0.6-beta1+r${SRCREV}"
|
||||
@@ -23,7 +22,8 @@ S = "${WORKDIR}/trunk"
|
||||
B = "${WORKDIR}/build"
|
||||
|
||||
EXTRA_OECONF = "\
|
||||
--with-sdl-config=${STAGING_BINDIR_CROSS}/sdl-config \
|
||||
SDL_CONFIG=${STAGING_BINDIR_CROSS}/sdl-config \
|
||||
FT2_CONFIG=${STAGING_BINDIR_CROSS}/freetype-config \
|
||||
"
|
||||
|
||||
inherit autotools
|
||||
|
||||
Reference in New Issue
Block a user