Deal with libtool 2.2 which doesn't let us use LT_ variables. (bug 15692)

Libtool-2.2 introduces new restrictions. So now it does not allow LT_*
variables as it includes marcros:

m4_pattern_forbid([^_?LT_[A-Z_]+$])

Rename the LT_ variables to LIBT_ to work around this restriction.

diff --git a/configure.in b/configure.in
index 313942ffe7662777bb410d4e199b636ab5f5cbe9..0a72824311c6a485a7b7f441a5aa5b600944000b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -41,17 +41,17 @@ dnl libtool versioning
 dnl bump revision when fixing bugs
 dnl bump current and age, reset revision to zero when adding APIs
 dnl bump current, leave age, reset revision to zero when changing/removing APIS
-LT_CURRENT=4
-LT_REVISION=0
-AC_SUBST(LT_CURRENT)
-AC_SUBST(LT_REVISION)
-LT_AGE=3
+LIBT_CURRENT=4
+LIBT_REVISION=0
+AC_SUBST(LIBT_CURRENT)
+AC_SUBST(LIBT_REVISION)
+LIBT_AGE=3
 
-LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE"
-AC_SUBST(LT_VERSION_INFO)
+LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE"
+AC_SUBST(LIBT_VERSION_INFO)
 
-LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`
-AC_SUBST(LT_CURRENT_MINUS_AGE)
+LIBT_CURRENT_MINUS_AGE=`expr $LIBT_CURRENT - $LIBT_AGE`
+AC_SUBST(LIBT_CURRENT_MINUS_AGE)
 
 dnl ==========================================================================
 

diff --git a/fontconfig-zip.in b/fontconfig-zip.in
index 4b364388c7bab0aa42fc4a9a18b7a2722cca1d48..ba6fd4aa59ebb2f2ce08a52a60bc21c572c90357 100755 (executable)
--- a/fontconfig-zip.in
+++ b/fontconfig-zip.in
@@ -10,7 +10,7 @@ DEVZIP=/tmp/fontconfig-dev-@VERSION@.zip
 cd @prefix@
 rm -f $ZIP
 zip $ZIP -@ <<EOF
-bin/libfontconfig-@LT_CURRENT_MINUS_AGE@.dll
+bin/libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll
 etc/fonts/fonts.conf
 EOF
 

diff --git a/src/Makefile.am b/src/Makefile.am
index b91d0e2400c3421f79750df0c3f08bd552320857..a71ef1dd953fd515027902ee7d171729c070673f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -112,7 +112,7 @@ libfontconfig_la_SOURCES = \
 lib_LTLIBRARIES = libfontconfig.la
 
 libfontconfig_la_LDFLAGS =                     \
-       -version-info @LT_VERSION_INFO@ -no-undefined $(export_symbols)
+       -version-info @LIBT_VERSION_INFO@ -no-undefined $(export_symbols)
 
 libfontconfig_la_LIBADD = $(ICONV_LIBS) $(FREETYPE_LIBS) $(LIBXML2_LIBS) $(EXPAT_LIBS)
 
@@ -148,6 +148,6 @@ fontconfig.def: $(PUBLIC_FILES) $(PUBLIC_FT_FILES)
        (cat $(PUBLIC_FILES) $(PUBLIC_FT_FILES) || echo 'FcERROR ()' ) | \
        grep '^Fc[^ ]* *(' | sed -e 's/ *(.*$$//' -e 's/^/      /' | \
        sort; \
-       echo LIBRARY libfontconfig-@LT_CURRENT_MINUS_AGE@.dll; \
-       echo VERSION @LT_CURRENT@.@LT_REVISION@) >$@
+       echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \
+       echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@
        @ ! grep -q FcERROR $@ || ($(RM) $@; false)