mirror of
https://gitlab.gnome.org/GNOME/libxslt
synced 2025-07-31 02:43:06 +03:00
Get rid of specific build setup and STATIC_BINARIES
This commit is contained in:
@ -12,6 +12,9 @@
|
|||||||
/* Define to 1 if you have the `asctime' function. */
|
/* Define to 1 if you have the `asctime' function. */
|
||||||
#undef HAVE_ASCTIME
|
#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. */
|
/* Define to 1 if you have the <dlfcn.h> header file. */
|
||||||
#undef HAVE_DLFCN_H
|
#undef HAVE_DLFCN_H
|
||||||
|
|
||||||
|
29
configure.in
29
configure.in
@ -414,21 +414,7 @@ if [[ "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XSLT" ]] || \
|
|||||||
with_mem_debug="yes"
|
with_mem_debug="yes"
|
||||||
fi
|
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 "
|
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
|
fi
|
||||||
AC_SUBST(STATIC_BINARIES)
|
|
||||||
|
|
||||||
AC_ARG_WITH(debug, [ --with-debug Add the debugging code (on)])
|
AC_ARG_WITH(debug, [ --with-debug Add the debugging code (on)])
|
||||||
if test "$with_debug" = "no" ; then
|
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"
|
LIBXSLT_DEFAULT_PLUGINS_PATH="$module_prefix/lib/libxslt-plugins"
|
||||||
AC_SUBST(LIBXSLT_DEFAULT_PLUGINS_PATH)
|
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_LIBADD=
|
||||||
WIN32_EXTRA_LDFLAGS=
|
WIN32_EXTRA_LDFLAGS=
|
||||||
case "$host" in
|
case "$host" in
|
||||||
|
@ -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
|
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
|
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
|
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
|
xsltCompMatch).</p><h3><a name="Thanks" id="Thanks">Thanks:</a></h3><p>Thanks to <a href="http://cmsmcq.com/">Michael Sperberg-McQueen</a> for
|
||||||
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>
|
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>
|
||||||
|
@ -21,8 +21,7 @@ testThreads_LDADD= $(THREAD_LIBS) $(LDADDS)
|
|||||||
DEPS = $(top_builddir)/libxslt/libxslt.la \
|
DEPS = $(top_builddir)/libxslt/libxslt.la \
|
||||||
$(top_builddir)/libexslt/libexslt.la
|
$(top_builddir)/libexslt/libexslt.la
|
||||||
|
|
||||||
LDADDS = @STATIC_BINARIES@ \
|
LDADDS = $(top_builddir)/libxslt/libxslt.la \
|
||||||
$(top_builddir)/libxslt/libxslt.la \
|
|
||||||
$(top_builddir)/libexslt/libexslt.la \
|
$(top_builddir)/libexslt/libexslt.la \
|
||||||
@LIBXML_LIBS@ $(EXTRA_LIBS) @WIN32_EXTRA_LIBADD@
|
@LIBXML_LIBS@ $(EXTRA_LIBS) @WIN32_EXTRA_LIBADD@
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user