diff options
| author | Michael Lauer <mickey@vanille-media.de> | 2007-08-20 17:28:39 +0000 |
|---|---|---|
| committer | Michael Lauer <mickey@vanille-media.de> | 2007-08-20 17:28:39 +0000 |
| commit | 2decb4559a8d343ef03cf160bf7393ba956bb9e1 (patch) | |
| tree | 0b8cea5fc6515d81109693f6b96defde437a9ed4 /packages/efl1/evas/fix-configure.patch | |
| parent | a2bded6ad1c199dfeef28e27407b7f3ec750db35 (diff) | |
evas/ecore: reinstantiate configure patches - without them EFL picks up wrong CFLAGS/LIBS
Diffstat (limited to 'packages/efl1/evas/fix-configure.patch')
| -rw-r--r-- | packages/efl1/evas/fix-configure.patch | 79 |
1 files changed, 57 insertions, 22 deletions
diff --git a/packages/efl1/evas/fix-configure.patch b/packages/efl1/evas/fix-configure.patch index abf9b94bdf..1a5bf78e46 100644 --- a/packages/efl1/evas/fix-configure.patch +++ b/packages/efl1/evas/fix-configure.patch @@ -1,36 +1,71 @@ -diff -Nur evas-0.9.9.037~/configure.in evas-0.9.9.037/configure.in ---- evas-0.9.9.037~/configure.in 2007-01-14 20:09:57.000000000 -0800 -+++ evas-0.9.9.037/configure.in 2007-01-14 20:11:09.000000000 -0800 -@@ -161,9 +161,7 @@ +Index: evas/configure.in +=================================================================== +--- evas.orig/configure.in 2007-08-20 16:44:22.000000000 +0000 ++++ evas/configure.in 2007-08-20 16:49:08.000000000 +0000 +@@ -260,9 +260,7 @@ AC_CHECK_HEADER(X11/X.h, [ AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend]) - x_dir=${x_dir:-/usr/X11R6} - x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} - x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" -+ x_libs="-lX11 -lXext" ++ x_libs="${x_libs} -lX11 -lXext" ], [ AC_MSG_RESULT(disabling software X11 engine) -@@ -407,10 +405,10 @@ - AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend]) - AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true) - AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support]) -- x_dir=${x_dir:-/usr/X11R6}; -+ x_dir=${x_dir:-}; - x_cflags=${x_cflags:--I$x_dir/include} - x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}" -- gl_cflags="-I/usr/include" -+ gl_cflags="" - gl_libs="-lGL -lGLU -lpthread" - gl_dir="" - ], [ -@@ -471,7 +469,7 @@ +@@ -303,9 +301,7 @@ + AC_CHECK_HEADER(X11/X.h, + [ + AC_DEFINE(BUILD_ENGINE_SOFTWARE_16_X11, 1, [Software 16bit X11 Rendering Backend]) +- x_dir=${x_dir:-/usr/X11R6} +- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} +- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" ++ x_libs="${x_libs} -lX11 -lXext" + ], + [ + AC_MSG_RESULT(disabling software 16bit X11 engine) +@@ -599,10 +595,7 @@ + [ + AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend]) + AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support]) +- x_dir=${x_dir:-/usr/X11R6}; +- x_cflags=${x_cflags:--I$x_dir/include} +- x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}" +- gl_cflags="-I/usr/include" ++ x_libs="${x_libs} -lX11 -lXext" + gl_libs="-lGL -lGLU -lpthread" + gl_dir="" + ], +@@ -694,9 +687,7 @@ AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend]) AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true) AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support]) - x_dir="/usr/X11R6"; -+ x_dir=""; - x_cflags="-I"$x_dir"/include" - x_libs="-L"$x_dir"/lib -lX11 -lXext" +- x_cflags="-I"$x_dir"/include" +- x_libs="-L"$x_dir"/lib -lX11 -lXext" ++ x_libs="${x_libs} -lX11 -lXext" ], [ + AM_CONDITIONAL(BUILD_ENGINE_CAIRO_X11, false) + AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, false) +@@ -738,9 +729,7 @@ + AC_CHECK_HEADER(X11/extensions/Xrender.h, + [ + AC_DEFINE(BUILD_ENGINE_XRENDER_X11, 1, [XRender X11 Rendering Backend]) +- x_dir=${x_dir:-/usr/X11R6} +- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} +- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext -lXrender" ++ x_libs="${x_libs} -lX11 -lXext -lXrender" + ], + [ + AC_MSG_RESULT(disabling xrender X11 engine) +@@ -826,9 +815,7 @@ + [ + PKG_CHECK_MODULES(GLITZ, glitz glitz-glx, + [ +- x_dir=${x_dir:-/usr/X11R6} +- x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}} +- x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext" ++ x_libs="${x_libs} -lX11 -lXext" + AC_DEFINE(BUILD_ENGINE_GLITZ_X11, 1, [Glitz X11 Rendering Backend]) + ], + [ |