diff --git a/common/autoconf/generated-configure.sh b/common/autoconf/generated-configure.sh index 34e2ef775e7b77db97056a16351cbd0a510b0f6e..97c1733d451bc49febd9d4d78dd9e120b755eede 100644 --- a/common/autoconf/generated-configure.sh +++ b/common/autoconf/generated-configure.sh @@ -3865,7 +3865,7 @@ fi #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_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ex 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 @@ fi 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' diff --git a/common/autoconf/libraries.m4 b/common/autoconf/libraries.m4 index c41da30a70b318acd7072f28817c1603db7263f4..c2cc3794429b7938f0a8ab1273b2ea35d66c514d 100644 --- a/common/autoconf/libraries.m4 +++ b/common/autoconf/libraries.m4 @@ -481,10 +481,10 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE], 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 @@ -508,7 +508,7 @@ AC_DEFUN_ONCE([LIB_SETUP_FREETYPE], ] ) CXXCFLAGS="$PREV_CXXFLAGS" - LDFLAGS="$PREV_LDFLAGS" + LIBS="$PREV_LIBS" CXX="$PREV_CXX" AC_LANG_POP(C++)