Attachment #389800 for bug #513716




++ libjava/configure.ac

      AC_SUBST(GLIB_CFLAGS)
      AC_SUBST(GLIB_LIBS)

      PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1)
      AC_SUBST(LIBART_CFLAGS)
      AC_SUBST(LIBART_LIBS)

      # We require the XTest Extension to support java.awt.Robot.
      AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
		   [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],
++ libjava/configure

# include <unistd.h>
#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_libsubdir build_subdir host_subdir target_subdir multi_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 THREADSTARTFILESPEC 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 USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_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=''

# Initialize some variables set by options.





  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 libart-2.0 >= 2.1" >&5
echo $ECHO_N "checking for libart-2.0 >= 2.1... $ECHO_C" >&6

        if $PKG_CONFIG --exists "libart-2.0 >= 2.1" ; then
            echo "$as_me:$LINENO: result: yes" >&5
echo "${ECHO_T}yes" >&6
            succeeded=yes

            echo "$as_me:$LINENO: checking LIBART_CFLAGS" >&5
echo $ECHO_N "checking LIBART_CFLAGS... $ECHO_C" >&6
            LIBART_CFLAGS=`$PKG_CONFIG --cflags "libart-2.0 >= 2.1"`
            echo "$as_me:$LINENO: result: $LIBART_CFLAGS" >&5
echo "${ECHO_T}$LIBART_CFLAGS" >&6

            echo "$as_me:$LINENO: checking LIBART_LIBS" >&5
echo $ECHO_N "checking LIBART_LIBS... $ECHO_C" >&6
            LIBART_LIBS=`$PKG_CONFIG --libs "libart-2.0 >= 2.1"`
            echo "$as_me:$LINENO: result: $LIBART_LIBS" >&5
echo "${ECHO_T}$LIBART_LIBS" >&6
        else
            LIBART_CFLAGS=""
            LIBART_LIBS=""
            ## If we have a custom action on failure, don't print errors, but
            ## do set a variable so people can do so.
            LIBART_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libart-2.0 >= 2.1"`
            echo $LIBART_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 (libart-2.0 >= 2.1) 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 (libart-2.0 >= 2.1) 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




      # We require the XTest Extension to support java.awt.Robot.
      echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5
echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6

s,@GTK_LIBS@,$GTK_LIBS,;t t
s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
s,@GLIB_LIBS@,$GLIB_LIBS,;t t
s,@LIBART_CFLAGS@,$LIBART_CFLAGS,;t t
s,@LIBART_LIBS@,$LIBART_LIBS,;t t
s,@CLASSPATH_SEPARATOR@,$CLASSPATH_SEPARATOR,;t t
s,@ac_ct_GCJ@,$ac_ct_GCJ,;t t
s,@ZLIBS@,$ZLIBS,;t t
++ libjava/Makefile.in

LDFLAGS = @LDFLAGS@
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
LIBART_CFLAGS = @LIBART_CFLAGS@
LIBART_LIBS = @LIBART_LIBS@
LIBFFI = @LIBFFI@
LIBFFIINCS = @LIBFFIINCS@
LIBGCJDEBUG = @LIBGCJDEBUG@
++ libjava/gcj/Makefile.in

LDFLAGS = @LDFLAGS@
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
LIBART_CFLAGS = @LIBART_CFLAGS@
LIBART_LIBS = @LIBART_LIBS@
LIBFFI = @LIBFFI@
LIBFFIINCS = @LIBFFIINCS@
LIBGCJDEBUG = @LIBGCJDEBUG@
++ libjava/include/Makefile.in

LDFLAGS = @LDFLAGS@
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
LIBART_CFLAGS = @LIBART_CFLAGS@
LIBART_LIBS = @LIBART_LIBS@
LIBFFI = @LIBFFI@
LIBFFIINCS = @LIBFFIINCS@
LIBGCJDEBUG = @LIBGCJDEBUG@
++ libjava/testsuite/Makefile.in

LDFLAGS = @LDFLAGS@
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
LIBART_CFLAGS = @LIBART_CFLAGS@
LIBART_LIBS = @LIBART_LIBS@
LIBFFI = @LIBFFI@
LIBFFIINCS = @LIBFFIINCS@
LIBGCJDEBUG = @LIBGCJDEBUG@

Return to bug 513716

Line Link Here

(-)file_not_specified_in_diff (-122 / +7 lines)
0	-- libjava/configure.ac	0	++ libjava/configure.ac
Lines 1138-1147 Link Here
1138	AC_SUBST(GLIB_CFLAGS)	1138	AC_SUBST(GLIB_CFLAGS)
1139	AC_SUBST(GLIB_LIBS)	1139	AC_SUBST(GLIB_LIBS)
1140		1140
1141	PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1)
1142	AC_SUBST(LIBART_CFLAGS)
1143	AC_SUBST(LIBART_LIBS)
1144
1145	# We require the XTest Extension to support java.awt.Robot.	1141	# We require the XTest Extension to support java.awt.Robot.
1146	AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],	1142	AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
1147	[AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],	1143	[AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],
1148	-- libjava/configure	1144	++ libjava/configure
Lines 310-316 Link Here
310	# include <unistd.h>	310	# include <unistd.h>
311	#endif"	311	#endif"
312		312
313	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_libsubdir build_subdir host_subdir target_subdir multi_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 THREADSTARTFILESPEC 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 USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC 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'	313	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_libsubdir build_subdir host_subdir target_subdir multi_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 THREADSTARTFILESPEC 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 USE_LIBGCJ_BC_TRUE USE_LIBGCJ_BC_FALSE LIBGCJ_SPEC HASH_SYNC_SPEC USING_GCC_TRUE USING_GCC_FALSE LIBICONV LTLIBICONV PKG_CONFIG GTK_CFLAGS GTK_LIBS GLIB_CFLAGS GLIB_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'
314	ac_subst_files=''	314	ac_subst_files=''
315		315
316	# Initialize some variables set by options.	316	# Initialize some variables set by options.
Lines 13947-14053 Link Here
13947		13947
13948		13948
13949		13949
13950
13951	succeeded=no
13952
13953	if test -z "$PKG_CONFIG"; then
13954	# Extract the first word of "pkg-config", so it can be a program name with args.
13955	set dummy pkg-config; ac_word=$2
13956	echo "$as_me:$LINENO: checking for $ac_word" >&5
13957	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
13958	if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
13959	echo $ECHO_N "(cached) $ECHO_C" >&6
13960	else
13961	case $PKG_CONFIG in
13962	[\\/]* \| ?:[\\/]*)
13963	ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
13964	;;
13965	*)
13966	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13967	for as_dir in $PATH
13968	do
13969	IFS=$as_save_IFS
13970	test -z "$as_dir" && as_dir=.
13971	for ac_exec_ext in '' $ac_executable_extensions; do
13972	if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13973	ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
13974	echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
13975	break 2
13976	fi
13977	done
13978	done
13979
13980	test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
13981	;;
13982	esac
13983	fi
13984	PKG_CONFIG=$ac_cv_path_PKG_CONFIG
13985
13986	if test -n "$PKG_CONFIG"; then
13987	echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
13988	echo "${ECHO_T}$PKG_CONFIG" >&6
13989	else
13990	echo "$as_me:$LINENO: result: no" >&5
13991	echo "${ECHO_T}no" >&6
13992	fi
13993
13994	fi
13995
13996	if test "$PKG_CONFIG" = "no" ; then
13997	echo "*** The pkg-config script could not be found. Make sure it is"
13998	echo "*** in your path, or set the PKG_CONFIG environment variable"
13999	echo "*** to the full path to pkg-config."
14000	echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
14001	else
14002	PKG_CONFIG_MIN_VERSION=0.9.0
14003	if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
14004	echo "$as_me:$LINENO: checking for libart-2.0 >= 2.1" >&5
14005	echo $ECHO_N "checking for libart-2.0 >= 2.1... $ECHO_C" >&6
14006
14007	if $PKG_CONFIG --exists "libart-2.0 >= 2.1" ; then
14008	echo "$as_me:$LINENO: result: yes" >&5
14009	echo "${ECHO_T}yes" >&6
14010	succeeded=yes
14011
14012	echo "$as_me:$LINENO: checking LIBART_CFLAGS" >&5
14013	echo $ECHO_N "checking LIBART_CFLAGS... $ECHO_C" >&6
14014	LIBART_CFLAGS=`$PKG_CONFIG --cflags "libart-2.0 >= 2.1"`
14015	echo "$as_me:$LINENO: result: $LIBART_CFLAGS" >&5
14016	echo "${ECHO_T}$LIBART_CFLAGS" >&6
14017
14018	echo "$as_me:$LINENO: checking LIBART_LIBS" >&5
14019	echo $ECHO_N "checking LIBART_LIBS... $ECHO_C" >&6
14020	LIBART_LIBS=`$PKG_CONFIG --libs "libart-2.0 >= 2.1"`
14021	echo "$as_me:$LINENO: result: $LIBART_LIBS" >&5
14022	echo "${ECHO_T}$LIBART_LIBS" >&6
14023	else
14024	LIBART_CFLAGS=""
14025	LIBART_LIBS=""
14026	## If we have a custom action on failure, don't print errors, but
14027	## do set a variable so people can do so.
14028	LIBART_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libart-2.0 >= 2.1"`
14029	echo $LIBART_PKG_ERRORS
14030	fi
14031
14032
14033
14034	else
14035	echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
14036	echo "*** See http://www.freedesktop.org/software/pkgconfig"
14037	fi
14038	fi
14039
14040	if test $succeeded = yes; then
14041	:
14042	else
14043	{ { echo "$as_me:$LINENO: error: Library requirements (libart-2.0 >= 2.1) 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
14044	echo "$as_me: error: Library requirements (libart-2.0 >= 2.1) 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;}
14045	{ (exit 1); exit 1; }; }
14046	fi
14047
14048
14049
14050
14051	# We require the XTest Extension to support java.awt.Robot.	13950	# We require the XTest Extension to support java.awt.Robot.
14052	echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5	13951	echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5
14053	echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6	13952	echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6
Lines 17802-17809 Link Here
17802	s,@GTK_LIBS@,$GTK_LIBS,;t t	17701	s,@GTK_LIBS@,$GTK_LIBS,;t t
17803	s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t	17702	s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
17804	s,@GLIB_LIBS@,$GLIB_LIBS,;t t	17703	s,@GLIB_LIBS@,$GLIB_LIBS,;t t
17805	s,@LIBART_CFLAGS@,$LIBART_CFLAGS,;t t
17806	s,@LIBART_LIBS@,$LIBART_LIBS,;t t
17807	s,@CLASSPATH_SEPARATOR@,$CLASSPATH_SEPARATOR,;t t	17704	s,@CLASSPATH_SEPARATOR@,$CLASSPATH_SEPARATOR,;t t
17808	s,@ac_ct_GCJ@,$ac_ct_GCJ,;t t	17705	s,@ac_ct_GCJ@,$ac_ct_GCJ,;t t
17809	s,@ZLIBS@,$ZLIBS,;t t	17706	s,@ZLIBS@,$ZLIBS,;t t
17810	-- libjava/Makefile.in	17707	++ libjava/Makefile.in
Lines 534-541 Link Here
534	LDFLAGS = @LDFLAGS@	534	LDFLAGS = @LDFLAGS@
535	LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@	535	LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
536	LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@	536	LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
537	LIBART_CFLAGS = @LIBART_CFLAGS@
538	LIBART_LIBS = @LIBART_LIBS@
539	LIBFFI = @LIBFFI@	537	LIBFFI = @LIBFFI@
540	LIBFFIINCS = @LIBFFIINCS@	538	LIBFFIINCS = @LIBFFIINCS@
541	LIBGCJDEBUG = @LIBGCJDEBUG@	539	LIBGCJDEBUG = @LIBGCJDEBUG@
542	-- libjava/gcj/Makefile.in	540	++ libjava/gcj/Makefile.in
Lines 146-153 Link Here
146	LDFLAGS = @LDFLAGS@	146	LDFLAGS = @LDFLAGS@
147	LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@	147	LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
148	LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@	148	LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
149	LIBART_CFLAGS = @LIBART_CFLAGS@
150	LIBART_LIBS = @LIBART_LIBS@
151	LIBFFI = @LIBFFI@	149	LIBFFI = @LIBFFI@
152	LIBFFIINCS = @LIBFFIINCS@	150	LIBFFIINCS = @LIBFFIINCS@
153	LIBGCJDEBUG = @LIBGCJDEBUG@	151	LIBGCJDEBUG = @LIBGCJDEBUG@
154	-- libjava/include/Makefile.in	152	++ libjava/include/Makefile.in
Lines 145-152 Link Here
145	LDFLAGS = @LDFLAGS@	145	LDFLAGS = @LDFLAGS@
146	LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@	146	LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
147	LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@	147	LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
148	LIBART_CFLAGS = @LIBART_CFLAGS@
149	LIBART_LIBS = @LIBART_LIBS@
150	LIBFFI = @LIBFFI@	148	LIBFFI = @LIBFFI@
151	LIBFFIINCS = @LIBFFIINCS@	149	LIBFFIINCS = @LIBFFIINCS@
152	LIBGCJDEBUG = @LIBGCJDEBUG@	150	LIBGCJDEBUG = @LIBGCJDEBUG@
153	-- libjava/testsuite/Makefile.in	151	++ libjava/testsuite/Makefile.in
Lines 134-141 Link Here
134	LDFLAGS = @LDFLAGS@	134	LDFLAGS = @LDFLAGS@
135	LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@	135	LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
136	LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@	136	LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
137	LIBART_CFLAGS = @LIBART_CFLAGS@
138	LIBART_LIBS = @LIBART_LIBS@
139	LIBFFI = @LIBFFI@	137	LIBFFI = @LIBFFI@
140	LIBFFIINCS = @LIBFFIINCS@	138	LIBFFIINCS = @LIBFFIINCS@
141	LIBGCJDEBUG = @LIBGCJDEBUG@	139	LIBGCJDEBUG = @LIBGCJDEBUG@