[nautilus] build: use X11 pkg-config files instead of homebrew checks

[Cosimo Cecchi <cosimoc src gnome org>]

commit 57f92209189de791904b014f49b8a383ca1a5bd2
Author: Cosimo Cecchi <cosimoc gnome org>
Date:   Tue Nov 2 17:36:04 2010 +0100

    build: use X11 pkg-config files instead of homebrew checks

 configure.in |   53 +++++++----------------------------------------------
 1 files changed, 7 insertions(+), 46 deletions(-)
---
diff --git a/configure.in b/configure.in
index efb9742..6c9c9ae 100644
--- a/configure.in
+++ b/configure.in
@@ -106,41 +106,6 @@ dnl ==========================================================================
 
 AC_CHECK_HEADERS(sys/mount.h sys/vfs.h sys/param.h malloc.h)
 AC_CHECK_FUNCS(mallopt)
-			      
-dnl X
-
-x_libs="`$PKG_CONFIG --libs pangox`"
-case x_libs in
-  *-lX11*) pango_omitted_x_deps=no ;;
-  *)       pango_omitted_x_deps=yes ;;
-esac
-
-x_cflags="`$PKG_CONFIG --cflags pangox`"
-x_extra_libs=
-
-if test $pango_omitted_x_deps = yes ; then
-  AC_PATH_XTRA
- 
-  if test x$no_x = xyes ; then
-    AC_MSG_ERROR([X development libraries not found])
-  fi
-
-  x_libs="$X_LIBS -lX11 $X_EXTRA_LIBS"
-fi  
-
-## Strip the .la files
- 
-x_libs_for_checks=$x_libs
-#for I in $x_libs ; do
-#  case $I in 
-#    *.la) ;;
-#    *) x_libs_for_checks="$x_libs_for_checks $I" ;;
-#  esac
-#done
-
-AC_CHECK_LIB(X11, XOpenDisplay, :, 
-	AC_MSG_ERROR([*** libX11 not found.  Check 'config.log' for more details.]),
-	$x_libs_for_checks) 
 
 dnl ==========================================================================
 dnl libexif checking
@@ -290,19 +255,14 @@ dnl ===========================================================================
 #
 # Checks for Xft/XRender
 #
-have_render=false
-RENDER_LIBS=""
-
-AC_CHECK_LIB(Xrender, XRenderFindFormat, 
-    have_render=true,:,-lXext)
-
-if $have_render ; then
-   RENDER_LIBS="-lXrender -lXext"
-   AC_DEFINE(HAVE_RENDER, 1, [Define if Xrender is installed on the system])
-fi
+PKG_CHECK_MODULES(RENDER, xrender, [
+	  	  AM_CONDITIONAL(HAVE_RENDER, true)
+		  AC_DEFINE(HAVE_RENDER, 1, [Define to enable render support])
+		  ],
+          	  [AM_CONDITIONAL(HAVE_RENDER, false)])
 
 AC_SUBST(RENDER_LIBS)
-	    
+
 dnl ==========================================================================
 	
 dnl base libs
@@ -319,6 +279,7 @@ PKG_CHECK_MODULES(COMMON, [
 	gail-3.0
 	gnome-desktop-3.0 >= gnome_desktop_minver
 	libxml-2.0 >= xml_minver
+	x11
 ])
 
 AC_SUBST(COMMON_CFLAGS)