2007-05-13 Michael Hutchinson <m.j.hutchinson@gmail.com>

* jscall-sharp.pc.in, configure.ac: Updated to reflect weaker 
	  dependence on Mozilla, including lack of C++ code.
	  Bump version to 0.0.3. 


svn path=/trunk/jscall-sharp/; revision=77312
This commit is contained in:
Michael Hutchinson 2007-05-13 14:53:34 +00:00
Родитель 5b8ddd91fe
Коммит 19e95e0d9c
3 изменённых файлов: 7 добавлений и 51 удалений

Просмотреть файл

@ -1,3 +1,9 @@
2007-05-13 Michael Hutchinson <m.j.hutchinson@gmail.com>
* jscall-sharp.pc.in, configure.ac: Updated to reflect weaker
dependence on Mozilla, including lack of C++ code.
Bump version to 0.0.3.
2007-04-02 Michael Hutchinson <m.j.hutchinson@gmail.com>
* COPYING: Explicitly name the MIT/X11 license.

Просмотреть файл

@ -1,11 +1,9 @@
AC_INIT(README)
AC_CANONICAL_SYSTEM
AM_INIT_AUTOMAKE(jscall-sharp, 0.0.2)
AM_INIT_AUTOMAKE(jscall-sharp, 0.0.3)
AM_MAINTAINER_MODE
AM_PROG_LIBTOOL
AC_PROG_INSTALL
AC_PROG_CXX
### Dependency version numbers
@ -13,10 +11,6 @@ MONO_REQUIRED_VERSION=1.1.9
GTKSHARP_REQUIRED_VERSION=2.4
GECKOSHARP_REQUIRED_VERSION=0.10
m4_define(gtk_required_version, 2.6.0)
m4_define(mozilla_required_version, 1.6)
m4_define(firefox_required_version, 1.0)
m4_define(xulrunner_required_version, 1.8)
### Check for pkg-config
AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
if test "x$PKG_CONFIG" = "xno"; then
@ -69,51 +63,10 @@ AC_SUBST(GACUTIL_FLAGS)
PKG_CHECK_MODULES(GTKSHARP, gtk-sharp-2.0 >= $GTKSHARP_REQUIRED_VERSION)
PKG_CHECK_MODULES(GECKOSHARP, gecko-sharp-2.0 >= $GECKOSHARP_REQUIRED_VERSION)
### Check for C++/Mozilla dependencies (inspired by gnome-python-extras)
AC_ARG_WITH(gtkmozembed, AS_HELP_STRING(
[--with-gtkmozembed=mozilla|firefox],
[package that provides libgtkmozembed]),
[mozpackage=$withval], [mozpackage=any])
if test $mozpackage = any ; then
AC_MSG_CHECKING(for Gecko development files)
if $PKG_CONFIG --exists mozilla-gtkmozembed; then
AC_MSG_RESULT([Mozilla detected])
mozpackage=mozilla
else
if $PKG_CONFIG --exists firefox-gtkmozembed; then
AC_MSG_RESULT([Firefox detected])
mozpackage=firefox
else
if $PKG_CONFIG --exists xulrunner-gtkmozembed; then
AC_MSG_RESULT([XulRunner detected])
mozpackage=xulrunner
else
AC_MSG_ERROR([Neither Firefox nor Mozilla development packages were detected])
fi
fi
fi
fi
case $mozpackage in
firefox) mozpackage_required_version=firefox_required_version ;;
mozilla) mozpackage_required_version=mozilla_required_version ;;
xulrunner) mozpackage_required_version=xulrunner_required_version ;;
*) AC_MSG_ERROR([--with-gtkmozembed argument must be either 'mozilla' or 'firefox'])
esac
MOZILLA_HOME="`$PKG_CONFIG --variable=libdir $mozpackage-gtkmozembed`"
AC_SUBST(MOZILLA_HOME)
PKG_CHECK_MODULES(JSGLUEDEPS, [$mozpackage-gtkmozembed >= $mozpackage_required_version,
$mozpackage-xpcom >= $mozpackage_required_version
gtk+-2.0 >= gtk_required_version])
AC_OUTPUT([
Makefile
jscall-sharp.pc
src/Makefile
src/jscallglue/Makefile
src/AssemblyInfo.cs
src/jscall.dll.config
])
@ -124,6 +77,4 @@ echo ""
echo " * Installation prefix = $prefix"
echo " * C# compiler = $MCS"
echo " * C# compiler options = $MCS_OPTIONS"
echo " * Gecko libraries from: $mozpackage"
echo " * $mozpackage home: $MOZILLA_HOME"
echo ""

Просмотреть файл

@ -4,7 +4,6 @@ libdir=@libdir@
includedir=@includedir@
Libraries=@libdir@/jscall-sharp/jscall.dll
Script=@libdir@/jscall-sharp/JSCall.js
MozillaHome=@MOZILLA_HOME@
Name: jscall-sharp
Description: jscall-sharp - Limited JavaScript bridge for Gecko#