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

Return to bug 513716