r7485 - mugshot-client/trunk/linux

[commits mugshot org]

Author: otaylor
Date: 2008-06-16 11:27:33 -0500 (Mon, 16 Jun 2008)
New Revision: 7485

Modified:
   mugshot-client/trunk/linux/Makefile-libhippofirefox.am
   mugshot-client/trunk/linux/configure.ac
Log:
- Bump version to 1.2.0
- Count on the CFLAGS from libxul-unstable rather than pulling in the
  full set of unedited includes installed by Fedora 9. This should give
  better compatibility with Debian and Ubunti.


Modified: mugshot-client/trunk/linux/Makefile-libhippofirefox.am
===================================================================
--- mugshot-client/trunk/linux/Makefile-libhippofirefox.am	2008-05-30 17:42:37 UTC (rev 7484)
+++ mugshot-client/trunk/linux/Makefile-libhippofirefox.am	2008-06-16 16:27:33 UTC (rev 7485)
@@ -69,6 +69,9 @@
 # The include of $(GECKO_INCLUDEDIR) in the FULL_GECKO case is for 
 # Ubuntu, which has a mix of the gecko-sdk directory arrangement
 # with including the full set of headers
+if USE_XULRUNNER
+# count on LIBHIPPOFIREFOX_CFLAGS from pkg-config
+else
 if HAVE_FULL_GECKO
 libhippofirefox_la_CPPFLAGS +=			\
 	-I $(GECKO_INCLUDEDIR)			\
@@ -89,6 +92,7 @@
 	-I $(GECKO_INCLUDEDIR)			\
 	-I $(GECKO_PRIVATE_INCLUDEDIR)
 endif
+endif
 
 nodist_libhippofirefox_la_SOURCES=			\
 	$(FIREFOX_SRCDIR)/src/hippoExtension.cpp	\
@@ -105,15 +109,9 @@
 MAINTAINERCLEANFILES +=	$(LIBHIPPOFIREFOX_BUILT_SOURCEFILES)
 BUILT_SOURCES += $(LIBHIPPOFIREFOX_BUILT_SOURCEFILES)
 
-if HAVE_FULL_GECKO
 XPIDL_INCLUDES =				\
 	-I $(GECKO_IDLDIR)			\
 	-I $(FIREFOX_SRCDIR)/public
-else
-XPIDL_INCLUDES =				\
-	-I $(GECKO_IDLDIR)			\
-	-I $(FIREFOX_SRCDIR)/public
-endif
 
 IDL_FILES =							\
 	$(FIREFOX_SRCDIR)/public/hippoIExtension.idl		\

Modified: mugshot-client/trunk/linux/configure.ac
===================================================================
--- mugshot-client/trunk/linux/configure.ac	2008-05-30 17:42:37 UTC (rev 7484)
+++ mugshot-client/trunk/linux/configure.ac	2008-06-16 16:27:33 UTC (rev 7485)
@@ -6,7 +6,7 @@
 
 AC_CANONICAL_TARGET
 
-AM_INIT_AUTOMAKE(mugshot, 1.1.95)
+AM_INIT_AUTOMAKE(mugshot, 1.2.0)
 
 AM_CONFIG_HEADER(config/config.h)
 
@@ -449,17 +449,15 @@
     XPIDL="$with_xpidl"
 fi
 
-# Look for libxul or libxul-unstable
+# Look for libxul-unstable
 
-AC_MSG_CHECKING([for libxul])
+AC_MSG_CHECKING([for libxul-unstable])
 
 have_xulrunner=false
-for p in libxul libxul-instable ; do
-    if $PKG_CONFIG --exists $p '>=' 1.9 ; then
-       have_xulrunner=true
-       xulrunner_package=$p
-    fi
-done
+if $PKG_CONFIG --exists libxul-unstable '>=' 1.9 ; then
+   have_xulrunner=true
+   xulrunner_package=libxul-unstable
+fi
 
 AM_CONDITIONAL(USE_XULRUNNER, test "x${have_xulrunner}" = "xtrue")
 if test "x${have_xulrunner}" = "xtrue"; then
@@ -560,8 +558,8 @@
 # need the Javascript headers, otherwise we do. Debian packages the Javascript
 # files from XulRunner into a separate directory, so detect that and we'll look
 # for them later
-if $have_full_gecko ; then
-   if test -f "$GECKO_INCLUDEDIR/js/jspubtd.h" ; then
+if $have_xulrunner || $have_full_gecko ; then
+   if test -f "$GECKO_INCLUDEDIR/js/jspubtd.h" -o -f "$GECKO_INCLUDEDIR/unstable/jspubtd.h" ; then
       :
    else
        need_separate_js=true