diff options
author | Rod Whitby <rod@whitby.id.au> | 2007-01-27 21:39:31 +0000 |
---|---|---|
committer | Rod Whitby <rod@whitby.id.au> | 2007-01-27 21:39:31 +0000 |
commit | 7186a6cbd89018cc88b89aed599678ff5b703bee (patch) | |
tree | e936fa6b5c0d353e5c96bca1ed67e0057bbb6a44 /packages/efl/evas/fix-configure.patch | |
parent | 68e1462d95f8bdac57ce74e4583d92af8f754b40 (diff) | |
parent | 17b9b9959b55d5466d514eb9fe00ac3b6418ff81 (diff) |
merge of '0e9339789b8be553a43cbdf4010cc70792764d17'
and 'd4eb4ca83d3c296c262477a5a3f77d388d7a8ceb'
Diffstat (limited to 'packages/efl/evas/fix-configure.patch')
-rw-r--r-- | packages/efl/evas/fix-configure.patch | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/packages/efl/evas/fix-configure.patch b/packages/efl/evas/fix-configure.patch index 61e2446c24..abf9b94bdf 100644 --- a/packages/efl/evas/fix-configure.patch +++ b/packages/efl/evas/fix-configure.patch @@ -1,17 +1,18 @@ ---- evas-0.9.9.023/configure.in~ 2006-01-11 21:34:57.000000000 -0800 -+++ evas-0.9.9.023/configure.in 2006-02-03 12:15:45.000000000 -0800 -@@ -152,9 +152,7 @@ +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 @@ + AC_CHECK_HEADER(X11/X.h, [ - AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_X11, true) 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" - ENGINE_SOFTWARE_X11_PRG="evas_software_x11_test evas_software_x11_perf_test evas_software_x11_perf_load" ], [ -@@ -423,10 +421,10 @@ + 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]) @@ -23,8 +24,8 @@ + gl_cflags="" gl_libs="-lGL -lGLU -lpthread" gl_dir="" - ENGINE_GL_X11_PRG="evas_gl_x11_test" -@@ -489,7 +487,7 @@ + ], [ +@@ -471,7 +469,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]) @@ -32,4 +33,4 @@ + x_dir=""; x_cflags="-I"$x_dir"/include" x_libs="-L"$x_dir"/lib -lX11 -lXext" - ENGINE_CAIRO_X11_PRG="evas_cairo_x11_test" + ], [ |