Skip to content

R
riscv-gcc-1
Commit 348cf028 by Thomas Fitzsimmons Committed by Thomas Fitzsimmons
Options

configure.ac (ac_configure_args): Add --disable-plugin. 

2006-06-10  Thomas Fitzsimmons  <fitzsim@redhat.com>

	* configure.ac (ac_configure_args): Add --disable-plugin.
	(--enable-gtk-cairo): Remove option.
	* configure: Regenerate.

From-SVN: r114540
parent 410fce92
Showing with 10 additions and 251 deletions
libjava/ChangeLog
2006-06-10 Thomas Fitzsimmons <fitzsim@redhat.com>
* configure.ac (ac_configure_args): Add --disable-plugin.
(--enable-gtk-cairo): Remove option.
* configure: Regenerate.
2006-06-09 Tom Tromey <tromey@redhat.com> 2006-06-09 Tom Tromey <tromey@redhat.com>
PR libgcj/27730: PR libgcj/27730:
......
libjava/configure
...@@ -310,7 +310,7 @@ ac_includes_default="\ ...@@ -310,7 +310,7 @@ ac_includes_default="\
# include <unistd.h> # include <unistd.h>
#endif" #endif"
ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir libgcj_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP BASH_JAR_TRUE BASH_JAR_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GCJH INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS GTK_CAIRO_TRUE GTK_CAIRO_FALSE PKG_CONFIG CAIRO_CFLAGS CAIRO_LIBS PANGOFT2_CFLAGS PANGOFT2_LIBS extra_ldflags_libjava GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir dbexecdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL SYSDEP_SOURCES LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here LIBOBJS LTLIBOBJS' ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os build_subdir host_subdir target_subdir libgcj_basedir host host_cpu host_vendor host_os target target_cpu target_vendor target_os target_noncanonical LN_S mkinstalldirs CC ac_ct_CC EXEEXT OBJEXT CXX ac_ct_CXX CFLAGS CXXFLAGS LDFLAGS INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE AS ac_ct_AS LD ac_ct_LD AR ac_ct_AR RANLIB ac_ct_RANLIB JAR ZIP UNZIP BASH_JAR_TRUE BASH_JAR_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GCJH INCLTDL LIBLTDL DIRLTDL LIBTOOL CXXCPP CPPFLAGS GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME INTERPRETER LIBFFI LIBFFIINCS PLATFORM_INNER_NAT_HDRS CPP EGREP USING_WIN32_PLATFORM_TRUE USING_WIN32_PLATFORM_FALSE USING_POSIX_PLATFORM_TRUE USING_POSIX_PLATFORM_FALSE USING_DARWIN_CRT_TRUE USING_DARWIN_CRT_FALSE SYSTEMSPEC LIBGCJTESTSPEC ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava GCLIBS GCINCS GCDEPS GCSPEC JC1GCSPEC GCTESTSPEC USING_BOEHMGC_TRUE USING_BOEHMGC_FALSE USING_NOGC_TRUE USING_NOGC_FALSE THREADLIBS THREADINCS THREADDEPS THREADSPEC THREADLDFLAGS THREADCXXFLAGS USING_POSIX_THREADS_TRUE USING_POSIX_THREADS_FALSE USING_WIN32_THREADS_TRUE USING_WIN32_THREADS_FALSE USING_NO_THREADS_TRUE USING_NO_THREADS_FALSE HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_LIBS LIBART_CFLAGS LIBART_LIBS CLASSPATH_SEPARATOR ac_ct_GCJ ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir dbexecdir GCJVERSION gxx_include_dir libstdcxx_incdir ALLOCA PERL SYSDEP_SOURCES LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here LIBOBJS LTLIBOBJS'
ac_subst_files='' ac_subst_files=''
# Initialize some variables set by options. # Initialize some variables set by options.
...@@ -873,7 +873,6 @@ Optional Features: ...@@ -873,7 +873,6 @@ Optional Features:
force use of builtin_setjmp for exceptions force use of builtin_setjmp for exceptions
--disable-java-net disable java.net --disable-java-net disable java.net
--disable-jvmpi disable JVMPI support --disable-jvmpi disable JVMPI support
--enable-gtk-cairo build the cairo Graphics2D implementation on GTK
--enable-java-gc=TYPE choose garbage collector (default is boehm) --enable-java-gc=TYPE choose garbage collector (default is boehm)
--disable-rpath do not hardcode runtime library paths --disable-rpath do not hardcode runtime library paths
_g_switchUse thread-local storage _g_switchUse thread-local storage
...@@ -4995,6 +4994,7 @@ ac_configure_args="$ac_configure_args --with-vm-classes=$dir1:$dir2" ...@@ -4995,6 +4994,7 @@ ac_configure_args="$ac_configure_args --with-vm-classes=$dir1:$dir2"
ac_configure_args="$ac_configure_args --disable-core-jni" ac_configure_args="$ac_configure_args --disable-core-jni"
ac_configure_args="$ac_configure_args --disable-examples" ac_configure_args="$ac_configure_args --disable-examples"
ac_configure_args="$ac_configure_args --with-glibj=build" ac_configure_args="$ac_configure_args --with-glibj=build"
ac_configure_args="$ac_configure_args --disable-plugin"
if test "$use_gtk_awt" != yes; then if test "$use_gtk_awt" != yes; then
ac_configure_args="$ac_configure_args --disable-gtk-peer" ac_configure_args="$ac_configure_args --disable-gtk-peer"
fi fi
...@@ -8949,226 +8949,6 @@ fi ...@@ -8949,226 +8949,6 @@ fi
fi fi
# determine whether to enable the cairo GTK Graphics2D backend
# Check whether --enable-gtk-cairo or --disable-gtk-cairo was given.
if test "${enable_gtk_cairo+set}" = set; then
enableval="$enable_gtk_cairo"
fi;
if test "x${enable_gtk_cairo}" = xyes; then
GTK_CAIRO_TRUE=
GTK_CAIRO_FALSE='#'
else
GTK_CAIRO_TRUE='#'
GTK_CAIRO_FALSE=
fi
if test "x${enable_gtk_cairo}" = xyes
then
succeeded=no
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
echo "${ECHO_T}$PKG_CONFIG" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
fi
if test "$PKG_CONFIG" = "no" ; then
echo "*** The pkg-config script could not be found. Make sure it is"
echo "*** in your path, or set the PKG_CONFIG environment variable"
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo "$as_me:$LINENO: checking for cairo" >&5
echo $ECHO_N "checking for cairo... $ECHO_C" >&6
if $PKG_CONFIG --exists "cairo" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
succeeded=yes
echo "$as_me:$LINENO: checking CAIRO_CFLAGS" >&5
echo $ECHO_N "checking CAIRO_CFLAGS... $ECHO_C" >&6
CAIRO_CFLAGS=`$PKG_CONFIG --cflags "cairo"`
echo "$as_me:$LINENO: result: $CAIRO_CFLAGS" >&5
echo "${ECHO_T}$CAIRO_CFLAGS" >&6
echo "$as_me:$LINENO: checking CAIRO_LIBS" >&5
echo $ECHO_N "checking CAIRO_LIBS... $ECHO_C" >&6
CAIRO_LIBS=`$PKG_CONFIG --libs "cairo"`
echo "$as_me:$LINENO: result: $CAIRO_LIBS" >&5
echo "${ECHO_T}$CAIRO_LIBS" >&6
else
CAIRO_CFLAGS=""
CAIRO_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
CAIRO_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "cairo"`
echo $CAIRO_PKG_ERRORS
fi
else
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
echo "*** See http://www.freedesktop.org/software/pkgconfig"
fi
fi
if test $succeeded = yes; then
:
else
{ { echo "$as_me:$LINENO: error: Library requirements (cairo) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
echo "$as_me: error: Library requirements (cairo) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
{ (exit 1); exit 1; }; }
fi
succeeded=no
if test -z "$PKG_CONFIG"; then
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
echo "${ECHO_T}$PKG_CONFIG" >&6
else
echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6
fi
fi
if test "$PKG_CONFIG" = "no" ; then
echo "*** The pkg-config script could not be found. Make sure it is"
echo "*** in your path, or set the PKG_CONFIG environment variable"
echo "*** to the full path to pkg-config."
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
else
PKG_CONFIG_MIN_VERSION=0.9.0
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
echo "$as_me:$LINENO: checking for pangoft2" >&5
echo $ECHO_N "checking for pangoft2... $ECHO_C" >&6
if $PKG_CONFIG --exists "pangoft2" ; then
echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
succeeded=yes
echo "$as_me:$LINENO: checking PANGOFT2_CFLAGS" >&5
echo $ECHO_N "checking PANGOFT2_CFLAGS... $ECHO_C" >&6
PANGOFT2_CFLAGS=`$PKG_CONFIG --cflags "pangoft2"`
echo "$as_me:$LINENO: result: $PANGOFT2_CFLAGS" >&5
echo "${ECHO_T}$PANGOFT2_CFLAGS" >&6
echo "$as_me:$LINENO: checking PANGOFT2_LIBS" >&5
echo $ECHO_N "checking PANGOFT2_LIBS... $ECHO_C" >&6
PANGOFT2_LIBS=`$PKG_CONFIG --libs "pangoft2"`
echo "$as_me:$LINENO: result: $PANGOFT2_LIBS" >&5
echo "${ECHO_T}$PANGOFT2_LIBS" >&6
else
PANGOFT2_CFLAGS=""
PANGOFT2_LIBS=""
## If we have a custom action on failure, don't print errors, but
## do set a variable so people can do so.
PANGOFT2_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "pangoft2"`
echo $PANGOFT2_PKG_ERRORS
fi
else
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
echo "*** See http://www.freedesktop.org/software/pkgconfig"
fi
fi
if test $succeeded = yes; then
:
else
{ { echo "$as_me:$LINENO: error: Library requirements (pangoft2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&5
echo "$as_me: error: Library requirements (pangoft2) not met; consider adjusting the PKG_CONFIG_PATH environment variable if your libraries are in a nonstandard prefix so pkg-config can find them." >&2;}
{ (exit 1); exit 1; }; }
fi
fi
# FIXME: this should be _libs on some hosts. # FIXME: this should be _libs on some hosts.
libsubdir=.libs libsubdir=.libs
...@@ -16972,13 +16752,6 @@ echo "$as_me: error: conditional \"USING_DARWIN_CRT\" was never defined. ...@@ -16972,13 +16752,6 @@ echo "$as_me: error: conditional \"USING_DARWIN_CRT\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;} Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; } { (exit 1); exit 1; }; }
fi fi
if test -z "${GTK_CAIRO_TRUE}" && test -z "${GTK_CAIRO_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"GTK_CAIRO\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
echo "$as_me: error: conditional \"GTK_CAIRO\" was never defined.
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
if test -z "${USING_BOEHMGC_TRUE}" && test -z "${USING_BOEHMGC_FALSE}"; then if test -z "${USING_BOEHMGC_TRUE}" && test -z "${USING_BOEHMGC_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"USING_BOEHMGC\" was never defined. { { echo "$as_me:$LINENO: error: conditional \"USING_BOEHMGC\" was never defined.
Usually this means the macro was only invoked conditionally." >&5 Usually this means the macro was only invoked conditionally." >&5
...@@ -17733,13 +17506,6 @@ s,@X_CFLAGS@,$X_CFLAGS,;t t ...@@ -17733,13 +17506,6 @@ s,@X_CFLAGS@,$X_CFLAGS,;t t
s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t s,@X_PRE_LIBS@,$X_PRE_LIBS,;t t
s,@X_LIBS@,$X_LIBS,;t t s,@X_LIBS@,$X_LIBS,;t t
s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t s,@X_EXTRA_LIBS@,$X_EXTRA_LIBS,;t t
s,@GTK_CAIRO_TRUE@,$GTK_CAIRO_TRUE,;t t
s,@GTK_CAIRO_FALSE@,$GTK_CAIRO_FALSE,;t t
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
s,@CAIRO_CFLAGS@,$CAIRO_CFLAGS,;t t
s,@CAIRO_LIBS@,$CAIRO_LIBS,;t t
s,@PANGOFT2_CFLAGS@,$PANGOFT2_CFLAGS,;t t
s,@PANGOFT2_LIBS@,$PANGOFT2_LIBS,;t t
s,@extra_ldflags_libjava@,$extra_ldflags_libjava,;t t s,@extra_ldflags_libjava@,$extra_ldflags_libjava,;t t
s,@GCLIBS@,$GCLIBS,;t t s,@GCLIBS@,$GCLIBS,;t t
s,@GCINCS@,$GCINCS,;t t s,@GCINCS@,$GCINCS,;t t
...@@ -17768,6 +17534,7 @@ s,@USING_GCC_TRUE@,$USING_GCC_TRUE,;t t ...@@ -17768,6 +17534,7 @@ s,@USING_GCC_TRUE@,$USING_GCC_TRUE,;t t
s,@USING_GCC_FALSE@,$USING_GCC_FALSE,;t t s,@USING_GCC_FALSE@,$USING_GCC_FALSE,;t t
s,@LIBICONV@,$LIBICONV,;t t s,@LIBICONV@,$LIBICONV,;t t
s,@LTLIBICONV@,$LTLIBICONV,;t t s,@LTLIBICONV@,$LTLIBICONV,;t t
s,@PKG_CONFIG@,$PKG_CONFIG,;t t
s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t s,@GTK_CFLAGS@,$GTK_CFLAGS,;t t
s,@GTK_LIBS@,$GTK_LIBS,;t t s,@GTK_LIBS@,$GTK_LIBS,;t t
s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
......
libjava/configure.ac
...@@ -330,6 +330,7 @@ ac_configure_args="$ac_configure_args --disable-core-jni" ...@@ -330,6 +330,7 @@ ac_configure_args="$ac_configure_args --disable-core-jni"
dnl FIXME? dnl FIXME?
ac_configure_args="$ac_configure_args --disable-examples" ac_configure_args="$ac_configure_args --disable-examples"
ac_configure_args="$ac_configure_args --with-glibj=build" ac_configure_args="$ac_configure_args --with-glibj=build"
ac_configure_args="$ac_configure_args --disable-plugin"
if test "$use_gtk_awt" != yes; then if test "$use_gtk_awt" != yes; then
ac_configure_args="$ac_configure_args --disable-gtk-peer" ac_configure_args="$ac_configure_args --disable-gtk-peer"
fi fi
...@@ -676,21 +677,6 @@ AC_SUBST(ZLIBTESTSPEC) ...@@ -676,21 +677,6 @@ AC_SUBST(ZLIBTESTSPEC)
AC_PATH_XTRA AC_PATH_XTRA
# determine whether to enable the cairo GTK Graphics2D backend
AC_ARG_ENABLE(gtk-cairo,
AS_HELP_STRING([--enable-gtk-cairo],
[build the cairo Graphics2D implementation on GTK]))
AM_CONDITIONAL(GTK_CAIRO, test "x${enable_gtk_cairo}" = xyes)
if test "x${enable_gtk_cairo}" = xyes
then
PKG_CHECK_MODULES(CAIRO, cairo)
PKG_CHECK_MODULES(PANGOFT2, pangoft2)
fi
AC_SUBST(CAIRO_LIBS)
AC_SUBST(CAIRO_CFLAGS)
AC_SUBST(PANGOFT2_LIBS)
AC_SUBST(PANGOFT2_CFLAGS)
# FIXME: this should be _libs on some hosts. # FIXME: this should be _libs on some hosts.
libsubdir=.libs libsubdir=.libs
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment