View | Details | Raw Unified | Return to bug 129619
Collapse All | Expand All

(-)/home/rocallahan/tmp/epiphany-1.8.2/configure.ac (-2 / +3 lines)
Lines 159-207 if test "x$enable_maintainer_mode" = "xy Link Here
159
        AM_CFLAGS="$_SAVE_AM_CFLAGS"
159
        AM_CFLAGS="$_SAVE_AM_CFLAGS"
160
        CFLAGS="$_SAVE_CFLAGS"
160
        CFLAGS="$_SAVE_CFLAGS"
161
        AC_LANG_POP([C])
161
        AC_LANG_POP([C])
162
fi
162
fi
163
163
164
dnl *******
164
dnl *******
165
dnl Mozilla
165
dnl Mozilla
166
dnl *******
166
dnl *******
167
167
168
AC_MSG_CHECKING([which gecko to use])
168
AC_MSG_CHECKING([which gecko to use])
169
169
170
AC_ARG_WITH([mozilla],
170
AC_ARG_WITH([mozilla],
171
        AS_HELP_STRING([--with-mozilla@<:@=mozilla|firefox|thunderbird@:>@],
171
        AS_HELP_STRING([--with-mozilla@<:@=mozilla|firefox|thunderbird|xulrunner@:>@],
172
                       [Which gecko engine to use (default: autodetect)]))
172
                       [Which gecko engine to use (default: autodetect)]))
173
173
174
GECKOS="firefox mozilla-firefox seamonkey mozilla thunderbird mozilla-thunderbird"
174
GECKOS="firefox mozilla-firefox seamonkey mozilla thunderbird mozilla-thunderbird xulrunner"
175
gecko=$with_mozilla
175
gecko=$with_mozilla
176
176
177
if test "x$gecko" = "x"; then
177
if test "x$gecko" = "x"; then
178
        dnl Autodetect gecko
178
        dnl Autodetect gecko
179
        for g in $GECKOS; do
179
        for g in $GECKOS; do
180
                if $PKG_CONFIG --exists $g-xpcom; then
180
                if $PKG_CONFIG --exists $g-xpcom; then
181
                        gecko=$g
181
                        gecko=$g
182
                        break;
182
                        break;
183
                fi
183
                fi
184
        done
184
        done
185
fi
185
fi
186
186
187
if test "x$gecko" = "x"; then
187
if test "x$gecko" = "x"; then
188
        AC_MSG_ERROR([No gecko found])
188
        AC_MSG_ERROR([No gecko found])
189
elif ! ( echo "$GECKOS" | egrep "(^| )$gecko(\$| )" > /dev/null); then
189
elif ! ( echo "$GECKOS" | egrep "(^| )$gecko(\$| )" > /dev/null); then
190
        AC_MSG_ERROR([Unknown gecko "$gecko" specified])
190
        AC_MSG_ERROR([Unknown gecko "$gecko" specified])
191
fi
191
fi
192
192
193
AC_MSG_RESULT([$gecko])
193
AC_MSG_RESULT([$gecko])
194
194
195
case "$gecko" in
195
case "$gecko" in
196
xulrunner) min_version=1.8 flavour=toolkit ;;
196
mozilla) min_version=1.7.9 flavour=mozilla ;;
197
mozilla) min_version=1.7.9 flavour=mozilla ;;
197
seamonkey) min_version=1.0 flavour=mozilla ;;
198
seamonkey) min_version=1.0 flavour=mozilla ;;
198
*firefox) min_version=1.0.5 flavour=toolkit ;;
199
*firefox) min_version=1.0.5 flavour=toolkit ;;
199
*thunderbird) min_version=1.0.5 flavour=toolkit ;;
200
*thunderbird) min_version=1.0.5 flavour=toolkit ;;
200
esac
201
esac
201
202
202
MOZILLA=$gecko
203
MOZILLA=$gecko
203
AC_SUBST([MOZILLA])
204
AC_SUBST([MOZILLA])
204
205
205
MOZILLA_FLAVOUR=$flavour
206
MOZILLA_FLAVOUR=$flavour
206
AC_SUBST([MOZILLA_FLAVOUR])
207
AC_SUBST([MOZILLA_FLAVOUR])
207
208

Return to bug 129619