1 --- galeon-libxul/configure.in.orig 2008-07-06 02:58:17.000000000 +0200
2 +++ galeon-libxul/configure.in 2008-07-24 11:28:05.000000000 +0200
4 if $PKG_CONFIG --exists $g-xpcom; then
7 + elif $PKG_CONFIG --exists $g; then
14 PKG_CHECK_MODULES(XPCOM_COMPONENT, $MOZILLA_XPCOM >= $min_version)
16 MOZILLA_INCLUDE_ROOT="`$PKG_CONFIG --variable=includedir $MOZILLA_XPCOM`"
17 -if test $MOZILLA = libxul-embedding-unstable; then
18 - MOZILLA_INCLUDE_ROOT="$MOZILLA_INCLUDE_ROOT/`$PKG_CONFIG --variable=includetype $MOZILLA_XPCOM`"
20 AC_SUBST(MOZILLA_INCLUDE_ROOT)
22 PKG_CHECK_MODULES(MOZILLA_COMPONENT, $MOZILLA_GTKMOZEMBED >= $min_version,
24 MOZILLA_COMPONENT_LIBS="$XPCOM_COMPONENT_LIBS -lxul"
27 -#if test $MOZILLA = xulrunner; then
28 -# MOZILLA_COMPONENT_LIBS="$MOZILLA_COMPONENT_LIBS -lxul"
30 +if test $MOZILLA = libxul-embedding-unstable; then
31 + MOZILLA_COMPONENT_CFLAGS="$MOZILLA_COMPONENT_CFLAGS -I$MOZILLA_INCLUDE_ROOT/gtkembedmoz"
32 + MOZILLA_COMPONENT_LIBS="$MOZILLA_COMPONENT_LIBS -lxul"
35 AC_SUBST(MOZILLA_COMPONENT_CFLAGS)
36 AC_SUBST(MOZILLA_COMPONENT_LIBS)
38 #CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT $MOZILLA_COMPONENT_CFLAGS $GALEON_DEPENDENCY_CFLAGS"
39 #CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT $MOZILLA_COMPONENT_CFLAGS"
40 #LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS $MOZILLA_COMPONENT_LIBS"
41 -CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT `$PKG_CONFIG --cflags-only-I $MOZILLA-xpcom` $GALEON_DEPENDENCY_CFLAGS"
42 -CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA-xpcom`"
43 -LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS `pkg-config --libs $MOZILLA-xpcom`"
44 +CPPFLAGS="-I$MOZILLA_INCLUDE_ROOT `$PKG_CONFIG --cflags-only-I $MOZILLA-xpcom` `$PKG_CONFIG --cflags-only-I $MOZILLA` $GALEON_DEPENDENCY_CFLAGS"
45 +CXXFLAGS="$_SAVE_CXXFLAGS $AM_CXXFLAGS -I$MOZILLA_INCLUDE_ROOT `pkg-config --cflags $MOZILLA-xpcom` `pkg-config --cflags $MOZILLA`"
46 +LDFLAGS="$_SAVE_LDFLAGS $AM_LDFLAGS `pkg-config --libs $MOZILLA-xpcom` `pkg-config --libs $MOZILLA`"
49 -TEST_MOZILLA_INCLUDE_DIRS="widget mimetype docshell history dom necko string layout gfx content js exthandler pipnss uriloader caps xpconnect nkcache fastfind gtkembedmoz chrome"
50 +TEST_MOZILLA_INCLUDE_DIRS="widget mimetype docshell history dom necko string layout gfx content xpcom js exthandler pipnss uriloader caps xpconnect nkcache fastfind gtkembedmoz chrome"
51 for i in $TEST_MOZILLA_INCLUDE_DIRS ; do
52 CXXFLAGS="$CXXFLAGS -I$MOZILLA_INCLUDE_ROOT/$i"