org.handhelds.familiar/packages/efl/evas/fix-configure-20060113.patch

   1 diff -Nur evas-0.9.9.015~/configure.in evas-0.9.9.015/configure.in
   2 --- evas-0.9.9.015~/configure.in        2005-09-28 15:12:03.000000000 -0700
   3 +++ evas-0.9.9.015/configure.in 2005-09-28 15:13:05.000000000 -0700
   4 @@ -152,9 +152,7 @@
   5      [
   6        AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_X11, true)
   7        AC_DEFINE(BUILD_ENGINE_SOFTWARE_X11, 1, [Software X11 Rendering Backend])
   8 -      x_dir=${x_dir:-/usr/X11R6}
   9 -      x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
  10 -      x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
  11 +      x_libs="-lX11 -lXext";
  12        ENGINE_SOFTWARE_X11_PRG="evas_software_x11_test evas_software_x11_perf_test evas_software_x11_perf_load"
  13      ],
  14      [
  15 @@ -216,7 +214,7 @@
  16          X11/X.h,
  17          [AM_CONDITIONAL(BUILD_ENGINE_SOFTWARE_XCB, true)
  18           AC_DEFINE(BUILD_ENGINE_SOFTWARE_XCB, 1, [Software XCB Rendering Backend])
  19 -         xcb_dir=${x_dir:-/usr/X11R6}
  20 +         xcb_dir=${x_dir:-}
  21           xcb_cflags="${x_cflags:--I${x_includes:-$x_dir/include}} $XCB_CFLAGS $XCB_ICCCM_CFLAGS"
  22           xcb_libs="${x_libs:--L${x_libraries:-$x_dir/lib}}  $XCB_LIBS $XCB_ICCCM_LIBS"
  23           ENGINE_SOFTWARE_XCB_PRG="evas_software_xcb_test evas_software_xcb_perf_test evas_software_xcb_perf_load"],
  24 @@ -430,10 +428,10 @@
  25               AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend])
  26               AM_CONDITIONAL(BUILD_ENGINE_GL_COMMON, true)
  27               AC_DEFINE(BUILD_ENGINE_GL_COMMON, 1, [Generic OpenGL Rendering Support])
  28 -             x_dir=${x_dir:-/usr/X11R6};
  29 +             x_dir=${x_dir:-};
  30               x_cflags=${x_cflags:--I$x_dir/include}
  31               x_libs="${x_libs:--L$x_dir/lib -lX11 -lXext}"
  32 -             gl_cflags="-I/usr/include"
  33 +             gl_cflags=""
  34               gl_libs="-lGL -lGLU -lpthread"
  35               gl_dir=""
  36               ENGINE_GL_X11_PRG="evas_gl_x11_test"
  37 @@ -496,7 +494,7 @@
  38        AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend])
  39        AM_CONDITIONAL(BUILD_ENGINE_CAIRO_COMMON, true)
  40        AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support])
  41 -      x_dir="/usr/X11R6";
  42 +      x_dir="";
  43        x_cflags="-I"$x_dir"/include"
  44        x_libs="-L"$x_dir"/lib -lX11 -lXext"
  45        ENGINE_CAIRO_X11_PRG="evas_cairo_x11_test"