seed r792 - trunk

[hortont svn gnome org]

Author: hortont
Date: Thu Jan 22 06:09:44 2009
New Revision: 792
URL: http://svn.gnome.org/viewvc/seed?rev=792&view=rev

Log:
Trying to fix WebKit ContextGroupCreate check.


Modified:
   trunk/config.h.in
   trunk/configure.ac

Modified: trunk/config.h.in
==============================================================================
--- trunk/config.h.in	(original)
+++ trunk/config.h.in	Thu Jan 22 06:09:44 2009
@@ -24,8 +24,8 @@
 /* Define if your <locale.h> file defines LC_MESSAGES. */
 #undef HAVE_LC_MESSAGES
 
-/* Define to 1 if you have the `webkit-1.0' library (-lwebkit-1.0). */
-#undef HAVE_LIBWEBKIT_1_0
+/* Define to 1 if you have the `webkit-1.0 ' library (-lwebkit-1.0 ). */
+#undef HAVE_LIBWEBKIT_1_0_
 
 /* Define to 1 if you have the <locale.h> header file. */
 #undef HAVE_LOCALE_H

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Thu Jan 22 06:09:44 2009
@@ -59,14 +59,17 @@
 fi
 
 dnl =======================WebKit ContextGroup=================================
-dnl case "$host_os" in
-dnl 	darwin*)
-dnl 		;;
-dnl 	*)
-dnl 		AC_CHECK_LIB(webkit-1.0, JSContextGroupCreate, ,
-dnl 					 AC_MSG_ERROR([The installed version of WebKit is too old. Install WebKit from SVN and try again.]))
-dnl 		;;
-dnl  esac
+case "$host_os" in
+	darwin*)
+		;;
+	*)
+		save_LIBS=$LIBS
+		LIBS=`pkg-config --libs webkit-1.0`
+		AC_CHECK_LIB(webkit-1.0 ,JSContextGroupCreate,,
+					   AC_MSG_ERROR([The installed version of WebKit is too old. Install WebKit from SVN and try again.]))
+		LIBS=$save_LIBS
+		;;
+esac
 
 dnl ==============================readline=====================================
 AC_MSG_CHECKING(for readline)