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

Collapse All | Expand All

(-)file_not_specified_in_diff (-122 / +7 lines)
Line  Link Here
0
-- libjava/configure.ac
0
++ libjava/configure.ac
Lines 1260-1269 Link Here
1260
      AC_SUBST(GLIB_CFLAGS)
1260
      AC_SUBST(GLIB_CFLAGS)
1261
      AC_SUBST(GLIB_LIBS)
1261
      AC_SUBST(GLIB_LIBS)
1262
1262
1263
      PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1)
1264
      AC_SUBST(LIBART_CFLAGS)
1265
      AC_SUBST(LIBART_LIBS)
1266
1267
      # We require the XTest Extension to support java.awt.Robot.
1263
      # We require the XTest Extension to support java.awt.Robot.
1268
      AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
1264
      AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
1269
		   [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],
1265
		   [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],
1270
-- libjava/configure
1266
++ libjava/configure
Lines 459-465 Link Here
459
#endif"
459
#endif"
460
460
461
ac_subdirs_all="$ac_subdirs_all classpath libltdl"
461
ac_subdirs_all="$ac_subdirs_all classpath libltdl"
462
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 JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE 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 MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJ_LD_SYMBOLIC_FUNCTIONS LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE X_AWT_TRUE X_AWT_FALSE GCJ_FOR_ECJX GCJH host_exeext INCLTDL LIBLTDL DIRLTDL LIBTOOL SED EGREP FGREP GREP DUMPBIN ac_ct_DUMPBIN NM lt_ECHO CPP CPPFLAGS CXXCPP GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ECJ_BUILD_JAR ECJ_JAR BUILD_ECJ1_TRUE BUILD_ECJ1_FALSE INSTALL_ECJ_JAR_TRUE INSTALL_ECJ_JAR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME SUPPRESS_LIBGCJ_BC_TRUE SUPPRESS_LIBGCJ_BC_FALSE INTERPRETER INTERPRETER_TRUE INTERPRETER_FALSE LIBFFI LIBFFIINCS PLATFORM 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 ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava extra_gij_ldflags extra_ldflags LIBSTDCXXSPEC LIBGCJTESTSPEC 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 ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION dbexecdir gxx_include_dir libstdcxx_incdir PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here LIBOBJS LTLIBOBJS'
462
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 JAVA_MAINTAINER_MODE_TRUE JAVA_MAINTAINER_MODE_FALSE 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 MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBGCJ_CFLAGS LIBGCJ_CXXFLAGS LIBGCJ_JAVAFLAGS LIBGCJ_LD_SYMBOLIC LIBGCJ_LD_SYMBOLIC_FUNCTIONS LIBGCJDEBUG TOOLKIT XLIB_AWT_TRUE XLIB_AWT_FALSE X_AWT_TRUE X_AWT_FALSE GCJ_FOR_ECJX GCJH host_exeext INCLTDL LIBLTDL DIRLTDL LIBTOOL SED EGREP FGREP GREP DUMPBIN ac_ct_DUMPBIN NM lt_ECHO CPP CPPFLAGS CXXCPP GCJ GCJFLAGS GCJDEPMODE am__fastdepGCJ_TRUE am__fastdepGCJ_FALSE subdirs TESTSUBDIR_TRUE TESTSUBDIR_FALSE ECJ_BUILD_JAR ECJ_JAR BUILD_ECJ1_TRUE BUILD_ECJ1_FALSE INSTALL_ECJ_JAR_TRUE INSTALL_ECJ_JAR_FALSE JAVA_HOME_SET_TRUE JAVA_HOME_SET_FALSE JAVA_HOME SUPPRESS_LIBGCJ_BC_TRUE SUPPRESS_LIBGCJ_BC_FALSE INTERPRETER INTERPRETER_TRUE INTERPRETER_FALSE LIBFFI LIBFFIINCS PLATFORM 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 ZLIBSPEC ZLIBTESTSPEC X_CFLAGS X_PRE_LIBS X_LIBS X_EXTRA_LIBS extra_ldflags_libjava extra_gij_ldflags extra_ldflags LIBSTDCXXSPEC LIBGCJTESTSPEC 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 ZLIBS SYS_ZLIBS ZINCS DIVIDESPEC CHECKREFSPEC EXCEPTIONSPEC BACKTRACESPEC IEEESPEC NATIVE_TRUE NATIVE_FALSE ENABLE_SHARED_TRUE ENABLE_SHARED_FALSE NEEDS_DATA_START_TRUE NEEDS_DATA_START_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION dbexecdir gxx_include_dir libstdcxx_incdir PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here LIBOBJS LTLIBOBJS'
463
ac_subst_files=''
463
ac_subst_files=''
464
464
465
# Initialize some variables set by options.
465
# Initialize some variables set by options.
Lines 25012-25118 Link Here
25012
25012
25013
25013
25014
25014
25015
25016
  succeeded=no
25017
25018
  if test -z "$PKG_CONFIG"; then
25019
    # Extract the first word of "pkg-config", so it can be a program name with args.
25020
set dummy pkg-config; ac_word=$2
25021
echo "$as_me:$LINENO: checking for $ac_word" >&5
25022
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
25023
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
25024
  echo $ECHO_N "(cached) $ECHO_C" >&6
25025
else
25026
  case $PKG_CONFIG in
25027
  [\\/]* | ?:[\\/]*)
25028
  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
25029
  ;;
25030
  *)
25031
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
25032
for as_dir in $PATH
25033
do
25034
  IFS=$as_save_IFS
25035
  test -z "$as_dir" && as_dir=.
25036
  for ac_exec_ext in '' $ac_executable_extensions; do
25037
  if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
25038
    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
25039
    echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
25040
    break 2
25041
  fi
25042
done
25043
done
25044
25045
  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
25046
  ;;
25047
esac
25048
fi
25049
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
25050
25051
if test -n "$PKG_CONFIG"; then
25052
  echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
25053
echo "${ECHO_T}$PKG_CONFIG" >&6
25054
else
25055
  echo "$as_me:$LINENO: result: no" >&5
25056
echo "${ECHO_T}no" >&6
25057
fi
25058
25059
  fi
25060
25061
  if test "$PKG_CONFIG" = "no" ; then
25062
     echo "*** The pkg-config script could not be found. Make sure it is"
25063
     echo "*** in your path, or set the PKG_CONFIG environment variable"
25064
     echo "*** to the full path to pkg-config."
25065
     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
25066
  else
25067
     PKG_CONFIG_MIN_VERSION=0.9.0
25068
     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
25069
        echo "$as_me:$LINENO: checking for libart-2.0 >= 2.1" >&5
25070
echo $ECHO_N "checking for libart-2.0 >= 2.1... $ECHO_C" >&6
25071
25072
        if $PKG_CONFIG --exists "libart-2.0 >= 2.1" ; then
25073
            echo "$as_me:$LINENO: result: yes" >&5
25074
echo "${ECHO_T}yes" >&6
25075
            succeeded=yes
25076
25077
            echo "$as_me:$LINENO: checking LIBART_CFLAGS" >&5
25078
echo $ECHO_N "checking LIBART_CFLAGS... $ECHO_C" >&6
25079
            LIBART_CFLAGS=`$PKG_CONFIG --cflags "libart-2.0 >= 2.1"`
25080
            echo "$as_me:$LINENO: result: $LIBART_CFLAGS" >&5
25081
echo "${ECHO_T}$LIBART_CFLAGS" >&6
25082
25083
            echo "$as_me:$LINENO: checking LIBART_LIBS" >&5
25084
echo $ECHO_N "checking LIBART_LIBS... $ECHO_C" >&6
25085
            LIBART_LIBS=`$PKG_CONFIG --libs "libart-2.0 >= 2.1"`
25086
            echo "$as_me:$LINENO: result: $LIBART_LIBS" >&5
25087
echo "${ECHO_T}$LIBART_LIBS" >&6
25088
        else
25089
            LIBART_CFLAGS=""
25090
            LIBART_LIBS=""
25091
            ## If we have a custom action on failure, don't print errors, but
25092
            ## do set a variable so people can do so.
25093
            LIBART_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libart-2.0 >= 2.1"`
25094
            echo $LIBART_PKG_ERRORS
25095
        fi
25096
25097
25098
25099
     else
25100
        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
25101
        echo "*** See http://www.freedesktop.org/software/pkgconfig"
25102
     fi
25103
  fi
25104
25105
  if test $succeeded = yes; then
25106
     :
25107
  else
25108
     { { 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
25109
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;}
25110
   { (exit 1); exit 1; }; }
25111
  fi
25112
25113
25114
25115
25116
      # We require the XTest Extension to support java.awt.Robot.
25015
      # We require the XTest Extension to support java.awt.Robot.
25117
      echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5
25016
      echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5
25118
echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6
25017
echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6
Lines 29295-29302 Link Here
29295
s,@GTK_LIBS@,$GTK_LIBS,;t t
29194
s,@GTK_LIBS@,$GTK_LIBS,;t t
29296
s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
29195
s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t
29297
s,@GLIB_LIBS@,$GLIB_LIBS,;t t
29196
s,@GLIB_LIBS@,$GLIB_LIBS,;t t
29298
s,@LIBART_CFLAGS@,$LIBART_CFLAGS,;t t
29299
s,@LIBART_LIBS@,$LIBART_LIBS,;t t
29300
s,@CLASSPATH_SEPARATOR@,$CLASSPATH_SEPARATOR,;t t
29197
s,@CLASSPATH_SEPARATOR@,$CLASSPATH_SEPARATOR,;t t
29301
s,@ZLIBS@,$ZLIBS,;t t
29198
s,@ZLIBS@,$ZLIBS,;t t
29302
s,@SYS_ZLIBS@,$SYS_ZLIBS,;t t
29199
s,@SYS_ZLIBS@,$SYS_ZLIBS,;t t
29303
-- libjava/Makefile.in
29200
++ libjava/Makefile.in
Lines 643-650 Link Here
643
LDFLAGS = @LDFLAGS@
643
LDFLAGS = @LDFLAGS@
644
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
644
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
645
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
645
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
646
LIBART_CFLAGS = @LIBART_CFLAGS@
647
LIBART_LIBS = @LIBART_LIBS@
648
LIBFFI = @LIBFFI@
646
LIBFFI = @LIBFFI@
649
LIBFFIINCS = @LIBFFIINCS@
647
LIBFFIINCS = @LIBFFIINCS@
650
LIBGCJDEBUG = @LIBGCJDEBUG@
648
LIBGCJDEBUG = @LIBGCJDEBUG@
651
-- libjava/gcj/Makefile.in
649
++ libjava/gcj/Makefile.in
Lines 166-173 Link Here
166
LDFLAGS = @LDFLAGS@
166
LDFLAGS = @LDFLAGS@
167
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
167
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
168
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
168
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
169
LIBART_CFLAGS = @LIBART_CFLAGS@
170
LIBART_LIBS = @LIBART_LIBS@
171
LIBFFI = @LIBFFI@
169
LIBFFI = @LIBFFI@
172
LIBFFIINCS = @LIBFFIINCS@
170
LIBFFIINCS = @LIBFFIINCS@
173
LIBGCJDEBUG = @LIBGCJDEBUG@
171
LIBGCJDEBUG = @LIBGCJDEBUG@
174
-- libjava/include/Makefile.in
172
++ libjava/include/Makefile.in
Lines 165-172 Link Here
165
LDFLAGS = @LDFLAGS@
165
LDFLAGS = @LDFLAGS@
166
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
166
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
167
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
167
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
168
LIBART_CFLAGS = @LIBART_CFLAGS@
169
LIBART_LIBS = @LIBART_LIBS@
170
LIBFFI = @LIBFFI@
168
LIBFFI = @LIBFFI@
171
LIBFFIINCS = @LIBFFIINCS@
169
LIBFFIINCS = @LIBFFIINCS@
172
LIBGCJDEBUG = @LIBGCJDEBUG@
170
LIBGCJDEBUG = @LIBGCJDEBUG@
173
-- libjava/testsuite/Makefile.in
171
++ libjava/testsuite/Makefile.in
Lines 154-161 Link Here
154
LDFLAGS = @LDFLAGS@
154
LDFLAGS = @LDFLAGS@
155
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
155
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
156
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
156
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
157
LIBART_CFLAGS = @LIBART_CFLAGS@
158
LIBART_LIBS = @LIBART_LIBS@
159
LIBFFI = @LIBFFI@
157
LIBFFI = @LIBFFI@
160
LIBFFIINCS = @LIBFFIINCS@
158
LIBFFIINCS = @LIBFFIINCS@
161
LIBGCJDEBUG = @LIBGCJDEBUG@
159
LIBGCJDEBUG = @LIBGCJDEBUG@

Return to bug 513716