Mercurial > hg > openjdk > lambda
changeset 964:72ef61df77e5
8027300: configure should use LIBS instead of LDFLAGS when testing freetype
Reviewed-by: erikj
| author | ihse |
|---|---|
| date | Fri, 25 Oct 2013 13:58:09 +0200 |
| parents | 3c48e11c3901 |
| children | dfbc93f26f38 |
| files | common/autoconf/generated-configure.sh common/autoconf/libraries.m4 |
| diffstat | 2 files changed, 7 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/common/autoconf/generated-configure.sh Thu Oct 24 20:45:43 2013 -0400 +++ b/common/autoconf/generated-configure.sh Fri Oct 25 13:58:09 2013 +0200 @@ -3865,7 +3865,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1382659005 +DATE_WHEN_GENERATED=1382702260 ############################################################################### # @@ -34253,10 +34253,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. */ @@ -34323,7 +34323,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 Thu Oct 24 20:45:43 2013 -0400 +++ b/common/autoconf/libraries.m4 Fri Oct 25 13:58:09 2013 +0200 @@ -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++)