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

Collapse All | Expand All

(-)configure.in.old (-28 / +58 lines)
Lines 62-111 Link Here
62
AC_SUBST(GNOME_SHARP_LIBS)
62
AC_SUBST(GNOME_SHARP_LIBS)
63
AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_gnome" = "xyes")
63
AM_CONDITIONAL(ENABLE_GNOME, test "x$enable_gnome" = "xyes")
64
64
65
PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-3.14, enable_gtkhtml=yes, enable_gtkhtml=no)
65
AC_ARG_ENABLE(gtkhtml,
66
if test "x$enable_gtkhtml" = "xyes"; then
66
	      AC_HELP_STRING([--enable-gtkhtml], [Use GTKHTML Browser]),,
67
	CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14 $CSHARP_FLAGS"
67
	      enable_gtkhtml=yes)
68
else
68
69
	PKG_CHECK_MODULES(GTKHTML_SHARP, gtkhtml-sharp-2.0, enable_gtkhtml=yes, enable_gtkhtml=no)
69
if test "x$enable_gtkhtml" = "xyes" ; then
70
	PKG_CHECK_MODULES([GTKHTML_SHARP],
71
			[gtkhtml-sharp-3.14],
72
			[CSHARP_FLAGS="-d:GTKHTML_SHARP_3_14"],
73
				[
74
					PKG_CHECK_MODULES([GTKHTML_SHARP],
75
						[gtkhtml-sharp-2.0],
76
						[CSHARP_FLAGS=""],
77
						[])
78
				]
79
			)
80
       AC_SUBST(GTKHTML_SHARP_LIBS)
81
       AC_SUBST(CSHARP_FLAGS)
70
fi
82
fi
71
AC_SUBST(GTKHTML_SHARP_LIBS)
83
72
AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes")
84
AM_CONDITIONAL(ENABLE_GTKHTML, test "x$enable_gtkhtml" = "xyes")
73
85
74
AC_SUBST(CSHARP_FLAGS)
86
AC_ARG_ENABLE(gecko,
87
             AC_HELP_STRING([--enable-gecko], [Use Gecko / Xulrunner-1.8 browser libs]),,
88
             enable_gecko=yes)
89
90
if test "x$enable_gecko" = "xyes" ; then
91
       PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0)
92
93
       AC_SUBST(GECKO_SHARP_LIBS)
94
95
       # get the mozilla home directory
96
       MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
97
       AC_SUBST(MOZILLA_HOME)
98
fi
75
99
76
PKG_CHECK_MODULES(GECKO_SHARP, gecko-sharp-2.0, enable_gecko=yes, enable_gecko=no)
77
AC_SUBST(GECKO_SHARP_LIBS)
78
AM_CONDITIONAL(ENABLE_GECKO, test "x$enable_gecko" = "xyes")
100
AM_CONDITIONAL(ENABLE_GECKO, test "x$enable_gecko" = "xyes")
79
101
80
if test "x$enable_gecko" = "xyes"; then
102
AC_ARG_ENABLE(webkit,
81
   # get the mozilla home directory
103
             AC_HELP_STRING([--enable-webkit], [Use Webkit browser]),,
82
   MOZILLA_HOME="`$PKG_CONFIG --variable=libdir mozilla-gtkmozembed`"
104
             enable_webkit=yes)
83
   AC_SUBST(MOZILLA_HOME)
105
106
if test "x$enable_webkit" = "xyes" ; then
107
	PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0)
108
	AC_SUBST(WEBKIT_SHARP_LIBS)
84
fi
109
fi
85
110
86
PKG_CHECK_MODULES(WEBKIT_SHARP, webkit-sharp-1.0, enable_webkit=yes, enable_webkit=no)
87
AC_SUBST(WEBKIT_SHARP_LIBS)
88
AM_CONDITIONAL(ENABLE_WEBKIT, test "x$enable_webkit" = "xyes")
111
AM_CONDITIONAL(ENABLE_WEBKIT, test "x$enable_webkit" = "xyes")
89
112
90
# PKG_CHECK_MODULES(MONOWEBBROWSER, mono-webbrowser, enable_monowebbrowser=yes, enable_monowebbrowser=no)
113
# PKG_CHECK_MODULES(MONOWEBBROWSER, mono-webbrowser, enable_monowebbrowser=yes, enable_monowebbrowser=no)
91
# AC_SUBST(MONOWEBBROWSER_LIBS)
114
# AC_SUBST(MONOWEBBROWSER_LIBS)
92
115
93
AC_MSG_CHECKING([for Mono.WebBrowser])
116
AC_ARG_ENABLE(monowebbrowser,
94
if test "x$GACUTIL" = "xno"
117
             AC_HELP_STRING([--enable-monowebbrowser], [Use Mono.Webbrowser]),,
95
then
118
             enable_monowebbrowser=yes)
96
   	AC_MSG_RESULT([no])
119
97
	if test "x$enable_monowebbrowser" = "x" ; then enable_monowebbrowser=no ; fi
120
if test "x$enable_monowebbrowser" = "xyes" ; then
98
else
121
	AC_MSG_CHECKING([for Mono.WebBrowser])
99
	if $GACUTIL -l Mono.WebBrowser | grep -q "Mono.WebBrowser" 
122
	if test "x$GACUTIL" = "xno"
100
	then
123
	then
101
		AC_MSG_RESULT([yes])
102
		enable_monowebbrowser=yes
103
	else
104
		AC_MSG_RESULT([no])
124
		AC_MSG_RESULT([no])
105
		enable_monowebbrowser=no
125
		if test "x$enable_monowebbrowser" = "x" ; then enable_monowebbrowser=no ; fi
106
	fi  
126
	else
127
		if $GACUTIL -l Mono.WebBrowser | grep -q "Mono.WebBrowser"
128
		then
129
			AC_MSG_RESULT([yes])
130
			enable_monowebbrowser=yes
131
			MONOWEBBROWSER_LIBS=-r:Mono.WebBrowser
132
		else
133
			AC_MSG_RESULT([no])
134
			enable_monowebbrowser=no
135
		fi
136
	fi
107
fi
137
fi
108
MONOWEBBROWSER_LIBS=-r:Mono.WebBrowser
138
109
AM_CONDITIONAL(ENABLE_MONOWEBBROWSER, test "x$enable_monowebbrowser" = "xyes")
139
AM_CONDITIONAL(ENABLE_MONOWEBBROWSER, test "x$enable_monowebbrowser" = "xyes")
110
140
111
if test "x$enable_gtkhtml$enable_gecko$enable_monowebbrowser$enable_webkit" = "xnononono" ; then
141
if test "x$enable_gtkhtml$enable_gecko$enable_monowebbrowser$enable_webkit" = "xnononono" ; then

Return to bug 340045