Commit 7ebe6ac87c863ba83d8f6f4a4f1577c40dce191e
2015-08-11T06:47:25
[builds/unix] Minor. * builds/unix/configure.raw: s/lib{priv,staticconf}/libs{priv,staticconf}/ for orthogonality with similarly named uppercase variables.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182
diff --git a/ChangeLog b/ChangeLog
index b272028..4221676 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2015-08-11 Werner Lemberg <wl@gnu.org>
+
+ [builds/unix] Minor.
+
+ * builds/unix/configure.raw:
+ s/lib{priv,staticconf}/libs{priv,staticconf}/ for orthogonality with
+ similarly named uppercase variables.
+
2015-08-10 Alexei Podtelezhnikov <apodtele@gmail.com>
[type1,cid,type42] Minor improvements.
diff --git a/builds/unix/configure.raw b/builds/unix/configure.raw
index ec9e7e0..7768564 100644
--- a/builds/unix/configure.raw
+++ b/builds/unix/configure.raw
@@ -289,10 +289,10 @@ AC_SUBST([XX_ANSIFLAGS])
# or a config script is called (libpng).
#
# The `xxx_reqpriv' variables are for the `Requires.private' field in
-# `freetype2.pc'. The `xxx_libpriv' variables are for the `Libs.private'
+# `freetype2.pc'. The `xxx_libspriv' variables are for the `Libs.private'
# field in `freetype2.pc' if pkg-config doesn't find a proper .pc file.
#
-# The `xxx_libstaticconf' variables are for the `freetype-config' script.
+# The `xxx_libsstaticconf' variables are for the `freetype-config' script.
#
# Note that a call to PKG_CHECK_MODULES(XXX, ...) sets and creates the
# output variables `XXX_CFLAGS' and `XXX_LIBS'. In case one or both are set
@@ -321,15 +321,15 @@ if test x"$with_zlib" = xyes -o x"$with_zlib" = xauto; then
if test $have_zlib_pkg = yes; then
# we have zlib.pc
zlib_reqpriv="$zlib_pkg"
- zlib_libpriv=
- zlib_libstaticconf=`$PKG_CONFIG --static --libs "$zlib_pkg"`
+ zlib_libspriv=
+ zlib_libsstaticconf=`$PKG_CONFIG --static --libs "$zlib_pkg"`
else
zlib_reqpriv=
if test "$have_zlib" != no; then
# ZLIB_CFLAGS and ZLIB_LIBS are set by the user
- zlib_libpriv="$ZLIB_LIBS"
- zlib_libstaticconf="$ZLIB_LIBS"
+ zlib_libspriv="$ZLIB_LIBS"
+ zlib_libsstaticconf="$ZLIB_LIBS"
have_zlib="yes (ZLIB_CFLAGS and ZLIB_LIBS)"
else
# fall back to standard autoconf test
@@ -337,9 +337,9 @@ if test x"$with_zlib" = xyes -o x"$with_zlib" = xauto; then
[gzsetparams],
[AC_CHECK_HEADER([zlib.h],
[have_zlib="yes (autoconf test)"
- zlib_libpriv="-lz"
- zlib_libstaticconf="$zlib_libpriv"
- ZLIB_LIBS="$zlib_libpriv"])])
+ zlib_libspriv="-lz"
+ zlib_libsstaticconf="$zlib_libspriv"
+ ZLIB_LIBS="$zlib_libspriv"])])
fi
fi
fi
@@ -370,15 +370,15 @@ if test x"$with_bzip2" = xyes -o x"$with_bzip2" = xauto; then
if test $have_bzip2_pkg = yes; then
# we have bzip2.pc
bzip2_reqpriv="$bzip2_pkg"
- bzip2_libpriv=
- bzip2_libstaticconf=`$PKG_CONFIG --static --libs "$bzip2_pkg"`
+ bzip2_libspriv=
+ bzip2_libsstaticconf=`$PKG_CONFIG --static --libs "$bzip2_pkg"`
else
bzip2_reqpriv=
if test "$have_bzip2" != no; then
# BZIP2_CFLAGS and BZIP2_LIBS are set by the user
- bzip2_libpriv="$BZIP2_LIBS"
- bzip2_libstaticconf="$BZIP2_LIBS"
+ bzip2_libspriv="$BZIP2_LIBS"
+ bzip2_libsstaticconf="$BZIP2_LIBS"
have_bzip2="yes (BZIP2_CFLAGS and BZIP2_LIBS)"
else
# fall back to standard autoconf test
@@ -386,9 +386,9 @@ if test x"$with_bzip2" = xyes -o x"$with_bzip2" = xauto; then
[BZ2_bzDecompress],
[AC_CHECK_HEADER([bzlib.h],
[have_bzip2="yes (autoconf test)"
- bzip2_libpriv="-lbz2"
- bzip2_libstaticconf="$bzip2_libpriv"
- BZIP2_LIBS="$bzip2_libpriv"])])
+ bzip2_libspriv="-lbz2"
+ bzip2_libsstaticconf="$bzip2_libspriv"
+ BZIP2_LIBS="$bzip2_libspriv"])])
fi
fi
fi
@@ -419,15 +419,15 @@ if test x"$with_png" = xyes -o x"$with_png" = xauto; then
if test $have_libpng_pkg = yes; then
# we have libpng.pc
libpng_reqpriv="$libpng_pkg"
- libpng_libpriv=
- libpng_libstaticconf=`$PKG_CONFIG --static --libs "$libpng_pkg"`
+ libpng_libspriv=
+ libpng_libsstaticconf=`$PKG_CONFIG --static --libs "$libpng_pkg"`
else
libpng_reqpriv=
if test "$have_libpng" != no; then
# LIBPNG_CFLAGS and LIBPNG_LIBS are set by the user
- libpng_libpriv="$LIBPNG_LIBS"
- libpng_libstaticconf="$LIBPNG_LIBS"
+ libpng_libspriv="$LIBPNG_LIBS"
+ libpng_libsstaticconf="$LIBPNG_LIBS"
have_libpng="yes (LIBPNG_CFLAGS and LIBPNG_LIBS)"
else
# fall back to config script.
@@ -435,8 +435,8 @@ if test x"$with_png" = xyes -o x"$with_png" = xauto; 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`
- libpng_libstaticconf="$libpng_libpriv"
+ libpng_libspriv=`libpng-config --static --ldflags`
+ libpng_libsstaticconf="$libpng_libspriv"
have_libpng="yes (libpng-config)"
AC_MSG_RESULT([yes])
else
@@ -472,15 +472,15 @@ if test x"$with_harfbuzz" = xyes -o x"$with_harfbuzz" = xauto; then
if test $have_harfbuzz_pkg = yes; then
# we have harfbuzz.pc
harfbuzz_reqpriv="$harfbuzz_pkg"
- harfbuzz_libpriv=
- harfbuzz_libstaticconf=`$PKG_CONFIG --static --libs "$harfbuzz_pkg"`
+ harfbuzz_libspriv=
+ harfbuzz_libsstaticconf=`$PKG_CONFIG --static --libs "$harfbuzz_pkg"`
else
harfbuzz_reqpriv=
if test "$have_harfbuzz" != no; then
# HARFBUZZ_CFLAGS and HARFBUZZ_LIBS are set by the user
- harfbuzz_libpriv="$HARFBUZZ_LIBS"
- harfbuzz_libstaticconf="$HARFBUZZ_LIBS"
+ harfbuzz_libspriv="$HARFBUZZ_LIBS"
+ harfbuzz_libsstaticconf="$HARFBUZZ_LIBS"
have_harfbuzz="yes (HARFBUZZ_CFLAGS and HARFBUZZ_LIBS)"
else
# since HarfBuzz is quite a new library we don't fall back to a
@@ -921,10 +921,10 @@ REQUIRES_PRIVATE=`echo "$REQUIRES_PRIVATE" \
-e 's/,*$//' \
-e 's/,/, /g'`
-LIBS_PRIVATE="$zlib_libpriv \
- $bzip2_libpriv \
- $libpng_libpriv \
- $harfbuzz_libpriv \
+LIBS_PRIVATE="$zlib_libspriv \
+ $bzip2_libspriv \
+ $libpng_libspriv \
+ $harfbuzz_libspriv \
$ft2_extra_libs"
# beautify
LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
@@ -932,11 +932,11 @@ LIBS_PRIVATE=`echo "$LIBS_PRIVATE" \
-e 's/ *$//' \
-e 's/ */ /g'`
-LIBSSTATIC_CONFIG="-lfreetype \
- $zlib_libstaticconf \
- $bzip2_libstaticconf \
- $libpng_libstaticconf \
- $harfbuzz_libstaticconf \
+LIBSSTATIC_CONFIG="-lfreetype \
+ $zlib_libsstaticconf \
+ $bzip2_libsstaticconf \
+ $libpng_libsstaticconf \
+ $harfbuzz_libsstaticconf \
$ft2_extra_libs"
# remove -L/usr/lib and -L/usr/lib64 since `freetype-config' adds them later
# on if necessary; also beautify