diff -rup --exclude=intl --exclude=po /home/cyba/gcvs/gnumeric/ChangeLog gnumeric-test/ChangeLog --- /home/cyba/gcvs/gnumeric/ChangeLog Sat Jan 5 13:55:28 2002 +++ gnumeric-test/ChangeLog Sat Jan 5 14:21:18 2002 @@ -0,0 +1,5 @@ +2002-01-05 Zbigniew Chyla + + * configure.in: Set LIBTOOL_EXPORT_OPTIONS to filter out symbols + starting with _. + diff -rup --exclude=intl --exclude=po /home/cyba/gcvs/gnumeric/configure.in gnumeric-test/configure.in --- /home/cyba/gcvs/gnumeric/configure.in Mon Dec 31 11:31:11 2001 +++ gnumeric-test/configure.in Sat Jan 5 14:18:32 2002 @@ -20,6 +20,11 @@ AM_PROG_LIBTOOL GNOME_INIT AM_PATH_GTK(1.2.7) +# libtool option to control which symbols are exported +# right now, symbols starting with _ are not exported +LIBTOOL_EXPORT_OPTIONS='-export-symbols-regex "^[[^_]].*"' +AC_SUBST(LIBTOOL_EXPORT_OPTIONS) + ## this should come after `AC_PROG_CC' GNOME_COMPILE_WARNINGS set_mode_warnings=yes diff -rup --exclude=intl --exclude=po /home/cyba/gcvs/gnumeric/plugins/html/ChangeLog gnumeric-test/plugins/html/ChangeLog --- /home/cyba/gcvs/gnumeric/plugins/html/ChangeLog Wed Jan 2 13:17:42 2002 +++ gnumeric-test/plugins/html/ChangeLog Sat Jan 5 14:28:07 2002 @@ -0,0 +1,7 @@ +2002-01-05 Zbigniew Chyla + + * html_la_LDFLAGS: Added LIBTOOL_EXPORT_OPTIONS. + + * font.[ch], html.c, latex.c, roff.c: Put '_' at the begining of + symbols that we don't want to export. + diff -rup --exclude=intl --exclude=po /home/cyba/gcvs/gnumeric/plugins/html/Makefile.am gnumeric-test/plugins/html/Makefile.am --- /home/cyba/gcvs/gnumeric/plugins/html/Makefile.am Mon Dec 17 15:38:20 2001 +++ gnumeric-test/plugins/html/Makefile.am Sat Jan 5 14:11:44 2002 @@ -6,7 +6,9 @@ INCLUDES = \ gnumeric_plugin_htmldir = $(gnumeric_plugindir)/html xmldir = $(gnumeric_plugin_htmldir) gnumeric_plugin_html_LTLIBRARIES = html.la -html_la_LDFLAGS = -module -avoid-version +html_la_LDFLAGS = \ + @LIBTOOL_EXPORT_OPTIONS@ \ + -module -avoid-version html_la_SOURCES = \ boot.h boot.c \ html.h html.c \ diff -rup --exclude=intl --exclude=po /home/cyba/gcvs/gnumeric/plugins/html/font.c gnumeric-test/plugins/html/font.c --- /home/cyba/gcvs/gnumeric/plugins/html/font.c Sat Dec 22 02:06:46 2001 +++ gnumeric-test/plugins/html/font.c Sat Jan 5 14:11:44 2002 @@ -48,7 +48,7 @@ font_match (MStyle *mstyle, char **names /* */ int -font_is_monospaced (MStyle *mstyle) +_font_is_monospaced (MStyle *mstyle) { char *names[] = { "Courier", "fixed", NULL }; @@ -58,7 +58,7 @@ font_is_monospaced (MStyle *mstyle) /* */ int -font_is_helvetica (MStyle *mstyle) +_font_is_helvetica (MStyle *mstyle) { char *names [] = { "Helvetica", NULL }; @@ -68,7 +68,7 @@ font_is_helvetica (MStyle *mstyle) /* */ int -font_is_sansserif (MStyle *mstyle) +_font_is_sansserif (MStyle *mstyle) { char *names [] = { "helvetica", "avantgarde", "neep", "blippo", "capri", diff -rup --exclude=intl --exclude=po /home/cyba/gcvs/gnumeric/plugins/html/font.h gnumeric-test/plugins/html/font.h --- /home/cyba/gcvs/gnumeric/plugins/html/font.h Mon Sep 10 12:52:47 2001 +++ gnumeric-test/plugins/html/font.h Sat Jan 5 14:11:44 2002 @@ -24,9 +24,9 @@ #include -int font_is_monospaced (MStyle *mstyle); -int font_is_helvetica (MStyle *mstyle); -int font_is_sansserif (MStyle *mstyle); +int _font_is_monospaced (MStyle *mstyle); +int _font_is_helvetica (MStyle *mstyle); +int _font_is_sansserif (MStyle *mstyle); #endif diff -rup --exclude=intl --exclude=po /home/cyba/gcvs/gnumeric/plugins/html/html.c gnumeric-test/plugins/html/html.c --- /home/cyba/gcvs/gnumeric/plugins/html/html.c Wed Jan 2 13:17:42 2002 +++ gnumeric-test/plugins/html/html.c Sat Jan 5 14:16:40 2002 @@ -155,7 +155,7 @@ html_write_cell_content (FILE *fp, Cell fputs ("", fp); if (mstyle_get_font_bold (mstyle)) fputs ("", fp); - if (font_is_monospaced (mstyle)) + if (_font_is_monospaced (mstyle)) fputs ("", fp); } @@ -173,7 +173,7 @@ html_write_cell_content (FILE *fp, Cell if (r > 0 || g > 0 || b > 0) fputs ("", fp); if (mstyle != NULL) { - if (font_is_monospaced (mstyle)) + if (_font_is_monospaced (mstyle)) fputs ("", fp); if (mstyle_get_font_bold (mstyle)) fputs ("", fp); diff -rup --exclude=intl --exclude=po /home/cyba/gcvs/gnumeric/plugins/html/latex.c gnumeric-test/plugins/html/latex.c --- /home/cyba/gcvs/gnumeric/plugins/html/latex.c Sat Dec 29 14:51:46 2001 +++ gnumeric-test/plugins/html/latex.c Sat Jan 5 14:11:44 2002 @@ -642,9 +642,9 @@ latex2e_write_multicolumn_cell (FILE *fp /* Establish the font's style for the styles that can be addressed by LaTeX. * More complicated efforts (like changing fonts) are left to the user. */ - if (font_is_monospaced (mstyle)) + if (_font_is_monospaced (mstyle)) fprintf (fp, "\\texttt{"); - else if (font_is_sansserif (mstyle)) + else if (_font_is_sansserif (mstyle)) fprintf (fp, "\\textsf{"); if (mstyle_get_font_bold (mstyle)) fprintf (fp, "\\textbf{"); @@ -677,9 +677,9 @@ latex2e_write_multicolumn_cell (FILE *fp fprintf (fp, "}"); if (mstyle_get_font_bold (mstyle)) fprintf (fp, "}"); - if (font_is_monospaced (mstyle)) + if (_font_is_monospaced (mstyle)) fprintf (fp, "}"); - else if (font_is_sansserif (mstyle)) + else if (_font_is_sansserif (mstyle)) fprintf (fp, "}"); if (r != 0 || g != 0 || b != 0) fprintf (fp, "}"); diff -rup --exclude=intl --exclude=po /home/cyba/gcvs/gnumeric/plugins/html/roff.c gnumeric-test/plugins/html/roff.c --- /home/cyba/gcvs/gnumeric/plugins/html/roff.c Sat Dec 29 14:51:46 2001 +++ gnumeric-test/plugins/html/roff.c Sat Jan 5 14:11:44 2002 @@ -120,7 +120,7 @@ write_wb_roff (IOContext *io_context, Wo fprintf (fp, "c"); else fprintf (fp, "l"); - if (font_is_monospaced (mstyle)) { + if (_font_is_monospaced (mstyle)) { if (mstyle_get_font_bold (mstyle) && mstyle_get_font_italic (mstyle)) fprintf (fp, "fCBI"); @@ -130,7 +130,7 @@ write_wb_roff (IOContext *io_context, Wo fprintf (fp, "fCI"); else fprintf (fp, "fCR"); - } else if (font_is_helvetica (mstyle)) { + } else if (_font_is_helvetica (mstyle)) { if (mstyle_get_font_bold (mstyle) && mstyle_get_font_italic (mstyle)) fprintf (fp, "fHBI");