Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 147845 | Differences between
and this patch

Collapse All | Expand All

(-)configure.ac (-9 / +11 lines)
Lines 14-20 Link Here
14
GECKOSHARP_REQUIRED_VERSION=0.10
14
GECKOSHARP_REQUIRED_VERSION=0.10
15
15
16
m4_define(gtk_required_version,               2.6.0)
16
m4_define(gtk_required_version,               2.6.0)
17
m4_define(mozilla_required_version,           1.6)
17
m4_define(seamonkey_required_version,         1.0)
18
m4_define(firefox_required_version,           1.0)
18
m4_define(firefox_required_version,           1.0)
19
m4_define(xulrunner_required_version,         1.8)
19
m4_define(xulrunner_required_version,         1.8)
20
### Check for pkg-config
20
### Check for pkg-config
Lines 75-83 Link Here
75
75
76
if test $mozpackage = any ; then
76
if test $mozpackage = any ; then
77
	AC_MSG_CHECKING(for Gecko development files)
77
	AC_MSG_CHECKING(for Gecko development files)
78
	if $PKG_CONFIG --exists mozilla-gtkmozembed; then
78
	if $PKG_CONFIG --exists seamonkey-gtkmozembed; then
79
	    AC_MSG_RESULT([Mozilla detected])
79
	    AC_MSG_RESULT([Seamonkey detected])
80
	    mozpackage=mozilla
80
	    mozpackage=seamonkey
81
	else
81
	else
82
	    if $PKG_CONFIG --exists firefox-gtkmozembed; then
82
	    if $PKG_CONFIG --exists firefox-gtkmozembed; then
83
	        AC_MSG_RESULT([Firefox detected])
83
	        AC_MSG_RESULT([Firefox detected])
Lines 87-101 Link Here
87
		  AC_MSG_RESULT([XulRunner detected])
87
		  AC_MSG_RESULT([XulRunner detected])
88
		  mozpackage=xulrunner
88
		  mozpackage=xulrunner
89
		else
89
		else
90
	          AC_MSG_ERROR([Neither Firefox nor Mozilla development packages were detected])
90
	          AC_MSG_ERROR([Neither Firefox nor Seamonkey development packages were detected])
91
	        fi
91
	        fi
92
	    fi
92
	    fi
93
	fi
93
	fi
94
fi
94
fi
95
95
96
case $mozpackage in
96
case $mozpackage in
97
     firefox) mozpackage_required_version=firefox_required_version ;;
97
     firefox)   mozpackage_required_version=firefox_required_version ;;
98
     mozilla) mozpackage_required_version=mozilla_required_version ;;
98
     seamonkey) mozpackage_required_version=seamonkey_required_version ;;
99
     xulrunner) mozpackage_required_version=xulrunner_required_version ;;
99
     xulrunner) mozpackage_required_version=xulrunner_required_version ;;
100
     *) AC_MSG_ERROR([--with-gtkmozembed argument must be either 'mozilla' or 'firefox'])
100
     *) AC_MSG_ERROR([--with-gtkmozembed argument must be either 'mozilla' or 'firefox'])
101
esac
101
esac
Lines 104-112 Link Here
104
AC_SUBST(MOZILLA_HOME)
104
AC_SUBST(MOZILLA_HOME)
105
105
106
PKG_CHECK_MODULES(JSGLUEDEPS, [$mozpackage-gtkmozembed >= $mozpackage_required_version,
106
PKG_CHECK_MODULES(JSGLUEDEPS, [$mozpackage-gtkmozembed >= $mozpackage_required_version,
107
                               $mozpackage-xpcom >= $mozpackage_required_version
107
                               $mozpackage-xpcom >= $mozpackage_required_version,
108
                               gtk+-2.0                >= gtk_required_version])
108
                               gtk+-2.0 >= gtk_required_version])
109
109
110
JSGLUEDEPS_CFLAGS+=" -I${MOZILLA_HOME}/include/dom -I${MOZILLA_HOME}/include/webbrwsr"
111
AC_SUBST(JSGLUEDEPS_CFLAGS)
110
AC_OUTPUT([
112
AC_OUTPUT([
111
Makefile
113
Makefile
112
jscall-sharp.pc
114
jscall-sharp.pc

Return to bug 147845