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 (-120 / +6 lines)
Line  Link Here
0
-- libjava/configure.ac
0
++ libjava/configure.ac
Lines 1390-1399 Link Here
1390
      AC_SUBST(GLIB_CFLAGS)
1390
      AC_SUBST(GLIB_CFLAGS)
1391
      AC_SUBST(GLIB_LIBS)
1391
      AC_SUBST(GLIB_LIBS)
1392
1392
1393
      PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1)
1394
      AC_SUBST(LIBART_CFLAGS)
1395
      AC_SUBST(LIBART_LIBS)
1396
1397
      # We require the XTest Extension to support java.awt.Robot.
1393
      # We require the XTest Extension to support java.awt.Robot.
1398
      AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
1394
      AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true],
1399
		   [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],
1395
		   [AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])],
1400
-- libjava/configure
1396
++ libjava/configure
Lines 662-669 Link Here
662
SYS_ZLIBS
662
SYS_ZLIBS
663
ZLIBS
663
ZLIBS
664
CLASSPATH_SEPARATOR
664
CLASSPATH_SEPARATOR
665
LIBART_LIBS
666
LIBART_CFLAGS
667
GLIB_LIBS
665
GLIB_LIBS
668
GLIB_CFLAGS
666
GLIB_CFLAGS
669
GTK_LIBS
667
GTK_LIBS
Lines 22877-22982 Link Here
22877
  fi
22875
  fi
22878
22876
22879
22877
22880
22881
22882
22883
  succeeded=no
22884
22885
  if test -z "$PKG_CONFIG"; then
22886
    # Extract the first word of "pkg-config", so it can be a program name with args.
22887
set dummy pkg-config; ac_word=$2
22888
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
22889
$as_echo_n "checking for $ac_word... " >&6; }
22890
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
22891
  $as_echo_n "(cached) " >&6
22892
else
22893
  case $PKG_CONFIG in
22894
  [\\/]* | ?:[\\/]*)
22895
  ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
22896
  ;;
22897
  *)
22898
  as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
22899
for as_dir in $PATH
22900
do
22901
  IFS=$as_save_IFS
22902
  test -z "$as_dir" && as_dir=.
22903
    for ac_exec_ext in '' $ac_executable_extensions; do
22904
  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
22905
    ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
22906
    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
22907
    break 2
22908
  fi
22909
done
22910
  done
22911
IFS=$as_save_IFS
22912
22913
  test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
22914
  ;;
22915
esac
22916
fi
22917
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
22918
if test -n "$PKG_CONFIG"; then
22919
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $PKG_CONFIG" >&5
22920
$as_echo "$PKG_CONFIG" >&6; }
22921
else
22922
  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
22923
$as_echo "no" >&6; }
22924
fi
22925
22926
22927
  fi
22928
22929
  if test "$PKG_CONFIG" = "no" ; then
22930
     echo "*** The pkg-config script could not be found. Make sure it is"
22931
     echo "*** in your path, or set the PKG_CONFIG environment variable"
22932
     echo "*** to the full path to pkg-config."
22933
     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
22934
  else
22935
     PKG_CONFIG_MIN_VERSION=0.9.0
22936
     if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then
22937
        { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libart-2.0 >= 2.1" >&5
22938
$as_echo_n "checking for libart-2.0 >= 2.1... " >&6; }
22939
22940
        if $PKG_CONFIG --exists "libart-2.0 >= 2.1" ; then
22941
            { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
22942
$as_echo "yes" >&6; }
22943
            succeeded=yes
22944
22945
            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBART_CFLAGS" >&5
22946
$as_echo_n "checking LIBART_CFLAGS... " >&6; }
22947
            LIBART_CFLAGS=`$PKG_CONFIG --cflags "libart-2.0 >= 2.1"`
22948
            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBART_CFLAGS" >&5
22949
$as_echo "$LIBART_CFLAGS" >&6; }
22950
22951
            { $as_echo "$as_me:${as_lineno-$LINENO}: checking LIBART_LIBS" >&5
22952
$as_echo_n "checking LIBART_LIBS... " >&6; }
22953
            LIBART_LIBS=`$PKG_CONFIG --libs "libart-2.0 >= 2.1"`
22954
            { $as_echo "$as_me:${as_lineno-$LINENO}: result: $LIBART_LIBS" >&5
22955
$as_echo "$LIBART_LIBS" >&6; }
22956
        else
22957
            LIBART_CFLAGS=""
22958
            LIBART_LIBS=""
22959
            ## If we have a custom action on failure, don't print errors, but
22960
            ## do set a variable so people can do so.
22961
            LIBART_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libart-2.0 >= 2.1"`
22962
            echo $LIBART_PKG_ERRORS
22963
        fi
22964
22965
22966
22967
     else
22968
        echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer."
22969
        echo "*** See http://www.freedesktop.org/software/pkgconfig"
22970
     fi
22971
  fi
22972
22973
  if test $succeeded = yes; then
22974
     :
22975
  else
22976
     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
22977
  fi
22978
22979
22980
22878
22981
22879
22982
      # We require the XTest Extension to support java.awt.Robot.
22880
      # We require the XTest Extension to support java.awt.Robot.
22983
-- libjava/Makefile.in
22881
++ libjava/Makefile.in
Lines 714-721 Link Here
714
LDFLAGS = @LDFLAGS@
714
LDFLAGS = @LDFLAGS@
715
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
715
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@
716
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
716
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@
717
LIBART_CFLAGS = @LIBART_CFLAGS@
718
LIBART_LIBS = @LIBART_LIBS@
719
LIBDIR = @LIBDIR@
717
LIBDIR = @LIBDIR@
720
LIBFFI = @LIBFFI@
718
LIBFFI = @LIBFFI@
721
LIBFFIINCS = @LIBFFIINCS@
719
LIBFFIINCS = @LIBFFIINCS@
722
-- libjava/gcj/Makefile.in
720
++ libjava/gcj/Makefile.in
Lines 178-185 Link Here
178
LDFLAGS = @LDFLAGS@
178
LDFLAGS = @LDFLAGS@
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/include/Makefile.in
184
++ libjava/include/Makefile.in
Lines 178-185 Link Here
178
LDFLAGS = @LDFLAGS@
178
LDFLAGS = @LDFLAGS@
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
LDFLAGS = @LDFLAGS@
153
LDFLAGS = @LDFLAGS@
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