Commit f97d4a26 authored by Andrew Dunstan's avatar Andrew Dunstan

Add --with-libxslt configure option

parent 6041b922
This diff is collapsed.
dnl Process this file with autoconf to produce a configure script. dnl Process this file with autoconf to produce a configure script.
dnl $PostgreSQL: pgsql/configure.in,v 1.510 2007/04/13 18:50:01 adunstan Exp $ dnl $PostgreSQL: pgsql/configure.in,v 1.511 2007/04/15 12:48:23 adunstan Exp $
dnl dnl
dnl Developers, please strive to achieve this order: dnl Developers, please strive to achieve this order:
dnl dnl
...@@ -579,6 +579,15 @@ fi ...@@ -579,6 +579,15 @@ fi
AC_SUBST(with_libxml) AC_SUBST(with_libxml)
#
# XSLT
#
PGAC_ARG_BOOL(with, libxslt, no, [ --with-libxslt build with XSLT support],
[AC_DEFINE([USE_LIBXSLT], 1, [Define to 1 to build with XSLT support. (--with-libxslt)])])
AC_SUBST(with_libxslt)
# #
# Zlib # Zlib
# #
...@@ -768,6 +777,10 @@ if test "$with_libxml" = yes ; then ...@@ -768,6 +777,10 @@ if test "$with_libxml" = yes ; then
AC_CHECK_LIB(xml2, xmlSaveToBuffer, [], [AC_MSG_ERROR([library 'xml2' (version >= 2.6.23) is required for XML support])]) AC_CHECK_LIB(xml2, xmlSaveToBuffer, [], [AC_MSG_ERROR([library 'xml2' (version >= 2.6.23) is required for XML support])])
fi fi
if test "$with_libxslt" = yes ; then
AC_CHECK_LIB(xslt, xsltLibxmlVersion, [], [AC_MSG_ERROR([library 'xslt' is required for XSLT support])])
fi
## ##
## Header files ## Header files
...@@ -847,6 +860,10 @@ if test "$with_libxml" = yes ; then ...@@ -847,6 +860,10 @@ if test "$with_libxml" = yes ; then
AC_CHECK_HEADER(libxml/parser.h, [], [AC_MSG_ERROR([header file <libxml/parser.h> is required for XML support])]) AC_CHECK_HEADER(libxml/parser.h, [], [AC_MSG_ERROR([header file <libxml/parser.h> is required for XML support])])
fi fi
if test "$with_libxslt" = yes ; then
AC_CHECK_HEADER(libxslt/xslt.h, [], [AC_MSG_ERROR([header file <libxslt/xslt.h> is required for XSLT support])])
fi
if test "$with_ldap" = yes ; then if test "$with_ldap" = yes ; then
if test "$PORTNAME" != "win32"; then if test "$PORTNAME" != "win32"; then
AC_CHECK_HEADERS(ldap.h, [], AC_CHECK_HEADERS(ldap.h, [],
......
# $PostgreSQL: pgsql/contrib/Makefile,v 1.73 2007/04/14 12:57:07 adunstan Exp $ # $PostgreSQL: pgsql/contrib/Makefile,v 1.74 2007/04/15 12:48:23 adunstan Exp $
subdir = contrib subdir = contrib
top_builddir = .. top_builddir = ..
...@@ -37,9 +37,15 @@ ifeq ($(with_openssl),yes) ...@@ -37,9 +37,15 @@ ifeq ($(with_openssl),yes)
WANTED_DIRS += sslinfo WANTED_DIRS += sslinfo
endif endif
ifeq ($(with_libxml),yes)
ifeq ($(with_libxslt),yes)
WANTED_DIRS += xml2
endif
endif
# Missing: # Missing:
# start-scripts \ (does not have a makefile) # start-scripts \ (does not have a makefile)
# xml2 \ (requires libxml and libxslt installed)
all install installdirs uninstall distprep clean distclean maintainer-clean: all install installdirs uninstall distprep clean distclean maintainer-clean:
@for dir in $(WANTED_DIRS); do \ @for dir in $(WANTED_DIRS); do \
......
# -*-makefile-*- # -*-makefile-*-
# $PostgreSQL: pgsql/src/Makefile.global.in,v 1.234 2007/04/13 18:50:01 adunstan Exp $ # $PostgreSQL: pgsql/src/Makefile.global.in,v 1.235 2007/04/15 12:48:23 adunstan Exp $
#------------------------------------------------------------------------------ #------------------------------------------------------------------------------
# All PostgreSQL makefiles include this file and use the variables it sets, # All PostgreSQL makefiles include this file and use the variables it sets,
...@@ -153,6 +153,7 @@ with_python = @with_python@ ...@@ -153,6 +153,7 @@ with_python = @with_python@
with_tcl = @with_tcl@ with_tcl = @with_tcl@
with_openssl = @with_openssl@ with_openssl = @with_openssl@
with_libxml = @with_libxml@ with_libxml = @with_libxml@
with_libxslt = @with_libxslt@
with_zlib = @with_zlib@ with_zlib = @with_zlib@
enable_shared = @enable_shared@ enable_shared = @enable_shared@
enable_rpath = @enable_rpath@ enable_rpath = @enable_rpath@
......
...@@ -256,6 +256,9 @@ ...@@ -256,6 +256,9 @@
/* Define to 1 if you have the `xml2' library (-lxml2). */ /* Define to 1 if you have the `xml2' library (-lxml2). */
#undef HAVE_LIBXML2 #undef HAVE_LIBXML2
/* Define to 1 if you have the `xslt' library (-lxslt). */
#undef HAVE_LIBXSLT
/* Define to 1 if you have the `z' library (-lz). */ /* Define to 1 if you have the `z' library (-lz). */
#undef HAVE_LIBZ #undef HAVE_LIBZ
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment