--- pango/Makefile.am +++ pango/Makefile.am.fixed @@ -55,6 +55,8 @@ if OS_WIN32 libpango_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pango.def -Wl,pango-win32-res.o libpango_1_0_la_DEPENDENCIES += pango-win32-res.o pango.def +else +libpango_1_0_la_LDFLAGS += -Wl,--version-script=libpango-1.0.ver endif pango-win32-res.o: pango.rc $(WINDRES) $< $@ @@ -180,6 +182,10 @@ pangox-fontcache.c \ pangox-fontmap.c +if OS_WIN32 +else +libpangox_1_0_la_LDFLAGS += -Wl,--version-script=libpangox-1.0.ver +endif # ------------------- libpangoft2 ------------------- @@ -222,6 +228,8 @@ if OS_WIN32 libpangoft2_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangoft2.def -Wl,pangoft2-win32-res.o libpangoft2_1_0_la_DEPENDENCIES += pangoft2-win32-res.o pangoft2.def +else +libpangoft2_1_0_la_LDFLAGS += -Wl,--version-script=libpangoft2-1.0.ver endif pangoft2-win32-res.o: pangoft2.rc $(WINDRES) $< $@ @@ -251,6 +259,10 @@ pangoxft-private.h \ pangoxft-render.c +if OS_WIN32 +else +libpangoxft_1_0_la_LDFLAGS += -Wl,--version-script=libpangoxft-1.0.ver +endif # ------------------- libpangocairo ------------------- @@ -277,6 +289,8 @@ if OS_WIN32 libpangocairo_1_0_la_LDFLAGS += -export-symbols $(srcdir)/pangocairo.def libpangocairo_1_0_la_DEPENDENCIES += pangocairo.def +else +libpangocairo_1_0_la_LDFLAGS += -Wl,--version-script=libpangocairo-1.0.ver endif libpangocairo_1_0_la_LIBADD += libpangowin32-$(PANGO_API_VERSION).la $(WIN32_LIBS) --- aclocal.m4 2007-12-03 18:03:13 +0300 +++ aclocal.m4.fixed 2007-12-03 18:03:21 +0300 @@ -5620,9 +5620,13 @@ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib' if test $supports_anon_versioning = yes; then - _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~ + _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if [ ! -r $libname.ver ]; then + cp $libname.ver $output_objdir/$libname.ver~ + else + $echo "{ global:" > $output_objdir/$libname.ver~ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~ $echo "local: *; };" >> $output_objdir/$libname.ver~ + fi $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib' fi else