8027300: configure should use LIBS instead of LDFLAGS when testing freetype

Fri, 25 Oct 2013 13:58:09 +0200

author
ihse
date
Fri, 25 Oct 2013 13:58:09 +0200
changeset 873
72ef61df77e5
parent 872
3c48e11c3901
child 874
dfbc93f26f38

8027300: configure should use LIBS instead of LDFLAGS when testing freetype
Reviewed-by: erikj

common/autoconf/generated-configure.sh file | annotate | diff | comparison | revisions
common/autoconf/libraries.m4 file | annotate | diff | comparison | revisions
     1.1 --- a/common/autoconf/generated-configure.sh	Thu Oct 24 20:45:43 2013 -0400
     1.2 +++ b/common/autoconf/generated-configure.sh	Fri Oct 25 13:58:09 2013 +0200
     1.3 @@ -3865,7 +3865,7 @@
     1.4  #CUSTOM_AUTOCONF_INCLUDE
     1.5  
     1.6  # Do not change or remove the following line, it is needed for consistency checks:
     1.7 -DATE_WHEN_GENERATED=1382659005
     1.8 +DATE_WHEN_GENERATED=1382702260
     1.9  
    1.10  ###############################################################################
    1.11  #
    1.12 @@ -34253,10 +34253,10 @@
    1.13  ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
    1.14  
    1.15      PREV_CXXCFLAGS="$CXXFLAGS"
    1.16 -    PREV_LDFLAGS="$LDFLAGS"
    1.17 +    PREV_LIBS="$LIBS"
    1.18      PREV_CXX="$CXX"
    1.19      CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS"
    1.20 -    LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
    1.21 +    LIBS="$LIBS $FREETYPE_LIBS"
    1.22      CXX="$FIXPATH $CXX"
    1.23      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
    1.24  /* end confdefs.h.  */
    1.25 @@ -34323,7 +34323,7 @@
    1.26  rm -f core conftest.err conftest.$ac_objext \
    1.27      conftest$ac_exeext conftest.$ac_ext
    1.28      CXXCFLAGS="$PREV_CXXFLAGS"
    1.29 -    LDFLAGS="$PREV_LDFLAGS"
    1.30 +    LIBS="$PREV_LIBS"
    1.31      CXX="$PREV_CXX"
    1.32      ac_ext=cpp
    1.33  ac_cpp='$CXXCPP $CPPFLAGS'
     2.1 --- a/common/autoconf/libraries.m4	Thu Oct 24 20:45:43 2013 -0400
     2.2 +++ b/common/autoconf/libraries.m4	Fri Oct 25 13:58:09 2013 +0200
     2.3 @@ -481,10 +481,10 @@
     2.4      AC_MSG_CHECKING([if we can compile and link with freetype])
     2.5      AC_LANG_PUSH(C++)
     2.6      PREV_CXXCFLAGS="$CXXFLAGS"
     2.7 -    PREV_LDFLAGS="$LDFLAGS"
     2.8 +    PREV_LIBS="$LIBS"
     2.9      PREV_CXX="$CXX"
    2.10      CXXFLAGS="$CXXFLAGS $FREETYPE_CFLAGS" 
    2.11 -    LDFLAGS="$LDFLAGS $FREETYPE_LIBS"
    2.12 +    LIBS="$LIBS $FREETYPE_LIBS"
    2.13      CXX="$FIXPATH $CXX"
    2.14      AC_LINK_IFELSE([AC_LANG_SOURCE([[
    2.15            #include<ft2build.h>
    2.16 @@ -508,7 +508,7 @@
    2.17          ]
    2.18      )
    2.19      CXXCFLAGS="$PREV_CXXFLAGS"
    2.20 -    LDFLAGS="$PREV_LDFLAGS"
    2.21 +    LIBS="$PREV_LIBS"
    2.22      CXX="$PREV_CXX"
    2.23      AC_LANG_POP(C++)
    2.24  

mercurial