]>
Commit | Line | Data |
---|---|---|
7fc58255 MK |
1 | diff -Nuard gecko-sharp-0.5.orig/configure.in gecko-sharp-0.5/configure.in |
2 | --- gecko-sharp-0.5.orig/configure.in 2004-06-14 23:42:35.000000000 +0200 | |
3 | +++ gecko-sharp-0.5/configure.in 2004-07-02 10:27:42.069003672 +0200 | |
4 | @@ -14,11 +14,11 @@ | |
5 | fi | |
6 | AC_MSG_RESULT($from_cvs) | |
7 | ||
8 | -AC_PATH_PROG(MONO, mono) | |
9 | +dnl AC_PATH_PROG(MONO, mono) | |
10 | AC_PATH_PROG(MCS, mcs) | |
11 | -if test "x$MONO" = "x" ; then | |
12 | - AC_MSG_ERROR([Can't find "mono" in your PATH]) | |
13 | -fi | |
14 | +dnl if test "x$MONO" = "x" ; then | |
15 | +dnl AC_MSG_ERROR([Can't find "mono" in your PATH]) | |
16 | +dnl fi | |
17 | if test "x$MCS" = "x" ; then | |
18 | AC_MSG_ERROR([Can't find "mcs" in your PATH]) | |
19 | fi | |
20 | @@ -40,7 +40,26 @@ | |
21 | GTK_REQUIRED_VERSION=2.0.0 | |
22 | MONO_REQUIRED_VERSION=0.95 | |
23 | ||
24 | -PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk+-2.0 >= $GTK_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION mono >= $MONO_REQUIRED_VERSION) | |
25 | +PKG_CHECK_MODULES(BASE_DEPENDENCIES, gtk+-2.0 >= $GTK_REQUIRED_VERSION gmodule-2.0 >= $GTK_REQUIRED_VERSION) | |
26 | + | |
27 | +PKG_CHECK_MODULES(BASE_DEPENDENCIES_RUNTIME, mono >= $MONO_REQUIRED_VERSION, has_mono=true, has_mono=false) | |
28 | +PKG_CHECK_MODULES(BASE_DEPENDENCIES_RUNTIME, mint >= $MONO_REQUIRED_VERSION, has_mint=true, has_mint=false) | |
29 | + | |
30 | +if test "x$has_mono" = "xtrue"; then | |
31 | + echo "using mono" | |
32 | + RUNTIME="mono --debug" | |
33 | +else | |
34 | + if test "x$has_mint" = "xtrue"; then | |
35 | + echo "using mint" | |
36 | + RUNTIME="mint" | |
37 | + else | |
38 | + AC_MSG_ERROR([Unable to find mono or mint packages]); | |
39 | + fi | |
40 | +fi | |
41 | +AC_SUBST(RUNTIME) | |
42 | + | |
43 | +BASE_DEPENDENCIES_CFLAGS="$BASE_DEPENDENCIES_CFLAGS $BASE_DEPENDENCIES_RUNTIME_CFLAGS" | |
44 | +BASE_DEPENDENCIES_LIBS="$BASE_DEPENDENCIES_LIBS $BASE_DEPENDENCIES_RUNTIME_LIBS" | |
45 | ||
46 | AC_SUBST(BASE_DEPENDENCIES_CFLAGS) | |
47 | AC_SUBST(BASE_DEPENDENCIES_LIBS) | |
48 | diff -Nuard gecko-sharp-0.5.orig/gecko-sharp.pc.in gecko-sharp-0.5/gecko-sharp.pc.in | |
49 | --- gecko-sharp-0.5.orig/gecko-sharp.pc.in 2004-06-16 06:28:07.000000000 +0200 | |
50 | +++ gecko-sharp-0.5/gecko-sharp.pc.in 2004-07-02 10:28:00.600186504 +0200 | |
51 | @@ -1,6 +1,6 @@ | |
52 | prefix=@prefix@ | |
53 | exec_prefix=${prefix} | |
54 | -libdir=${exec_prefix}/lib | |
55 | +libdir=@libdir@ | |
56 | ||
57 | Name: Gecko# | |
58 | Description: Gecko# - A Gtk# Mozilla binding | |
59 | diff -Nuard gecko-sharp-0.5.orig/gtkmozembed/Makefile.am gecko-sharp-0.5/gtkmozembed/Makefile.am | |
60 | --- gecko-sharp-0.5.orig/gtkmozembed/Makefile.am 2004-06-14 18:50:51.000000000 +0200 | |
61 | +++ gecko-sharp-0.5/gtkmozembed/Makefile.am 2004-07-02 10:28:49.293783952 +0200 | |
62 | @@ -31,10 +31,10 @@ | |
63 | $(API): $(srcdir)/$(RAW_API) $(srcdir)/$(METADATA) | |
64 | cp $(srcdir)/$(RAW_API) $(API) | |
65 | chmod u+w $(API) | |
66 | - mono $(GTKSHARP_PREFIX)/bin/gapi-fixup.exe --api=$(srcdir)/$(API) --metadata=$(srcdir)/$(METADATA) | |
67 | + $(RUNTIME) $(GTKSHARP_PREFIX)/bin/gapi-fixup.exe --api=$(srcdir)/$(API) --metadata=$(srcdir)/$(METADATA) | |
68 | ||
69 | generated-stamp: $(API) | |
70 | - mono $(GTKSHARP_PREFIX)/bin/gapi_codegen.exe --generate $(srcdir)/$(API) --include $(INCLUDE_APIS) --outdir=generated --customdir=$(srcdir) --assembly-name=gecko-sharp && touch generated-stamp | |
71 | + $(RUNTIME) $(GTKSHARP_PREFIX)/bin/gapi_codegen.exe --generate $(srcdir)/$(API) --include $(INCLUDE_APIS) --outdir=generated --customdir=$(srcdir) --assembly-name=gecko-sharp && touch generated-stamp | |
72 | ||
73 | gecko-sharp.snk: $(top_srcdir)/gecko-sharp.snk | |
74 | cp $(top_srcdir)/gecko-sharp.snk . |