walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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.
This commit is contained in:
Keith Packard 2008-05-03 20:23:37 -07:00
parent 0028f72bc8
commit 19d124dc4f
3 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.in
View File

@ -41,17 +41,17 @@ dnl libtool versioning
dnl bump revision when fixing bugs dnl bump revision when fixing bugs
dnl bump current and age, reset revision to zero when adding APIs 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 dnl bump current, leave age, reset revision to zero when changing/removing APIS
LT_CURRENT=4 LIBT_CURRENT=4
LT_REVISION=0 LIBT_REVISION=0
AC_SUBST(LT_CURRENT) AC_SUBST(LIBT_CURRENT)
AC_SUBST(LT_REVISION) AC_SUBST(LIBT_REVISION)
LT_AGE=3 LIBT_AGE=3
LT_VERSION_INFO="$LT_CURRENT:$LT_REVISION:$LT_AGE" LIBT_VERSION_INFO="$LIBT_CURRENT:$LIBT_REVISION:$LIBT_AGE"
AC_SUBST(LT_VERSION_INFO) AC_SUBST(LIBT_VERSION_INFO)
LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE` LIBT_CURRENT_MINUS_AGE=`expr $LIBT_CURRENT - $LIBT_AGE`
AC_SUBST(LT_CURRENT_MINUS_AGE) AC_SUBST(LIBT_CURRENT_MINUS_AGE)
dnl ========================================================================== dnl ==========================================================================

2
fontconfig-zip.in
View File

@ -10,7 +10,7 @@ DEVZIP=/tmp/fontconfig-dev-@VERSION@.zip
cd @prefix@ cd @prefix@
rm -f $ZIP rm -f $ZIP
zip $ZIP -@ <<EOF zip $ZIP -@ <<EOF
bin/libfontconfig-@LT_CURRENT_MINUS_AGE@.dll bin/libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll
etc/fonts/fonts.conf etc/fonts/fonts.conf
EOF EOF

6
src/Makefile.am
View File

@ -112,7 +112,7 @@ libfontconfig_la_SOURCES = \
lib_LTLIBRARIES = libfontconfig.la lib_LTLIBRARIES = libfontconfig.la
libfontconfig_la_LDFLAGS = \ 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) 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 ()' ) | \ (cat $(PUBLIC_FILES) $(PUBLIC_FT_FILES) || echo 'FcERROR ()' ) | \
grep '^Fc[^ ]* *(' | sed -e 's/ *(.*$$//' -e 's/^/ /' | \ grep '^Fc[^ ]* *(' | sed -e 's/ *(.*$$//' -e 's/^/ /' | \
sort; \ sort; \
echo LIBRARY libfontconfig-@LT_CURRENT_MINUS_AGE@.dll; \ echo LIBRARY libfontconfig-@LIBT_CURRENT_MINUS_AGE@.dll; \
echo VERSION @LT_CURRENT@.@LT_REVISION@) >$@ echo VERSION @LIBT_CURRENT@.@LIBT_REVISION@) >$@
@ ! grep -q FcERROR $@ || ($(RM) $@; false) @ ! grep -q FcERROR $@ || ($(RM) $@; false)