diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/configure.in b/configure.in index a2183e30..33e36e2a 100644 --- a/configure.in +++ b/configure.in @@ -22,6 +22,7 @@ LIBXSLT_VERSION=$LIBXSLT_MAJOR_VERSION.$LIBXSLT_MINOR_VERSION.$LIBXSLT_MICRO_VER LIBXSLT_VERSION_INFO=`expr $LIBXSLT_MAJOR_VERSION + $LIBXSLT_MINOR_VERSION`:$LIBXSLT_MICRO_VERSION:$LIBXSLT_MINOR_VERSION LIBXSLT_VERSION_NUMBER=`expr $LIBXSLT_MAJOR_VERSION \* 10000 + $LIBXSLT_MINOR_VERSION \* 100 + $LIBXSLT_MICRO_VERSION` +LIBXSLT_MAJOR_MINOR_VERSION=$LIBXSLT_MAJOR_VERSION.$LIBXSLT_MINOR_VERSION if test -f CVS/Entries; then extra=`grep ChangeLog CVS/Entries | grep -v LIBXSLT | sed -e s\%/ChangeLog/1\.%% -e s\%/.*$%%` @@ -39,6 +40,7 @@ AC_SUBST(LIBXSLT_VERSION) AC_SUBST(LIBXSLT_VERSION_INFO) AC_SUBST(LIBXSLT_VERSION_NUMBER) AC_SUBST(LIBXSLT_VERSION_EXTRA) +AC_SUBST(LIBXSLT_MAJOR_MINOR_VERSION) dnl dnl libexslt is an extension library @@ -283,6 +285,7 @@ if [[ "${LOGNAME}" = "veillard" -a "`pwd`" = "/u/veillard/XSLT" ]] || \ if test "$LOGNAME" = "veillard" then LIBXML_SRC="/u/veillard/XML" + EXTRA_LIBS="$EXTRA_LIBS -ldl" fi else STATIC_BINARIES= @@ -456,13 +459,14 @@ else fi AC_SUBST(WITH_MODULES) +AM_CONDITIONAL(WITH_MODULES, test "$WITH_MODULES" == "1") dnl dnl setup default module path dnl module_prefix=$prefix test "x$module_prefix" = xNONE && module_prefix=$ac_default_prefix -LIBXSLT_DEFAULT_PLUGINS_PATH="\"$module_prefix/lib/libxslt/$LIBXSLT_MAJOR_VERSION.$LIBXSLT_MINOR_VERSION/\"" +LIBXSLT_DEFAULT_PLUGINS_PATH="\"$module_prefix/lib/libxslt/$LIBXSLT_MAJOR_VERSION.$LIBXSLT_MINOR_VERSION\"" AC_SUBST(LIBXSLT_DEFAULT_PLUGINS_PATH) dnl @@ -518,7 +522,7 @@ AC_SUBST(EXSLT_LIBDIR) AC_SUBST(EXSLT_INCLUDEDIR) AC_SUBST(EXSLT_LIBS) -EXTRA_LIBS="$LIBXML_LIBS $M_LIBS" +EXTRA_LIBS="$EXTRA_LIBS $LIBXML_LIBS $M_LIBS" AC_SUBST(EXTRA_LIBS) AC_SUBST(M_LIBS) |