From 2b0a4d6430ca97166e1e444ca9586f3ca54a26b6 Mon Sep 17 00:00:00 2001 From: Scott Cantor Date: Wed, 10 May 2006 16:38:40 +0000 Subject: [PATCH] Reference xmltooling headers for doxygen --- configure.ac | 3 +++ doxygen.am | 2 +- doxygen.cfg | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index 7367fb3..029d1fd 100644 --- a/configure.ac +++ b/configure.ac @@ -16,6 +16,7 @@ DX_XML_FEATURE(OFF) DX_PDF_FEATURE(OFF) DX_PS_FEATURE(OFF) DX_INIT_DOXYGEN(opensaml, doxygen.cfg, doc/api) +DX_INCLUDE= AC_ARG_ENABLE(debug, AC_HELP_STRING(--enable-debug, [Have GCC compile with symbols (Default = no)]), @@ -156,6 +157,7 @@ AC_ARG_WITH(xmltooling, [if test x_$with_xmltooling != x_/usr; then LDFLAGS="-L${with_xmltooling}/lib $LDFLAGS" CPPFLAGS="-I${with_xmltooling}/include $CPPFLAGS" + DX_INCLUDE="${with_xmltooling}/include" fi]) LIBS="-lxmltooling $LIBS" AC_CHECK_HEADER([xmltooling/XMLToolingConfig.h],,AC_MSG_ERROR([unable to find xmltooling header files])) @@ -191,6 +193,7 @@ AC_SUBST(CXXTEST) AC_SUBST(CXXTESTFLAGS) AM_CONDITIONAL(BUILD_UNITTEST,test -f ${CXXTEST}) +AC_SUBST(DX_INCLUDE) LIBTOOL="$LIBTOOL --silent" # output makefiles diff --git a/doxygen.am b/doxygen.am index 420049e..f6f505a 100644 --- a/doxygen.am +++ b/doxygen.am @@ -168,7 +168,7 @@ doxygen-doc: doxygen-run $(DX_PS_GOAL) $(DX_PDF_GOAL) @DX_DOCDIR@/@PACKAGE@.tag: $(DX_CONFIG) $(pkginclude_HEADERS) rm -rf @DX_DOCDIR@ - $(DX_ENV) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG) + $(DX_ENV) DX_INCLUDE=$(DX_INCLUDE) $(DX_DOXYGEN) $(srcdir)/$(DX_CONFIG) DX_CLEANFILES = \ @DX_DOCDIR@/@PACKAGE@.tag \ diff --git a/doxygen.cfg b/doxygen.cfg index 975b66b..ac014a4 100644 --- a/doxygen.cfg +++ b/doxygen.cfg @@ -209,7 +209,7 @@ ENABLE_PREPROCESSING = YES MACRO_EXPANSION = YES EXPAND_ONLY_PREDEF = NO SEARCH_INCLUDES = YES -INCLUDE_PATH = $(SRCDIR) +INCLUDE_PATH = $(SRCDIR) $(DX_INCLUDE) INCLUDE_FILE_PATTERNS = PREDEFINED = _MSC_VER \ DOXYGEN_SKIP -- 2.1.4