lib/libxslt
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/libxslt synced 2025-07-31 02:43:06 +03:00
Code Activity

Get rid of specific build setup and STATIC_BINARIES

Browse Source
This commit is contained in:
Daniel Veillard
2010-11-08 10:32:32 +01:00
parent c1c98594e1
commit 072a80a94b
4 changed files with 6 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
config.h.in
View File

@ -12,6 +12,9 @@
/* Define to 1 if you have the `asctime' function. */
#undef HAVE_ASCTIME
/* Define to 1 if you have the `clock_gettime' function. */
#undef HAVE_CLOCK_GETTIME
/* Define to 1 if you have the <dlfcn.h> header file. */
#undef HAVE_DLFCN_H

29
configure.in
View File

@ -414,21 +414,7 @@ if [[ "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XSLT" ]] || \
with_mem_debug="yes"
fi
CFLAGS="-Wall -g -O -ansi -pedantic -W -Wunused -Wimplicit -Wreturn-type -Wswitch -Wcomment -Wtrigraphs -Wformat -Wchar-subscripts -Wuninitialized -Wparentheses -Wshadow -Wpointer-arith -Wcast-align -Wwrite-strings -Waggregate-return -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -Winline "
if test "`uname -m`" != "x86_64" ;
then
STATIC_BINARIES="-static"
else
STATIC_BINARIES="-static"
fi
if test "$LOGNAME" = "veillard"
then
LIBXML_SRC="/u/veillard/XML"
EXTRA_LIBS="$EXTRA_LIBS -ldl"
fi
else
STATIC_BINARIES=
fi
AC_SUBST(STATIC_BINARIES)
AC_ARG_WITH(debug, [ --with-debug Add the debugging code (on)])
if test "$with_debug" = "no" ; then
@ -617,21 +603,6 @@ test "x$module_prefix" = xNONE && module_prefix=$ac_default_prefix
LIBXSLT_DEFAULT_PLUGINS_PATH="$module_prefix/lib/libxslt-plugins"
AC_SUBST(LIBXSLT_DEFAULT_PLUGINS_PATH)
dnl
dnl In build tree I use a static version with memory debug enabled
dnl
if test "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XSLT" ; then
dnl if test "`uname -i`" != "x86_64" -a -e $HOME/XML/.libs/libxml2.a ;
if test -e $HOME/XML/.libs/libxml2.a ;
then
LIBXML_LIBS="$HOME/XML/.libs/libxml2.a -lpthread -lz"
fi
DV_LINK="1"
XSLTPROCDV="xsltproc.dv"
INSTALLED_XSLT_LIB=""
LIBXML_SRC="$HOME/XML/"
fi
WIN32_EXTRA_LIBADD=
WIN32_EXTRA_LDFLAGS=
case "$host" in

4
doc/internals.html
View File

@ -294,5 +294,5 @@ appendix and making direct checks using the libxml validation API sounds a
good idea too (though one should take care of not raising errors for
elements/attributes in different namespaces).</p><p>Double check all the places where the stylesheet compiled form might be
modified at run time (extra removal of blanks nodes, hint on the
xsltCompMatch).</p><h3><a name="Thanks" id="Thanks">Thanks:</a></h3><p>Thanks to Michael Sperberg-McQueen for various fixes and clarifications
on this document!</p><p></p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html>
xsltCompMatch).</p><h3><a name="Thanks" id="Thanks">Thanks:</a></h3><p>Thanks to <a href="http://cmsmcq.com/">Michael Sperberg-McQueen</a> for
various fixes and clarifications on this document!</p><p></p><p><a href="bugs.html">Daniel Veillard</a></p></td></tr></table></td></tr></table></td></tr></table></td></tr></table></td></tr></table></body></html>

3
xsltproc/Makefile.am
View File

@ -21,8 +21,7 @@ testThreads_LDADD= $(THREAD_LIBS) $(LDADDS)
DEPS = $(top_builddir)/libxslt/libxslt.la \
$(top_builddir)/libexslt/libexslt.la
LDADDS = @STATIC_BINARIES@ \
$(top_builddir)/libxslt/libxslt.la \
LDADDS = $(top_builddir)/libxslt/libxslt.la \
$(top_builddir)/libexslt/libexslt.la \
@LIBXML_LIBS@ $(EXTRA_LIBS) @WIN32_EXTRA_LIBADD@