Line
Link Here
|
0 |
-- libjava/configure.ac |
0 |
++ libjava/configure.ac |
Lines 1340-1349
Link Here
|
1340 |
AC_SUBST(GLIB_CFLAGS) |
1340 |
AC_SUBST(GLIB_CFLAGS) |
1341 |
AC_SUBST(GLIB_LIBS) |
1341 |
AC_SUBST(GLIB_LIBS) |
1342 |
|
1342 |
|
1343 |
PKG_CHECK_MODULES(LIBART, libart-2.0 >= 2.1) |
|
|
1344 |
AC_SUBST(LIBART_CFLAGS) |
1345 |
AC_SUBST(LIBART_LIBS) |
1346 |
|
1347 |
# We require the XTest Extension to support java.awt.Robot. |
1343 |
# We require the XTest Extension to support java.awt.Robot. |
1348 |
AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true], |
1344 |
AC_CHECK_LIB([Xtst], [XTestQueryExtension], [true], |
1349 |
[AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])], |
1345 |
[AC_MSG_ERROR([libXtst not found, required by java.awt.Robot])], |
1350 |
-- libjava/configure |
1346 |
++ 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 ANTLR_JAR CREATE_GJDOC_TRUE CREATE_GJDOC_FALSE 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 OBJDUMP ac_ct_OBJDUMP lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 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 BUILD_LIBGCJ_REDUCED_REFLECTION_TRUE BUILD_LIBGCJ_REDUCED_REFLECTION_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 INSTALL_BINARIES_TRUE INSTALL_BINARIES_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION dbexecdir gcjsubdir gxx_include_dir libstdcxx_incdir PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here python_mod_dir python_mod_dir_expanded MAKE INSTALL_AOT_RPM_TRUE INSTALL_AOT_RPM_FALSE CREATE_JAVA_HOME_TRUE CREATE_JAVA_HOME_FALSE gcc_suffix JAVA_VERSION BUILD_VERSION JVM_ROOT_DIR JVM_JAR_ROOT_DIR JVM_JAR_DIR JRE_DIR JRE_LNK SDK_LNK SDK_BIN_DIR SDK_LIB_DIR SDK_INCLUDE_DIR JRE_BIN_DIR JRE_LIB_DIR GCJ_BIN_DIR CPU OS LIBDIR 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 ANTLR_JAR CREATE_GJDOC_TRUE CREATE_GJDOC_FALSE 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 OBJDUMP ac_ct_OBJDUMP lt_ECHO DSYMUTIL ac_ct_DSYMUTIL NMEDIT ac_ct_NMEDIT LIPO ac_ct_LIPO OTOOL ac_ct_OTOOL OTOOL64 ac_ct_OTOOL64 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 BUILD_LIBGCJ_REDUCED_REFLECTION_TRUE BUILD_LIBGCJ_REDUCED_REFLECTION_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 INSTALL_BINARIES_TRUE INSTALL_BINARIES_FALSE GCC_UNWIND_INCLUDE toolexecdir toolexecmainlibdir toolexeclibdir GCJVERSION dbexecdir gcjsubdir gxx_include_dir libstdcxx_incdir PERL SYSDEP_SOURCES ANONVERSCRIPT_TRUE ANONVERSCRIPT_FALSE LD_START_STATIC_SPEC LD_FINISH_STATIC_SPEC here python_mod_dir python_mod_dir_expanded MAKE INSTALL_AOT_RPM_TRUE INSTALL_AOT_RPM_FALSE CREATE_JAVA_HOME_TRUE CREATE_JAVA_HOME_FALSE gcc_suffix JAVA_VERSION BUILD_VERSION JVM_ROOT_DIR JVM_JAR_ROOT_DIR JVM_JAR_DIR JRE_DIR JRE_LNK SDK_LNK SDK_BIN_DIR SDK_LIB_DIR SDK_INCLUDE_DIR JRE_BIN_DIR JRE_LIB_DIR GCJ_BIN_DIR CPU OS LIBDIR LIBOBJS LTLIBOBJS' |
463 |
ac_subst_files='' |
463 |
ac_subst_files='' |
464 |
ac_pwd=`pwd` |
464 |
ac_pwd=`pwd` |
465 |
|
465 |
|
Lines 25265-25371
Link Here
|
25265 |
|
25265 |
|
25266 |
|
25266 |
|
25267 |
|
25267 |
|
25268 |
|
|
|
25269 |
succeeded=no |
25270 |
|
25271 |
if test -z "$PKG_CONFIG"; then |
25272 |
# Extract the first word of "pkg-config", so it can be a program name with args. |
25273 |
set dummy pkg-config; ac_word=$2 |
25274 |
echo "$as_me:$LINENO: checking for $ac_word" >&5 |
25275 |
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 |
25276 |
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then |
25277 |
echo $ECHO_N "(cached) $ECHO_C" >&6 |
25278 |
else |
25279 |
case $PKG_CONFIG in |
25280 |
[\\/]* | ?:[\\/]*) |
25281 |
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path. |
25282 |
;; |
25283 |
*) |
25284 |
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR |
25285 |
for as_dir in $PATH |
25286 |
do |
25287 |
IFS=$as_save_IFS |
25288 |
test -z "$as_dir" && as_dir=. |
25289 |
for ac_exec_ext in '' $ac_executable_extensions; do |
25290 |
if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then |
25291 |
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext" |
25292 |
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 |
25293 |
break 2 |
25294 |
fi |
25295 |
done |
25296 |
done |
25297 |
|
25298 |
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no" |
25299 |
;; |
25300 |
esac |
25301 |
fi |
25302 |
PKG_CONFIG=$ac_cv_path_PKG_CONFIG |
25303 |
|
25304 |
if test -n "$PKG_CONFIG"; then |
25305 |
echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5 |
25306 |
echo "${ECHO_T}$PKG_CONFIG" >&6 |
25307 |
else |
25308 |
echo "$as_me:$LINENO: result: no" >&5 |
25309 |
echo "${ECHO_T}no" >&6 |
25310 |
fi |
25311 |
|
25312 |
fi |
25313 |
|
25314 |
if test "$PKG_CONFIG" = "no" ; then |
25315 |
echo "*** The pkg-config script could not be found. Make sure it is" |
25316 |
echo "*** in your path, or set the PKG_CONFIG environment variable" |
25317 |
echo "*** to the full path to pkg-config." |
25318 |
echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config." |
25319 |
else |
25320 |
PKG_CONFIG_MIN_VERSION=0.9.0 |
25321 |
if $PKG_CONFIG --atleast-pkgconfig-version $PKG_CONFIG_MIN_VERSION; then |
25322 |
echo "$as_me:$LINENO: checking for libart-2.0 >= 2.1" >&5 |
25323 |
echo $ECHO_N "checking for libart-2.0 >= 2.1... $ECHO_C" >&6 |
25324 |
|
25325 |
if $PKG_CONFIG --exists "libart-2.0 >= 2.1" ; then |
25326 |
echo "$as_me:$LINENO: result: yes" >&5 |
25327 |
echo "${ECHO_T}yes" >&6 |
25328 |
succeeded=yes |
25329 |
|
25330 |
echo "$as_me:$LINENO: checking LIBART_CFLAGS" >&5 |
25331 |
echo $ECHO_N "checking LIBART_CFLAGS... $ECHO_C" >&6 |
25332 |
LIBART_CFLAGS=`$PKG_CONFIG --cflags "libart-2.0 >= 2.1"` |
25333 |
echo "$as_me:$LINENO: result: $LIBART_CFLAGS" >&5 |
25334 |
echo "${ECHO_T}$LIBART_CFLAGS" >&6 |
25335 |
|
25336 |
echo "$as_me:$LINENO: checking LIBART_LIBS" >&5 |
25337 |
echo $ECHO_N "checking LIBART_LIBS... $ECHO_C" >&6 |
25338 |
LIBART_LIBS=`$PKG_CONFIG --libs "libart-2.0 >= 2.1"` |
25339 |
echo "$as_me:$LINENO: result: $LIBART_LIBS" >&5 |
25340 |
echo "${ECHO_T}$LIBART_LIBS" >&6 |
25341 |
else |
25342 |
LIBART_CFLAGS="" |
25343 |
LIBART_LIBS="" |
25344 |
## If we have a custom action on failure, don't print errors, but |
25345 |
## do set a variable so people can do so. |
25346 |
LIBART_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "libart-2.0 >= 2.1"` |
25347 |
echo $LIBART_PKG_ERRORS |
25348 |
fi |
25349 |
|
25350 |
|
25351 |
|
25352 |
else |
25353 |
echo "*** Your version of pkg-config is too old. You need version $PKG_CONFIG_MIN_VERSION or newer." |
25354 |
echo "*** See http://www.freedesktop.org/software/pkgconfig" |
25355 |
fi |
25356 |
fi |
25357 |
|
25358 |
if test $succeeded = yes; then |
25359 |
: |
25360 |
else |
25361 |
{ { 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 |
25362 |
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;} |
25363 |
{ (exit 1); exit 1; }; } |
25364 |
fi |
25365 |
|
25366 |
|
25367 |
|
25368 |
|
25369 |
# We require the XTest Extension to support java.awt.Robot. |
25268 |
# We require the XTest Extension to support java.awt.Robot. |
25370 |
echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5 |
25269 |
echo "$as_me:$LINENO: checking for XTestQueryExtension in -lXtst" >&5 |
25371 |
echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6 |
25270 |
echo $ECHO_N "checking for XTestQueryExtension in -lXtst... $ECHO_C" >&6 |
Lines 29875-29882
Link Here
|
29875 |
s,@GTK_LIBS@,$GTK_LIBS,;t t |
29774 |
s,@GTK_LIBS@,$GTK_LIBS,;t t |
29876 |
s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t |
29775 |
s,@GLIB_CFLAGS@,$GLIB_CFLAGS,;t t |
29877 |
s,@GLIB_LIBS@,$GLIB_LIBS,;t t |
29776 |
s,@GLIB_LIBS@,$GLIB_LIBS,;t t |
29878 |
s,@LIBART_CFLAGS@,$LIBART_CFLAGS,;t t |
|
|
29879 |
s,@LIBART_LIBS@,$LIBART_LIBS,;t t |
29880 |
s,@CLASSPATH_SEPARATOR@,$CLASSPATH_SEPARATOR,;t t |
29777 |
s,@CLASSPATH_SEPARATOR@,$CLASSPATH_SEPARATOR,;t t |
29881 |
s,@ZLIBS@,$ZLIBS,;t t |
29778 |
s,@ZLIBS@,$ZLIBS,;t t |
29882 |
s,@SYS_ZLIBS@,$SYS_ZLIBS,;t t |
29779 |
s,@SYS_ZLIBS@,$SYS_ZLIBS,;t t |
29883 |
-- libjava/Makefile.in |
29780 |
++ libjava/Makefile.in |
Lines 692-699
Link Here
|
692 |
LDFLAGS = @LDFLAGS@ |
692 |
LDFLAGS = @LDFLAGS@ |
693 |
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ |
693 |
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ |
694 |
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ |
694 |
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ |
695 |
LIBART_CFLAGS = @LIBART_CFLAGS@ |
|
|
696 |
LIBART_LIBS = @LIBART_LIBS@ |
697 |
LIBDIR = @LIBDIR@ |
695 |
LIBDIR = @LIBDIR@ |
698 |
LIBFFI = @LIBFFI@ |
696 |
LIBFFI = @LIBFFI@ |
699 |
LIBFFIINCS = @LIBFFIINCS@ |
697 |
LIBFFIINCS = @LIBFFIINCS@ |
700 |
-- libjava/gcj/Makefile.in |
698 |
++ libjava/gcj/Makefile.in |
Lines 190-197
Link Here
|
190 |
LDFLAGS = @LDFLAGS@ |
190 |
LDFLAGS = @LDFLAGS@ |
191 |
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ |
191 |
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ |
192 |
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ |
192 |
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ |
193 |
LIBART_CFLAGS = @LIBART_CFLAGS@ |
|
|
194 |
LIBART_LIBS = @LIBART_LIBS@ |
195 |
LIBDIR = @LIBDIR@ |
193 |
LIBDIR = @LIBDIR@ |
196 |
LIBFFI = @LIBFFI@ |
194 |
LIBFFI = @LIBFFI@ |
197 |
LIBFFIINCS = @LIBFFIINCS@ |
195 |
LIBFFIINCS = @LIBFFIINCS@ |
198 |
-- libjava/include/Makefile.in |
196 |
++ libjava/include/Makefile.in |
Lines 189-196
Link Here
|
189 |
LDFLAGS = @LDFLAGS@ |
189 |
LDFLAGS = @LDFLAGS@ |
190 |
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ |
190 |
LD_FINISH_STATIC_SPEC = @LD_FINISH_STATIC_SPEC@ |
191 |
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ |
191 |
LD_START_STATIC_SPEC = @LD_START_STATIC_SPEC@ |
192 |
LIBART_CFLAGS = @LIBART_CFLAGS@ |
|
|
193 |
LIBART_LIBS = @LIBART_LIBS@ |
194 |
LIBDIR = @LIBDIR@ |
192 |
LIBDIR = @LIBDIR@ |
195 |
LIBFFI = @LIBFFI@ |
193 |
LIBFFI = @LIBFFI@ |
196 |
LIBFFIINCS = @LIBFFIINCS@ |
194 |
LIBFFIINCS = @LIBFFIINCS@ |
197 |
-- libjava/testsuite/Makefile.in |
195 |
++ libjava/testsuite/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@ |