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 (-177 / +6 lines)
Line  Link Here
0
-- libjava/configure.ac
0
++ libjava/configure.ac
Lines 1453-1462 Link Here
1453
      AC_SUBST(GLIB_CFLAGS)
1453
      AC_SUBST(GLIB_CFLAGS)
1454
      AC_SUBST(GLIB_LIBS)
1454
      AC_SUBST(GLIB_LIBS)
1455
1455
1456
      PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1)
1457
      AC_SUBST(LIBART_CFLAGS)
1458
      AC_SUBST(LIBART_LIBS)
1459
1460
      # We require the XTest Extension to support java.awt.Robot.
1456
      # We require the XTest Extension to support java.awt.Robot.
1461
      AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
1457
      AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
1462
		   [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],
1458
		   [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],
1463
-- libjava/configure
1459
++ libjava/configure
Lines 666-673 Link Here
666
SYS_ZLIBS
666
SYS_ZLIBS
667
ZLIBS
667
ZLIBS
668
CLASSPATH_SEPARATOR
668
CLASSPATH_SEPARATOR
669
LIBART_LIBS
670
LIBART_CFLAGS
671
GLIB_LIBS
669
GLIB_LIBS
672
GLIB_CFLAGS
670
GLIB_CFLAGS
673
GTK_LIBS
671
GTK_LIBS
Lines 23114-23276 Link Here
23114
  fi
23112
  fi
23115
23113
23116
23114
23117
23118
23119
23120
  succeeded=no
23121
23122
  if test -z "$PKG_CONFIG"; then
23123
    if test -n "$ac_tool_prefix"; then
23124
  # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
23125
set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
23126
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
23127
$as_echo_n "checking for $ac_word... " >&6; }
23128
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
23129
  $as_echo_n "(cached) " >&6
23130
else
23131
  case $PKG_CONFIG in
23132
  [\\/]* | ?:[\\/]*)
23133
  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
23134
  ;;
23135
  *)
23136
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
23137
for as_dir in $PATH
23138
do
23139
  IFS=$as_save_IFS
23140
  test -z "$as_dir" && as_dir=.
23141
    for ac_exec_ext in '' $ac_executable_extensions; do
23142
  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
23143
    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
23144
    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
23145
    break 2
23146
  fi
23147
done
23148
  done
23149
IFS=$as_save_IFS
23150
23151
  ;;
23152
esac
23153
fi
23154
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
23155
if test -n "$PKG_CONFIG"; then
23156
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
23157
$as_echo "$PKG_CONFIG" >&6; }
23158
else
23159
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
23160
$as_echo "no" >&6; }
23161
fi
23162
23163
23164
fi
23165
if test -z "$ac_cv_path_PKG_CONFIG"; then
23166
  ac_pt_PKG_CONFIG=$PKG_CONFIG
23167
  # Extract the first word of "pkg-config", so it can be a program name with args.
23168
set dummy pkg-config; ac_word=$2
23169
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
23170
$as_echo_n "checking for $ac_word... " >&6; }
23171
if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
23172
  $as_echo_n "(cached) " >&6
23173
else
23174
  case $ac_pt_PKG_CONFIG in
23175
  [\\/]* | ?:[\\/]*)
23176
  ac_cv_path_ac_pt_PKG_CONFIG="$ac_pt_PKG_CONFIG" # Let the user override the test with a path.
23177
  ;;
23178
  *)
23179
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
23180
for as_dir in $PATH
23181
do
23182
  IFS=$as_save_IFS
23183
  test -z "$as_dir" && as_dir=.
23184
    for ac_exec_ext in '' $ac_executable_extensions; do
23185
  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
23186
    ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
23187
    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
23188
    break 2
23189
  fi
23190
done
23191
  done
23192
IFS=$as_save_IFS
23193
23194
  ;;
23195
esac
23196
fi
23197
ac_pt_PKG_CONFIG=$ac_cv_path_ac_pt_PKG_CONFIG
23198
if test -n "$ac_pt_PKG_CONFIG"; then
23199
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_pt_PKG_CONFIG" >&5
23200
$as_echo "$ac_pt_PKG_CONFIG" >&6; }
23201
else
23202
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
23203
$as_echo "no" >&6; }
23204
fi
23205
23206
  if test "x$ac_pt_PKG_CONFIG" = x; then
23207
    PKG_CONFIG="no"
23208
  else
23209
    case $cross_compiling:$ac_tool_warned in
23210
yes:)
23211
{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
23212
$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
23213
ac_tool_warned=yes ;;
23214
esac
23215
    PKG_CONFIG=$ac_pt_PKG_CONFIG
23216
  fi
23217
else
23218
  PKG_CONFIG="$ac_cv_path_PKG_CONFIG"
23219
fi
23220
23221
  fi
23222
23223
  if test "$PKG_CONFIG" = "no" ; then
23224
     echo "*** The pkg-config script could not be found. Make sure it is"
23225
     echo "*** in your path, or set the PKG_CONFIG environment variable"
23226
     echo "*** to the full path to pkg-config."
23227
     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
23228
  else
23229
     PKG_CONFIG_MIN_VERSION=0.9.0
23230
     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
23231
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libart-2.0 >= 2.1" >&5
23232
$as_echo_n "checking for libart-2.0 >= 2.1... " >&6; }
23233
23234
        if $PKG_CONFIG --exists "libart-2.0 >= 2.1" ; then
23235
            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
23236
$as_echo "yes" >&6; }
23237
            succeeded=yes
23238
23239
            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBART_CFLAGS" >&5
23240
$as_echo_n "checking LIBART_CFLAGS... " >&6; }
23241
            LIBART_CFLAGS=`$PKG_CONFIG --cflags "libart-2.0 >= 2.1"`
23242
            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBART_CFLAGS" >&5
23243
$as_echo "$LIBART_CFLAGS" >&6; }
23244
23245
            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBART_LIBS" >&5
23246
$as_echo_n "checking LIBART_LIBS... " >&6; }
23247
            LIBART_LIBS=`$PKG_CONFIG --libs "libart-2.0 >= 2.1"`
23248
            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBART_LIBS" >&5
23249
$as_echo "$LIBART_LIBS" >&6; }
23250
        else
23251
            LIBART_CFLAGS=""
23252
            LIBART_LIBS=""
23253
            ## If we have a custom action on failure, don't print errors, but
23254
            ## do set a variable so people can do so.
23255
            LIBART_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libart-2.0 >= 2.1"`
23256
            echo $LIBART_PKG_ERRORS
23257
        fi
23258
23259
23260
23261
     else
23262
        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
23263
        echo "*** See http://www.freedesktop.org/software/pkgconfig"
23264
     fi
23265
  fi
23266
23267
  if test $succeeded = yes; then
23268
     :
23269
  else
23270
     as_fn_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." "$LINENO" 5
23271
  fi
23272
23273
23274
23115
23275
23116
23276
      # We require the XTest Extension to support java.awt.Robot.
23117
      # We require the XTest Extension to support java.awt.Robot.
23277
-- libjava/Makefile.in
23118
++ libjava/Makefile.in
Lines 596-603 Link Here
596
LDLIBICONV = @LDLIBICONV@
596
LDLIBICONV = @LDLIBICONV@
597
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
597
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
598
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
598
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
599
LIBART_CFLAGS = @LIBART_CFLAGS@
600
LIBART_LIBS = @LIBART_LIBS@
601
LIBDIR = @LIBDIR@
599
LIBDIR = @LIBDIR@
602
LIBFFI = @LIBFFI@
600
LIBFFI = @LIBFFI@
603
LIBFFIINCS = @LIBFFIINCS@
601
LIBFFIINCS = @LIBFFIINCS@
604
-- libjava/gcj/Makefile.in
602
++ libjava/gcj/Makefile.in
Lines 177-184 Link Here
177
LDLIBICONV = @LDLIBICONV@
177
LDLIBICONV = @LDLIBICONV@
178
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
178
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
179
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
179
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
180
LIBART_CFLAGS = @LIBART_CFLAGS@
181
LIBART_LIBS = @LIBART_LIBS@
182
LIBDIR = @LIBDIR@
180
LIBDIR = @LIBDIR@
183
LIBFFI = @LIBFFI@
181
LIBFFI = @LIBFFI@
184
LIBFFIINCS = @LIBFFIINCS@
182
LIBFFIINCS = @LIBFFIINCS@
185
-- libjava/include/Makefile.in
183
++ libjava/include/Makefile.in
Lines 178-185 Link Here
178
LDLIBICONV = @LDLIBICONV@
178
LDLIBICONV = @LDLIBICONV@
179
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
179
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
180
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
180
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
181
LIBART_CFLAGS = @LIBART_CFLAGS@
182
LIBART_LIBS = @LIBART_LIBS@
183
LIBDIR = @LIBDIR@
181
LIBDIR = @LIBDIR@
184
LIBFFI = @LIBFFI@
182
LIBFFI = @LIBFFI@
185
LIBFFIINCS = @LIBFFIINCS@
183
LIBFFIINCS = @LIBFFIINCS@
186
-- libjava/testsuite/Makefile.in
184
++ libjava/testsuite/Makefile.in
Lines 153-160 Link Here
153
LDLIBICONV = @LDLIBICONV@
153
LDLIBICONV = @LDLIBICONV@
154
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
154
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
155
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
155
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
156
LIBART_CFLAGS = @LIBART_CFLAGS@
157
LIBART_LIBS = @LIBART_LIBS@
158
LIBDIR = @LIBDIR@
156
LIBDIR = @LIBDIR@
159
LIBFFI = @LIBFFI@
157
LIBFFI = @LIBFFI@
160
LIBFFIINCS = @LIBFFIINCS@
158
LIBFFIINCS = @LIBFFIINCS@

Return to bug 513716