diff options
author | marha <marha@users.sourceforge.net> | 2015-02-22 14:47:01 +0100 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2015-02-22 14:47:01 +0100 |
commit | 7785694244cdfc5939ca4754cab4e08bd6980f99 (patch) | |
tree | e317021c83941073a12d69494425f0dbcbc9eaf8 /freetype/builds/unix/configure | |
parent | c9aad1ae6227c434d480d1d3aa8eae3c3c910c18 (diff) | |
download | vcxsrv-7785694244cdfc5939ca4754cab4e08bd6980f99.tar.gz vcxsrv-7785694244cdfc5939ca4754cab4e08bd6980f99.tar.bz2 vcxsrv-7785694244cdfc5939ca4754cab4e08bd6980f99.zip |
Upgraded to freetype 2.5.5
Diffstat (limited to 'freetype/builds/unix/configure')
-rw-r--r-- | freetype/builds/unix/configure | 45 |
1 files changed, 14 insertions, 31 deletions
diff --git a/freetype/builds/unix/configure b/freetype/builds/unix/configure index 4ae00dd58..08357a9cb 100644 --- a/freetype/builds/unix/configure +++ b/freetype/builds/unix/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for FreeType 2.5.3. +# Generated by GNU Autoconf 2.69 for FreeType 2.5.5. # # Report bugs to <freetype@nongnu.org>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='FreeType' PACKAGE_TARNAME='freetype' -PACKAGE_VERSION='2.5.3' -PACKAGE_STRING='FreeType 2.5.3' +PACKAGE_VERSION='2.5.5' +PACKAGE_STRING='FreeType 2.5.5' PACKAGE_BUGREPORT='freetype@nongnu.org' PACKAGE_URL='' @@ -639,7 +639,6 @@ build_libtool_libs wl hardcode_libdir_flag_spec LIBSSTATIC_CONFIG -LIBS_CONFIG LIBS_PRIVATE REQUIRES_PRIVATE ftmac_c @@ -1326,7 +1325,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures FreeType 2.5.3 to adapt to many kinds of systems. +\`configure' configures FreeType 2.5.5 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1391,7 +1390,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of FreeType 2.5.3:";; + short | recursive ) echo "Configuration of FreeType 2.5.5:";; esac cat <<\_ACEOF @@ -1532,7 +1531,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -FreeType configure 2.5.3 +FreeType configure 2.5.5 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -2130,7 +2129,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by FreeType $as_me 2.5.3, which was +It was created by FreeType $as_me 2.5.5, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -2486,7 +2485,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu # Don't forget to update docs/VERSION.DLL! -version_info='17:2:11' +version_info='17:4:11' ft_version=`echo $version_info | tr : .` @@ -12966,7 +12965,7 @@ fi # fall back to config script. { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libpng-config" >&5 $as_echo_n "checking for libpng-config... " >&6; } - if which libpng-config > /dev/null; then + if which libpng-config > /dev/null 2>&1; then LIBPNG_CFLAGS=`libpng-config --cflags` LIBPNG_LIBS=`libpng-config --ldflags` libpng_libpriv=`libpng-config --static --ldflags` @@ -13324,7 +13323,7 @@ else fi -# Whether to use FileManager which is deprecated since Mac OS X 10.4. +# Whether to use FileManager, which is deprecated since Mac OS X 10.4. # Check whether --with-fsspec was given. @@ -13478,7 +13477,7 @@ rm -f core conftest.err conftest.$ac_objext \ fi -# Whether to use QuickDraw API in ToolBox which is deprecated since +# Whether to use QuickDraw API in ToolBox, which is deprecated since # Mac OS X 10.4. @@ -13540,7 +13539,7 @@ rm -f core conftest.err conftest.$ac_objext \ fi -# Whether to use QuickDraw API in Carbon which is deprecated since +# Whether to use QuickDraw API in Carbon, which is deprecated since # Mac OS X 10.4. @@ -13715,21 +13714,6 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \ -e 's/ *$//' \ -e 's/ */ /g'` -LIBS_CONFIG="-lfreetype \ - $ZLIB_LIBS \ - $BZIP2_LIBS \ - $LIBPNG_LIBS \ - $HARFBUZZ_LIBS \ - $ft2_extra_libs" -# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later -# on if necessary; also beautify -LIBS_CONFIG=`echo "$LIBS_CONFIG" \ - | sed -e 's|-L */usr/lib64/* | |g' \ - -e 's|-L */usr/lib/* | |g' \ - -e 's/^ *//' \ - -e 's/ *$//' \ - -e 's/ */ /g'` - LIBSSTATIC_CONFIG="-lfreetype \ $zlib_libstaticconf \ $bzip2_libstaticconf \ @@ -13756,7 +13740,6 @@ LIBSSTATIC_CONFIG=`echo "$LIBSSTATIC_CONFIG" \ - # changing LDFLAGS value should only be done after # lt_cv_prog_compiler_static_works test @@ -14305,7 +14288,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by FreeType $as_me 2.5.3, which was +This file was extended by FreeType $as_me 2.5.5, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -14371,7 +14354,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -FreeType config.status 2.5.3 +FreeType config.status 2.5.5 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" |