galeon r8947 - trunk

[philipl svn gnome org]

Author: philipl
Date: Sat Feb  2 23:37:07 2008
New Revision: 8947
URL: http://svn.gnome.org/viewvc/galeon?rev=8947&view=rev

Log:
2008-02-02  Philip Langdale  <philipl alumni utexas net>

	* configure.in: Replace bogus gecko 1.9 test with
	more meaningful test for whether internal nsString
	symbols can be resolved.



Modified:
   trunk/ChangeLog
   trunk/configure.in

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sat Feb  2 23:37:07 2008
@@ -301,9 +301,11 @@
 dnl FIXME find a m4/autoconf guru who can distill this into a nice macro
 _SAVE_CXXFLAGS=$CXXFLAGS
 _SAVE_CPPFLAGS=$CPPFLAGS
+_SAVE_LDFLAGS=$LDFLAGS
 
 CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT `$PKG_CONFIG --cflags-only-I $MOZILLA-xpcom` $GALEON_DEPENDENCY_CFLAGS"
 CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA-xpcom`"
+LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS `pkg-config --libs $MOZILLA-xpcom`"
 
 TEST_MOZILLA_INCLUDE_DIRS="widget mimetype docshell history dom necko string layout gfx content js exthandler pipnss uriloader caps xpconnect nkcache fastfind gtkembedmoz chrome"
 for i in $TEST_MOZILLA_INCLUDE_DIRS ; do
@@ -311,24 +313,6 @@
 done
 CXXFLAGS="$CXXFLAGS -DMOZILLA_STRICT_API=1"
 
-dnl Check whether we have gecko 1.9
-
-AC_MSG_CHECKING([[whether we have a gecko 1.9 build]])
-
-AC_PREPROC_IFELSE(
-	[AC_LANG_SOURCE(
-		[[#include <mozilla-config.h>
-		  #if defined(MOZ_XULRUNNER) && !defined(MOZILLA_1_8_BRANCH)
-		  #error Yes
-		  #endif]]
-	)],
-	[result=no],
-	[AC_DEFINE([HAVE_GECKO_1_9],[1],
-	           [Define if we have gecko 1.9]) result=yes])
-
-AC_MSG_RESULT([$result])
-AM_CONDITIONAL([HAVE_GECKO_1_9], [test "$result" = "yes"])
-
 dnl Check whether we have a mozilla debug build
 
 AC_MSG_CHECKING([[whether we have a mozilla debug build]])
@@ -346,6 +330,21 @@
 
 AC_MSG_RESULT([$have_mozilla_debug])
 
+dnl In Gecko 1.9, it's not longer usable.
+AC_MSG_CHECKING([whether internal string API is usable])
+
+AC_LINK_IFELSE(
+	[AC_LANG_PROGRAM(
+		[[#define MOZILLA_INTERNAL_API
+		  #include <nsString.h>]],
+		[[nsCString c;]]
+	)],
+	[AC_DEFINE([HAVE_NSSTRING_INTERNAL],[1],
+	           [Define if internal string API is usable]) result=yes],
+	[result=no])
+
+AC_MSG_RESULT([$result])
+
 dnl Changed from PRUnichar* to nsAString& in 1.8a1 and on aviary branch
 dnl https://bugzilla.mozilla.org/show_bug.cgi?id=240723
 AC_MSG_CHECKING([whether nsIFilePicker methods expect nsAString&])
@@ -1146,6 +1145,7 @@
 dnl restore flags
 CXXFLAGS="$_SAVE_CXXFLAGS $MOZ_DEBUG_FLAGS"
 CPPFLAGS=$_SAVE_CPPFLAGS
+LDFLAGS=$_SAVE_LDFLAGS
 AC_LANG_POP(C++)
 
 dnl unfortunately _NL_PAPER_WIDTH and _NL_PAPER_HEIGHT are not defines but