From 39d706d038672e6f1000a11d5d59ff360bcd3b25 Mon Sep 17 00:00:00 2001 From: Jez Higgins Date: Thu, 14 Jan 2010 14:29:55 +0000 Subject: [PATCH] updated build to explicitly list all the includes, so that they get installed and uninstalled. make distcheck should now work --- .bzrignore | 2 - Makefile.am | 8 +- configure.ac | 1 + include/Makefile.am | 250 ++++++++++++++++++++++++++++++++++++++++++++ m4/lt-obsolete.m4 | 98 ----------------- m4/lt~obsolete.m4 | 92 ---------------- 6 files changed, 253 insertions(+), 198 deletions(-) create mode 100644 include/Makefile.am delete mode 100644 m4/lt-obsolete.m4 delete mode 100644 m4/lt~obsolete.m4 diff --git a/.bzrignore b/.bzrignore index acaf8925..729f2c68 100644 --- a/.bzrignore +++ b/.bzrignore @@ -46,8 +46,6 @@ examples/Taggle/taggle examples/Utils/transcode examples/XPath/xgrep examples/XSLT/mangle -m4/lt~obsolete.m4@ - fractal*.html tests/SAX/filter_test* tests/DOM/dom_test* diff --git a/Makefile.am b/Makefile.am index 7133bbbf..bfa3bbb1 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,13 +1,11 @@ - ACLOCAL_AMFLAGS = -I m4 -SUBDIRS= src examples tests +SUBDIRS=include src examples tests -DIST_SUBDIRS=src examples tests +DIST_SUBDIRS=include src examples tests EXTRA_DIST=vs7 \ vs8 \ vs9 \ - include \ doc \ tests/XSLT/testsuite \ src/SAX/wrappers/saxexpat.cpp \ @@ -30,5 +28,3 @@ docs: @echo "Generated documents to ./doc/html" @echo "------------------------------------------------------------" -clean-local: - cd doc && rm -rf html diff --git a/configure.ac b/configure.ac index fb58c786..78c6cb47 100644 --- a/configure.ac +++ b/configure.ac @@ -28,6 +28,7 @@ HAS_LIB_ELEPHANT AC_CONFIG_HEADERS([include/SAX/ArabicaConfig.hpp]) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([arabica.pc]) +AC_CONFIG_FILES([include/Makefile]) AC_CONFIG_FILES([src/Makefile]) AC_CONFIG_FILES([examples/Makefile]) AC_CONFIG_FILES([examples/Utils/Makefile]) diff --git a/include/Makefile.am b/include/Makefile.am new file mode 100644 index 00000000..767001a8 --- /dev/null +++ b/include/Makefile.am @@ -0,0 +1,250 @@ + +sax_headers = SAX/SAXParseException.hpp \ + SAX/ErrorHandler.hpp \ + SAX/SAXException.hpp \ + SAX/SAXNotRecognizedException.hpp \ + SAX/ParserConfig.hpp \ + SAX/InputSource.hpp \ + SAX/EntityResolver.hpp \ + SAX/Attributes.hpp \ + SAX/DocumentHandler.hpp \ + SAX/XMLFilter.hpp \ + SAX/IStreamHandle.hpp \ + SAX/Locator.hpp \ + SAX/DTDHandler.hpp \ + SAX/filter/XMLBaseTracker.hpp \ + SAX/filter/WhitespaceStripperFilter.hpp \ + SAX/filter/NamespaceTracker.hpp \ + SAX/filter/TextOnly.hpp \ + SAX/filter/Writer.hpp \ + SAX/filter/TextCoalescer.hpp \ + SAX/filter/PYXWriter.hpp \ + SAX/SAXNotSupportedException.hpp \ + SAX/ContentHandler.hpp \ + SAX/AttributeList.hpp \ + SAX/XMLReader.hpp \ + SAX/wrappers/saxexpat.hpp \ + SAX/wrappers/saxlibxml2.hpp \ + SAX/wrappers/saxxerces.hpp \ + SAX/wrappers/saxmsxml2.hpp \ + SAX/wrappers/XercesFeatureNames.hpp \ + SAX/wrappers/XercesPropertyNames.hpp \ + SAX/saxfwd.hpp \ + SAX/ext/Attributes2.hpp \ + SAX/ext/DefaultHandler2.hpp \ + SAX/ext/DeclHandler.hpp \ + SAX/ext/Locator2.hpp \ + SAX/ext/LexicalHandler.hpp \ + SAX/ext/ProgressiveParser.hpp \ + SAX/helpers/AttributeListImpl.hpp \ + SAX/helpers/AttributeTypes.hpp \ + SAX/helpers/AttributeDefaults.hpp \ + SAX/helpers/LocatorImpl.hpp \ + SAX/helpers/ParserAdaptor.hpp \ + SAX/helpers/NamespaceSupport.hpp \ + SAX/helpers/XMLFilterImpl.hpp \ + SAX/helpers/PropertyNames.hpp \ + SAX/helpers/AttributesImpl.hpp \ + SAX/helpers/DefaultHandler.hpp \ + SAX/helpers/InputSourceResolver.hpp \ + SAX/helpers/CatchErrorHandler.hpp \ + SAX/helpers/FeatureNames.hpp \ + SAX/helpers/XMLBaseSupport.hpp \ + SAX/parsers/saxgarden.hpp + +taggle_headers = Taggle/Taggle.hpp \ + Taggle/impl/ElementType.hpp \ + Taggle/impl/Element.hpp \ + Taggle/impl/html/HTMLModels.hpp \ + Taggle/impl/html/HTMLScanner.hpp \ + Taggle/impl/html/HTMLSchema.hpp \ + Taggle/impl/SchemaImpl.hpp \ + Taggle/impl/ScanHandler.hpp \ + Taggle/impl/Schema.hpp \ + Taggle/impl/Parser.hpp \ + Taggle/impl/Scanner.hpp + +dom_headers = DOM/SAX2DOM/SAX2DOM.hpp \ + DOM/SAX2DOM/DocumentTypeImpl.hpp \ + DOM/Notation.hpp \ + DOM/Comment.hpp \ + DOM/Element.hpp \ + DOM/Node.hpp \ + DOM/DocumentFragment.hpp \ + DOM/ProcessingInstruction.hpp \ + DOM/CDATASection.hpp \ + DOM/Text.hpp \ + DOM/Document.hpp \ + DOM/DualMode/DualMode.hpp \ + DOM/CharacterData.hpp \ + DOM/Entity.hpp \ + DOM/Traversal/TreeWalker.hpp \ + DOM/Traversal/DocumentTraversal.hpp \ + DOM/Traversal/DocumentTraversalImpl.hpp \ + DOM/Traversal/NodeFilter.hpp \ + DOM/Traversal/TraversalImpl.hpp \ + DOM/Traversal/NodeIterator.hpp \ + DOM/Traversal/TreeWalkerImpl.hpp \ + DOM/DOMImplementation.hpp \ + DOM/DOMException.hpp \ + DOM/NamedNodeMap.hpp \ + DOM/EntityReference.hpp \ + DOM/Attr.hpp \ + DOM/NodeList.hpp \ + DOM/Simple/ProcessingInstructionImpl.hpp \ + DOM/Simple/EntityReferenceImpl.hpp \ + DOM/Simple/CharacterDataImpl.hpp \ + DOM/Simple/AttrImpl.hpp \ + DOM/Simple/TextImpl.hpp \ + DOM/Simple/EntityImpl.hpp \ + DOM/Simple/ElementNSImpl.hpp \ + DOM/Simple/DocumentImpl.hpp \ + DOM/Simple/CDATASectionImpl.hpp \ + DOM/Simple/DOMImplementation.hpp \ + DOM/Simple/AttrMap.hpp \ + DOM/Simple/AttrNSImpl.hpp \ + DOM/Simple/ElementByTagImpl.hpp \ + DOM/Simple/DocumentFragmentImpl.hpp \ + DOM/Simple/Helpers.hpp \ + DOM/Simple/NodeImpl.hpp \ + DOM/Simple/ElementImpl.hpp \ + DOM/Simple/NamedNodeMapImpl.hpp \ + DOM/Simple/CommentImpl.hpp \ + DOM/Simple/NotationImpl.hpp \ + DOM/Simple/DocumentTypeImpl.hpp \ + DOM/DocumentType.hpp \ + DOM/Events/EventListener.hpp \ + DOM/Events/Event.hpp \ + DOM/Events/DocumentEvent.hpp \ + DOM/Events/EventException.hpp \ + DOM/Events/MutationEvent.hpp \ + DOM/Events/EventTarget.hpp \ + DOM/Proxy.hpp \ + DOM/io/Stream.hpp + +arabica_headers = convert/utf8ucs2codecvt.hpp \ + convert/utf8iso88591codecvt.hpp \ + convert/utf16beucs2codecvt.hpp \ + convert/utf16leucs2codecvt.hpp \ + convert/impl/codecvt_specialisations.hpp \ + convert/impl/ucs2_utf16.hpp \ + convert/impl/iso88591_utf8.hpp \ + convert/impl/ucs2_utf8.hpp \ + convert/base64codecvt.hpp \ + convert/ucs2utf8codecvt.hpp \ + convert/utf16utf8codecvt.hpp \ + convert/iso88591utf8codecvt.hpp \ + convert/rot13codecvt.hpp \ + Arabica/StringAdaptor.hpp \ + Arabica/stringadaptortag.hpp \ + Arabica/getparam.hpp \ + Arabica/mbstate.hpp \ + text/normalize_whitespace.hpp \ + text/UnicodeCharacters.hpp \ + io/convertstream.hpp \ + io/uri.hpp \ + io/convert_adaptor.hpp \ + io/socket_stream.hpp \ + XML/strings.hpp \ + XML/QName.hpp \ + XML/XMLCharacterClasses.hpp \ + XML/escaper.hpp + +xpath_headers = XPath/XPath.hpp \ + XPath/impl/xpath_variable_resolver.hpp \ + XPath/impl/xpath_compile_context.hpp \ + XPath/impl/xpath_expression.hpp \ + XPath/impl/xpath_union.hpp \ + XPath/impl/xpath_function_resolver.hpp \ + XPath/impl/xpath_function_holder.hpp \ + XPath/impl/xpath_axis_enumerator.hpp \ + XPath/impl/xpath_value.hpp \ + XPath/impl/xpath_variable.hpp \ + XPath/impl/xpath_match.hpp \ + XPath/impl/xpath_object.hpp \ + XPath/impl/xpath_resolver_holder.hpp \ + XPath/impl/xpath_arithmetic.hpp \ + XPath/impl/xpath_grammar.hpp \ + XPath/impl/xpath_expression_impl.hpp \ + XPath/impl/xpath_logical.hpp \ + XPath/impl/xpath_ast_ids.hpp \ + XPath/impl/xpath_function.hpp \ + XPath/impl/xpath_step.hpp \ + XPath/impl/xpath_namespace_node.hpp \ + XPath/impl/xpath_match_rewrite.hpp \ + XPath/impl/xpath_relational.hpp \ + XPath/impl/xpath_node_test.hpp \ + XPath/impl/xpath_ast.hpp \ + XPath/impl/xpath_namespace_context.hpp \ + XPath/impl/xpath_parser.hpp \ + XPath/impl/xpath_execution_context.hpp + +xslt_headers = XSLT/XSLT.hpp \ + XSLT/impl/xslt_choose.hpp \ + XSLT/impl/xslt_template.hpp \ + XSLT/impl/xslt_top_level_param.hpp \ + XSLT/impl/xslt_processing_instruction.hpp \ + XSLT/impl/xslt_variable_impl.hpp \ + XSLT/impl/xslt_for_each.hpp \ + XSLT/impl/xslt_qname.hpp \ + XSLT/impl/xslt_functions.hpp \ + XSLT/impl/xslt_param.hpp \ + XSLT/impl/xslt_item.hpp \ + XSLT/impl/xslt_element.hpp \ + XSLT/impl/xslt_call_template.hpp \ + XSLT/impl/xslt_variable_stack.hpp \ + XSLT/impl/xslt_stylesheet.hpp \ + XSLT/impl/handler/xslt_apply_templates_handler.hpp \ + XSLT/impl/handler/xslt_output_handler.hpp \ + XSLT/impl/handler/xslt_comment_handler.hpp \ + XSLT/impl/handler/xslt_attribute_handler.hpp \ + XSLT/impl/handler/xslt_value_validation.hpp \ + XSLT/impl/handler/xslt_item_container_handler.hpp \ + XSLT/impl/handler/xslt_text_handler.hpp \ + XSLT/impl/handler/xslt_constants.hpp \ + XSLT/impl/handler/xslt_inline_element_handler.hpp \ + XSLT/impl/handler/xslt_sort_handler.hpp \ + XSLT/impl/handler/xslt_apply_imports_handler.hpp \ + XSLT/impl/handler/xslt_include_handler.hpp \ + XSLT/impl/handler/xslt_create_handler.hpp \ + XSLT/impl/handler/xslt_foreign_element_handler.hpp \ + XSLT/impl/handler/xslt_with_param_handler.hpp \ + XSLT/impl/handler/xslt_namespace_alias_handler.hpp \ + XSLT/impl/handler/xslt_if_handler.hpp \ + XSLT/impl/handler/xslt_copy_handler.hpp \ + XSLT/impl/handler/xslt_variable_handler.hpp \ + XSLT/impl/handler/xslt_element_handler.hpp \ + XSLT/impl/handler/xslt_for_each_handler.hpp \ + XSLT/impl/handler/xslt_key_handler.hpp \ + XSLT/impl/handler/xslt_message_handler.hpp \ + XSLT/impl/handler/xslt_call_template_handler.hpp \ + XSLT/impl/handler/xslt_processing_instruction_handler.hpp \ + XSLT/impl/handler/xslt_choose_handler.hpp \ + XSLT/impl/handler/xslt_template_handler.hpp \ + XSLT/impl/handler/xslt_value_of_handler.hpp \ + XSLT/impl/xslt_stylesheet_parser.hpp \ + XSLT/impl/xslt_inline_element.hpp \ + XSLT/impl/xslt_if.hpp \ + XSLT/impl/xslt_compilation_context.hpp \ + XSLT/impl/xslt_execution_context.hpp \ + XSLT/impl/xslt_copy.hpp \ + XSLT/impl/xslt_namespace_stack.hpp \ + XSLT/impl/xslt_sort.hpp \ + XSLT/impl/xslt_comment.hpp \ + XSLT/impl/xslt_precedence.hpp \ + XSLT/impl/xslt_compiled_stylesheet.hpp \ + XSLT/impl/xslt_apply_imports.hpp \ + XSLT/impl/xslt_stylesheet_compiler.hpp \ + XSLT/impl/xslt_output.hpp \ + XSLT/impl/xslt_value_of.hpp \ + XSLT/impl/xslt_with_param.hpp \ + XSLT/impl/xslt_attribute.hpp \ + XSLT/impl/xslt_variable.hpp \ + XSLT/impl/xslt_sink.hpp \ + XSLT/impl/xslt_message.hpp \ + XSLT/impl/xslt_key.hpp \ + XSLT/impl/xslt_text.hpp \ + XSLT/impl/xslt_apply_templates.hpp + +nobase_include_HEADERS = SAX/ArabicaConfig.hpp $(sax_headers) $(taggle_headers) $(dom_headers) $(arabica_headers) $(xpath_headers) $(xslt_headers) + diff --git a/m4/lt-obsolete.m4 b/m4/lt-obsolete.m4 deleted file mode 100644 index bf92b5e0..00000000 --- a/m4/lt-obsolete.m4 +++ /dev/null @@ -1,98 +0,0 @@ -# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004. -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 4 lt~obsolete.m4 - -# These exist entirely to fool aclocal when bootstrapping libtool. -# -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) -# which have later been changed to m4_define as they aren't part of the -# exported API, or moved to Autoconf or Automake where they belong. -# -# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN -# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us -# using a macro with the same name in our local m4/libtool.m4 it'll -# pull the old libtool.m4 in (it doesn't see our shiny new m4_define -# and doesn't know about Autoconf macros at all.) -# -# So we provide this file, which has a silly filename so it's always -# included after everything else. This provides aclocal with the -# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything -# because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. -# -# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. -# Yes, that means every name once taken will need to remain here until -# we give up compatibility with versions before 1.7, at which point -# we need to keep only those names which we still refer to. - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) - -m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) -m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) -m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) -m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) -m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) -m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) -m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) -m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) -m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) -m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) -m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) -m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) -m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) -m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) -m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) -m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) -m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) -m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) -m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) -m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) -m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) -m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) -m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) -m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) -m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) -m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) -m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) -m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) -m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) -m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) -m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) -m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) -m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) -m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) -m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) -m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) -m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) -m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) -m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) -m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) -m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) -m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) -m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) -m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) -m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) -m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) -m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) -m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])]) diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4 deleted file mode 100644 index 637bb206..00000000 --- a/m4/lt~obsolete.m4 +++ /dev/null @@ -1,92 +0,0 @@ -# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- -# -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. -# Written by Scott James Remnant, 2004. -# -# This file is free software; the Free Software Foundation gives -# unlimited permission to copy and/or distribute it, with or without -# modifications, as long as this notice is preserved. - -# serial 4 lt~obsolete.m4 - -# These exist entirely to fool aclocal when bootstrapping libtool. -# -# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN) -# which have later been changed to m4_define as they aren't part of the -# exported API, or moved to Autoconf or Automake where they belong. -# -# The trouble is, aclocal is a bit thick. It'll see the old AC_DEFUN -# in /usr/share/aclocal/libtool.m4 and remember it, then when it sees us -# using a macro with the same name in our local m4/libtool.m4 it'll -# pull the old libtool.m4 in (it doesn't see our shiny new m4_define -# and doesn't know about Autoconf macros at all.) -# -# So we provide this file, which has a silly filename so it's always -# included after everything else. This provides aclocal with the -# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything -# because those macros already exist, or will be overwritten later. -# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6. -# -# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here. -# Yes, that means every name once taken will need to remain here until -# we give up compatibility with versions before 1.7, at which point -# we need to keep only those names which we still refer to. - -# This is to help aclocal find these macros, as it can't see m4_define. -AC_DEFUN([LTOBSOLETE_VERSION], [m4_if([1])]) - -m4_ifndef([AC_LIBTOOL_LINKER_OPTION], [AC_DEFUN([AC_LIBTOOL_LINKER_OPTION])]) -m4_ifndef([AC_PROG_EGREP], [AC_DEFUN([AC_PROG_EGREP])]) -m4_ifndef([_LT_AC_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_AC_PROG_ECHO_BACKSLASH])]) -m4_ifndef([_LT_AC_SHELL_INIT], [AC_DEFUN([_LT_AC_SHELL_INIT])]) -m4_ifndef([_LT_AC_SYS_LIBPATH_AIX], [AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX])]) -m4_ifndef([_LT_PROG_LTMAIN], [AC_DEFUN([_LT_PROG_LTMAIN])]) -m4_ifndef([_LT_AC_TAGVAR], [AC_DEFUN([_LT_AC_TAGVAR])]) -m4_ifndef([AC_LTDL_ENABLE_INSTALL], [AC_DEFUN([AC_LTDL_ENABLE_INSTALL])]) -m4_ifndef([AC_LTDL_PREOPEN], [AC_DEFUN([AC_LTDL_PREOPEN])]) -m4_ifndef([_LT_AC_SYS_COMPILER], [AC_DEFUN([_LT_AC_SYS_COMPILER])]) -m4_ifndef([_LT_AC_LOCK], [AC_DEFUN([_LT_AC_LOCK])]) -m4_ifndef([AC_LIBTOOL_SYS_OLD_ARCHIVE], [AC_DEFUN([AC_LIBTOOL_SYS_OLD_ARCHIVE])]) -m4_ifndef([_LT_AC_TRY_DLOPEN_SELF], [AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF])]) -m4_ifndef([AC_LIBTOOL_PROG_CC_C_O], [AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O])]) -m4_ifndef([AC_LIBTOOL_SYS_HARD_LINK_LOCKS], [AC_DEFUN([AC_LIBTOOL_SYS_HARD_LINK_LOCKS])]) -m4_ifndef([AC_LIBTOOL_OBJDIR], [AC_DEFUN([AC_LIBTOOL_OBJDIR])]) -m4_ifndef([AC_LTDL_OBJDIR], [AC_DEFUN([AC_LTDL_OBJDIR])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH], [AC_DEFUN([AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH])]) -m4_ifndef([AC_LIBTOOL_SYS_LIB_STRIP], [AC_DEFUN([AC_LIBTOOL_SYS_LIB_STRIP])]) -m4_ifndef([AC_PATH_MAGIC], [AC_DEFUN([AC_PATH_MAGIC])]) -m4_ifndef([AC_PROG_LD_GNU], [AC_DEFUN([AC_PROG_LD_GNU])]) -m4_ifndef([AC_PROG_LD_RELOAD_FLAG], [AC_DEFUN([AC_PROG_LD_RELOAD_FLAG])]) -m4_ifndef([AC_DEPLIBS_CHECK_METHOD], [AC_DEFUN([AC_DEPLIBS_CHECK_METHOD])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_NO_RTTI], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_NO_RTTI])]) -m4_ifndef([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE], [AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE])]) -m4_ifndef([AC_LIBTOOL_PROG_COMPILER_PIC], [AC_DEFUN([AC_LIBTOOL_PROG_COMPILER_PIC])]) -m4_ifndef([AC_LIBTOOL_PROG_LD_SHLIBS], [AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS])]) -m4_ifndef([AC_LIBTOOL_POSTDEP_PREDEP], [AC_DEFUN([AC_LIBTOOL_POSTDEP_PREDEP])]) -m4_ifndef([LT_AC_PROG_EGREP], [AC_DEFUN([LT_AC_PROG_EGREP])]) -m4_ifndef([LT_AC_PROG_SED], [AC_DEFUN([LT_AC_PROG_SED])]) -m4_ifndef([_LT_CC_BASENAME], [AC_DEFUN([_LT_CC_BASENAME])]) -m4_ifndef([_LT_COMPILER_BOILERPLATE], [AC_DEFUN([_LT_COMPILER_BOILERPLATE])]) -m4_ifndef([_LT_LINKER_BOILERPLATE], [AC_DEFUN([_LT_LINKER_BOILERPLATE])]) -m4_ifndef([_AC_PROG_LIBTOOL], [AC_DEFUN([_AC_PROG_LIBTOOL])]) -m4_ifndef([AC_LIBTOOL_SETUP], [AC_DEFUN([AC_LIBTOOL_SETUP])]) -m4_ifndef([_LT_AC_CHECK_DLFCN], [AC_DEFUN([_LT_AC_CHECK_DLFCN])]) -m4_ifndef([AC_LIBTOOL_SYS_DYNAMIC_LINKER], [AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER])]) -m4_ifndef([_LT_AC_TAGCONFIG], [AC_DEFUN([_LT_AC_TAGCONFIG])]) -m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])]) -m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) -m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) -m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) -m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) -m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) -m4_ifndef([_LT_AC_LANG_CXX_CONFIG], [AC_DEFUN([_LT_AC_LANG_CXX_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_F77_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_F77_CONFIG])]) -m4_ifndef([_LT_AC_LANG_F77_CONFIG], [AC_DEFUN([_LT_AC_LANG_F77_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_GCJ_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_GCJ_CONFIG])]) -m4_ifndef([_LT_AC_LANG_GCJ_CONFIG], [AC_DEFUN([_LT_AC_LANG_GCJ_CONFIG])]) -m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])]) -m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) -m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) -m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])