Attachment #389798 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_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 AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE QT_AWT_TRUE QT_AWT_FALSE GCJH ZIP 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 SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE 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 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,@SUPPLY_BACKTRACE_TRUE@,$SUPPLY_BACKTRACE_TRUE,;t t
s,@SUPPLY_BACKTRACE_FALSE@,$SUPPLY_BACKTRACE_FALSE,;t t
s,@CLASSPATH_SEPARATOR@,$CLASSPATH_SEPARATOR,;t t
++ libjava/Makefile.am

lib_gnu_java_awt_peer_gtk_la_LIBADD = \
	gnu-java-awt-peer-gtk.lo \
	classpath/native/jni/gtk-peer/libgtkpeer.la \
	$(GTK_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS)
lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = gnu-java-awt-peer-gtk.lo \
	classpath/native/jni/gtk-peer/libgtkpeer.la \
	libgcj-$(gcc_version).jar libgcj.la libgcj.spec
++ libjava/Makefile.in

JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@
JC1GCSPEC = @JC1GCSPEC@
LDFLAGS = @LDFLAGS@
LIBART_CFLAGS = @LIBART_CFLAGS@
LIBART_LIBS = @LIBART_LIBS@
LIBFFI = @LIBFFI@
LIBFFIINCS = @LIBFFIINCS@
LIBGCJDEBUG = @LIBGCJDEBUG@

lib_gnu_java_awt_peer_gtk_la_LIBADD = \
	gnu-java-awt-peer-gtk.lo \
	classpath/native/jni/gtk-peer/libgtkpeer.la \
	$(GTK_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS)

lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = gnu-java-awt-peer-gtk.lo \
	classpath/native/jni/gtk-peer/libgtkpeer.la \
++ libjava/gcj/Makefile.in

JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@
JC1GCSPEC = @JC1GCSPEC@
LDFLAGS = @LDFLAGS@
LIBART_CFLAGS = @LIBART_CFLAGS@
LIBART_LIBS = @LIBART_LIBS@
LIBFFI = @LIBFFI@
LIBFFIINCS = @LIBFFIINCS@
LIBGCJDEBUG = @LIBGCJDEBUG@
++ libjava/include/Makefile.in

JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@
JC1GCSPEC = @JC1GCSPEC@
LDFLAGS = @LDFLAGS@
LIBART_CFLAGS = @LIBART_CFLAGS@
LIBART_LIBS = @LIBART_LIBS@
LIBFFI = @LIBFFI@
LIBFFIINCS = @LIBFFIINCS@
LIBGCJDEBUG = @LIBGCJDEBUG@
++ libjava/testsuite/Makefile.in

JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@
JC1GCSPEC = @JC1GCSPEC@
LDFLAGS = @LDFLAGS@
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 (-125 / +10 lines)
0	-- libjava/configure.ac	0	++ libjava/configure.ac
Lines 1141-1150 Link Here
1141	AC_SUBST(GLIB_CFLAGS)	1141	AC_SUBST(GLIB_CFLAGS)
1142	AC_SUBST(GLIB_LIBS)	1142	AC_SUBST(GLIB_LIBS)
1143		1143
1144	PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1)
1145	AC_SUBST(LIBART_CFLAGS)
1146	AC_SUBST(LIBART_LIBS)
1147
1148	# We require the XTest Extension to support java.awt.Robot.	1144	# We require the XTest Extension to support java.awt.Robot.
1149	AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],	1145	AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
1150	[AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],	1146	[AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],
1151	-- libjava/configure	1147	++ 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_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 AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE QT_AWT_TRUE QT_AWT_FALSE GCJH ZIP 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 SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE 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 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_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 AR ac_ct_AR RANLIB ac_ct_RANLIB MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE GTK_AWT_TRUE GTK_AWT_FALSE QT_AWT_TRUE QT_AWT_FALSE GCJH ZIP 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 SUPPLY_BACKTRACE_TRUE SUPPLY_BACKTRACE_FALSE 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 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 13729-13835 Link Here
13729		13729
13730		13730
13731		13731
13732
13733	succeeded=no
13734
13735	if test -z "$PKG_CONFIG"; then
13736	# Extract the first word of "pkg-config", so it can be a program name with args.
13737	set dummy pkg-config; ac_word=$2
13738	echo "$as_me:$LINENO: checking for $ac_word" >&5
13739	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
13740	if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
13741	echo $ECHO_N "(cached) $ECHO_C" >&6
13742	else
13743	case $PKG_CONFIG in
13744	[\\/]* \| ?:[\\/]*)
13745	ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
13746	;;
13747	*)
13748	as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
13749	for as_dir in $PATH
13750	do
13751	IFS=$as_save_IFS
13752	test -z "$as_dir" && as_dir=.
13753	for ac_exec_ext in '' $ac_executable_extensions; do
13754	if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
13755	ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
13756	echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
13757	break 2
13758	fi
13759	done
13760	done
13761
13762	test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
13763	;;
13764	esac
13765	fi
13766	PKG_CONFIG=$ac_cv_path_PKG_CONFIG
13767
13768	if test -n "$PKG_CONFIG"; then
13769	echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
13770	echo "${ECHO_T}$PKG_CONFIG" >&6
13771	else
13772	echo "$as_me:$LINENO: result: no" >&5
13773	echo "${ECHO_T}no" >&6
13774	fi
13775
13776	fi
13777
13778	if test "$PKG_CONFIG" = "no" ; then
13779	echo "*** The pkg-config script could not be found. Make sure it is"
13780	echo "*** in your path, or set the PKG_CONFIG environment variable"
13781	echo "*** to the full path to pkg-config."
13782	echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
13783	else
13784	PKG_CONFIG_MIN_VERSION=0.9.0
13785	if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
13786	echo "$as_me:$LINENO: checking for libart-2.0 >= 2.1" >&5
13787	echo $ECHO_N "checking for libart-2.0 >= 2.1... $ECHO_C" >&6
13788
13789	if $PKG_CONFIG --exists "libart-2.0 >= 2.1" ; then
13790	echo "$as_me:$LINENO: result: yes" >&5
13791	echo "${ECHO_T}yes" >&6
13792	succeeded=yes
13793
13794	echo "$as_me:$LINENO: checking LIBART_CFLAGS" >&5
13795	echo $ECHO_N "checking LIBART_CFLAGS... $ECHO_C" >&6
13796	LIBART_CFLAGS=`$PKG_CONFIG --cflags "libart-2.0 >= 2.1"`
13797	echo "$as_me:$LINENO: result: $LIBART_CFLAGS" >&5
13798	echo "${ECHO_T}$LIBART_CFLAGS" >&6
13799
13800	echo "$as_me:$LINENO: checking LIBART_LIBS" >&5
13801	echo $ECHO_N "checking LIBART_LIBS... $ECHO_C" >&6
13802	LIBART_LIBS=`$PKG_CONFIG --libs "libart-2.0 >= 2.1"`
13803	echo "$as_me:$LINENO: result: $LIBART_LIBS" >&5
13804	echo "${ECHO_T}$LIBART_LIBS" >&6
13805	else
13806	LIBART_CFLAGS=""
13807	LIBART_LIBS=""
13808	## If we have a custom action on failure, don't print errors, but
13809	## do set a variable so people can do so.
13810	LIBART_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libart-2.0 >= 2.1"`
13811	echo $LIBART_PKG_ERRORS
13812	fi
13813
13814
13815
13816	else
13817	echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
13818	echo "*** See http://www.freedesktop.org/software/pkgconfig"
13819	fi
13820	fi
13821
13822	if test $succeeded = yes; then
13823	:
13824	else
13825	{ { 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
13826	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;}
13827	{ (exit 1); exit 1; }; }
13828	fi
13829
13830
13831
13832
13833	# We require the XTest Extension to support java.awt.Robot.	13732	# We require the XTest Extension to support java.awt.Robot.
13834	echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5	13733	echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5
13835	echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6	13734	echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6
Lines 17876-17883 Link Here
17876	s,@GTK_LIBS@,$GTK_LIBS,;t t	17775	s,@GTK_LIBS@,$GTK_LIBS,;t t
17877	s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t	17776	s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
17878	s,@GLIB_LIBS@,$GLIB_LIBS,;t t	17777	s,@GLIB_LIBS@,$GLIB_LIBS,;t t
17879	s,@LIBART_CFLAGS@,$LIBART_CFLAGS,;t t
17880	s,@LIBART_LIBS@,$LIBART_LIBS,;t t
17881	s,@SUPPLY_BACKTRACE_TRUE@,$SUPPLY_BACKTRACE_TRUE,;t t	17778	s,@SUPPLY_BACKTRACE_TRUE@,$SUPPLY_BACKTRACE_TRUE,;t t
17882	s,@SUPPLY_BACKTRACE_FALSE@,$SUPPLY_BACKTRACE_FALSE,;t t	17779	s,@SUPPLY_BACKTRACE_FALSE@,$SUPPLY_BACKTRACE_FALSE,;t t
17883	s,@CLASSPATH_SEPARATOR@,$CLASSPATH_SEPARATOR,;t t	17780	s,@CLASSPATH_SEPARATOR@,$CLASSPATH_SEPARATOR,;t t
17884	-- libjava/Makefile.am	17781	++ libjava/Makefile.am
Lines 256-262 Link Here
256	lib_gnu_java_awt_peer_gtk_la_LIBADD = \	256	lib_gnu_java_awt_peer_gtk_la_LIBADD = \
257	gnu-java-awt-peer-gtk.lo \	257	gnu-java-awt-peer-gtk.lo \
258	classpath/native/jni/gtk-peer/libgtkpeer.la \	258	classpath/native/jni/gtk-peer/libgtkpeer.la \
259	$(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS)	259	$(GTK_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS)
260	lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = gnu-java-awt-peer-gtk.lo \	260	lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = gnu-java-awt-peer-gtk.lo \
261	classpath/native/jni/gtk-peer/libgtkpeer.la \	261	classpath/native/jni/gtk-peer/libgtkpeer.la \
262	libgcj-$(gcc_version).jar libgcj.la libgcj.spec	262	libgcj-$(gcc_version).jar libgcj.la libgcj.spec
263	-- libjava/Makefile.in	263	++ libjava/Makefile.in
Lines 471-478 Link Here
471	JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@	471	JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@
472	JC1GCSPEC = @JC1GCSPEC@	472	JC1GCSPEC = @JC1GCSPEC@
473	LDFLAGS = @LDFLAGS@	473	LDFLAGS = @LDFLAGS@
474	LIBART_CFLAGS = @LIBART_CFLAGS@
475	LIBART_LIBS = @LIBART_LIBS@
476	LIBFFI = @LIBFFI@	474	LIBFFI = @LIBFFI@
477	LIBFFIINCS = @LIBFFIINCS@	475	LIBFFIINCS = @LIBFFIINCS@
478	LIBGCJDEBUG = @LIBGCJDEBUG@	476	LIBGCJDEBUG = @LIBGCJDEBUG@
Lines 746-752 Link Here
746	lib_gnu_java_awt_peer_gtk_la_LIBADD = \	744	lib_gnu_java_awt_peer_gtk_la_LIBADD = \
747	gnu-java-awt-peer-gtk.lo \	745	gnu-java-awt-peer-gtk.lo \
748	classpath/native/jni/gtk-peer/libgtkpeer.la \	746	classpath/native/jni/gtk-peer/libgtkpeer.la \
749	$(GTK_LIBS) $(GLIB_LIBS) $(LIBART_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS)	747	$(GTK_LIBS) $(GLIB_LIBS) $(CAIRO_LIBS) $(PANGOFT2_LIBS)
750		748
751	lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = gnu-java-awt-peer-gtk.lo \	749	lib_gnu_java_awt_peer_gtk_la_DEPENDENCIES = gnu-java-awt-peer-gtk.lo \
752	classpath/native/jni/gtk-peer/libgtkpeer.la \	750	classpath/native/jni/gtk-peer/libgtkpeer.la \
753	-- libjava/gcj/Makefile.in	751	++ libjava/gcj/Makefile.in
Lines 143-150 Link Here
143	JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@	143	JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@
144	JC1GCSPEC = @JC1GCSPEC@	144	JC1GCSPEC = @JC1GCSPEC@
145	LDFLAGS = @LDFLAGS@	145	LDFLAGS = @LDFLAGS@
146	LIBART_CFLAGS = @LIBART_CFLAGS@
147	LIBART_LIBS = @LIBART_LIBS@
148	LIBFFI = @LIBFFI@	146	LIBFFI = @LIBFFI@
149	LIBFFIINCS = @LIBFFIINCS@	147	LIBFFIINCS = @LIBFFIINCS@
150	LIBGCJDEBUG = @LIBGCJDEBUG@	148	LIBGCJDEBUG = @LIBGCJDEBUG@
151	-- libjava/include/Makefile.in	149	++ libjava/include/Makefile.in
Lines 142-149 Link Here
142	JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@	142	JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@
143	JC1GCSPEC = @JC1GCSPEC@	143	JC1GCSPEC = @JC1GCSPEC@
144	LDFLAGS = @LDFLAGS@	144	LDFLAGS = @LDFLAGS@
145	LIBART_CFLAGS = @LIBART_CFLAGS@
146	LIBART_LIBS = @LIBART_LIBS@
147	LIBFFI = @LIBFFI@	145	LIBFFI = @LIBFFI@
148	LIBFFIINCS = @LIBFFIINCS@	146	LIBFFIINCS = @LIBFFIINCS@
149	LIBGCJDEBUG = @LIBGCJDEBUG@	147	LIBGCJDEBUG = @LIBGCJDEBUG@
150	-- libjava/testsuite/Makefile.in	148	++ libjava/testsuite/Makefile.in
Lines 131-138 Link Here
131	JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@	131	JAVA_HOME_SET_TRUE = @JAVA_HOME_SET_TRUE@
132	JC1GCSPEC = @JC1GCSPEC@	132	JC1GCSPEC = @JC1GCSPEC@
133	LDFLAGS = @LDFLAGS@	133	LDFLAGS = @LDFLAGS@
134	LIBART_CFLAGS = @LIBART_CFLAGS@
135	LIBART_LIBS = @LIBART_LIBS@
136	LIBFFI = @LIBFFI@	134	LIBFFI = @LIBFFI@
137	LIBFFIINCS = @LIBFFIINCS@	135	LIBFFIINCS = @LIBFFIINCS@
138	LIBGCJDEBUG = @LIBGCJDEBUG@	136	LIBGCJDEBUG = @LIBGCJDEBUG@