From 5e2bbbbfabc2aa673a06cdbcc792e67f0714842c Mon Sep 17 00:00:00 2001
From: Carsten Haitzler <raster@rasterman.com>
Date: Sun, 16 Dec 2007 03:37:03 +0000
Subject: [PATCH] simple x11 linking

SVN revision: 33160
---
 legacy/evas/configure.in | 70 +++++++++++++++++++++++++++++-----------
 1 file changed, 51 insertions(+), 19 deletions(-)

diff --git a/legacy/evas/configure.in b/legacy/evas/configure.in
index d20807bbf4..00a9a7aad0 100644
--- a/legacy/evas/configure.in
+++ b/legacy/evas/configure.in
@@ -80,6 +80,14 @@ AC_HELP_STRING([--with-qtdir=QT_DIR], [use qt directory specified]),
 # check for freetype
 PKG_CHECK_MODULES(FREETYPE, freetype2 >= 9.3.0)
 
+#######################################
+## Simple X11 build/link
+
+AC_ARG_ENABLE(simple-x11,
+  AC_HELP_STRING([--enable-simple-x11], [enable simple x11 linking]),
+  [ want_evas_simple_x11=$enableval ]
+)
+
 #######################################
 ## FontConfig
 
@@ -262,9 +270,13 @@ if test "x$want_evas_software_x11" = "xyes" -o "x$want_evas_software_x11" = "xau
   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"
+      if test "x$want_evas_simple_x11" = "xyes"; then
+        x_libs="${x_libs} -lX11 -lXext"
+      else      
+        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"
+      fi
       have_evas_software_x11="yes"
     ],
     [
@@ -294,9 +306,13 @@ if test "x$want_evas_software_16_x11" = "xyes"; then
   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"
+      if test "x$want_evas_simple_x11" = "xyes"; then
+        x_libs="${x_libs} -lX11 -lXext"
+      else      
+        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"
+      fi
       have_evas_software_16_x11="yes"
     ],
     [
@@ -502,10 +518,14 @@ if test "x$want_evas_gl_x11" = "xyes"; then
   AC_CHECK_HEADERS(GL/gl.h GL/glu.h X11/X.h,
     [
       AC_DEFINE(BUILD_ENGINE_GL_X11, 1, [OpenGL X11 Rendering Backend])
-      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"
+      if test "x$want_evas_simple_x11" = "xyes"; then
+        x_libs="${x_libs} -lX11 -lXext"
+      else      
+        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"
+        gl_cflags="-I/usr/include"
+      fi
       gl_libs="-lGL -lGLU -lpthread"
       gl_dir=""
       have_evas_gl_x11="yes"
@@ -579,9 +599,13 @@ if test "x$want_evas_cairo_x11" = "xyes"; then
         [
           AC_DEFINE(BUILD_ENGINE_CAIRO_X11, 1, [Cairo X11 Rendering Backend])
           AC_DEFINE(BUILD_ENGINE_CAIRO_COMMON, 1, [Generic Cairo Rendering Support])
-          x_dir="/usr/X11R6";
-          x_cflags="-I"$x_dir"/include"
-          x_libs="-L"$x_dir"/lib -lX11 -lXext"
+          if test "x$want_evas_simple_x11" = "xyes"; then
+            x_libs="${x_libs} -lX11 -lXext"
+          else      
+            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"
+          fi
           have_evas_cairo_x11="yes"
         ], [
           have_evas_cairo_common="no"
@@ -616,9 +640,13 @@ if test "x$want_evas_xrender_x11" = "xyes" -o "x$want_evas_xrender_x11" = "xauto
   AC_CHECK_HEADERS(X11/X.h 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"
+      if test "x$want_evas_simple_x11" = "xyes"; then
+      	x_libs="${x_libs} -lX11 -lXext"
+      else      
+        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"
+      fi
       have_evas_xrender_x11="yes"
     ],
     [
@@ -678,9 +706,13 @@ if test "x$want_evas_glitz_x11" = "xyes"; then
     [
       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"
+          if test "x$want_evas_simple_x11" = "xyes"; then
+            x_libs="${x_libs} -lX11 -lXext"
+          else      
+            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"
+          fi
           AC_DEFINE(BUILD_ENGINE_GLITZ_X11, 1, [Glitz X11 Rendering Backend])
           have_evas_glitz_x11="yes"
         ],