Mercurial > hg > openjdk > lambda
changeset 961:fb58db41d533
Import patch from jdk/build to address libfreetype dependence
| author | briangoetz |
|---|---|
| date | Mon, 28 Oct 2013 21:35:45 -0400 |
| parents | 803d5d602dde |
| children | bb31481efc2a |
| files | common/autoconf/generated-configure.sh common/autoconf/libraries.m4 |
| diffstat | 2 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Mon Oct 28 21:14:05 2013 -0400 +++ b/common/autoconf/generated-configure.sh Mon Oct 28 21:35:45 2013 -0400 @@ -34245,10 +34245,10 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu PREV_CXXCFLAGS="$CXXFLAGS" - PREV_LDFLAGS="$LDFLAGS" + PREV_LIBS="$LIBS" PREV_CXX="$CXX" CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS" - LDFLAGS="$LDFLAGS $FREETYPE_LIBS" + LIBS="$LIBS $FREETYPE_LIBS" CXX="$FIXPATH $CXX" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -34315,7 +34315,7 @@ rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext CXXCFLAGS="$PREV_CXXFLAGS" - LDFLAGS="$PREV_LDFLAGS" + LIBS="$PREV_LIBS" CXX="$PREV_CXX" ac_ext=cpp ac_cpp='$CXXCPP $CPPFLAGS'
--- a/common/autoconf/libraries.m4 Mon Oct 28 21:14:05 2013 -0400 +++ b/common/autoconf/libraries.m4 Mon Oct 28 21:35:45 2013 -0400 @@ -481,10 +481,10 @@ AC_MSG_CHECKING([if we can compile and link with freetype]) AC_LANG_PUSH(C++) PREV_CXXCFLAGS="$CXXFLAGS" - PREV_LDFLAGS="$LDFLAGS" + PREV_LIBS="$LIBS" PREV_CXX="$CXX" CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS" - LDFLAGS="$LDFLAGS $FREETYPE_LIBS" + LIBS="$LIBS $FREETYPE_LIBS" CXX="$FIXPATH $CXX" AC_LINK_IFELSE([AC_LANG_SOURCE([[ #include<ft2build.h> @@ -508,7 +508,7 @@ ] ) CXXCFLAGS="$PREV_CXXFLAGS" - LDFLAGS="$PREV_LDFLAGS" + LIBS="$PREV_LIBS" CXX="$PREV_CXX" AC_LANG_POP(C++)