Author: jberry
Date: Sun May 29 07:54:23 2005
New Revision: 178960
URL: http://svn.apache.org/viewcvs?rev=178960&view=rev
Log:
Rename Xerces_hdr_config.h to Xerces_autoconf_config.h. This file is
now included only on an autoconf platform. XercesDefs.h decides whether
to use this autoconf config or another config specific to the platform.
Added:
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_autoconf_config.h
- copied, changed from r178954,
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_hdr_config.h
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_autoconf_config.h.in
- copied, changed from r178954,
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_hdr_config.h.in
Removed:
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_hdr_config.h
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_hdr_config.h.in
Modified:
xerces/c/branches/jberry/3.0-unstable/Makefile.in
xerces/c/branches/jberry/3.0-unstable/configure
xerces/c/branches/jberry/3.0-unstable/configure.ac
xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in
xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in
xerces/c/branches/jberry/3.0-unstable/samples/Makefile.in
xerces/c/branches/jberry/3.0-unstable/src/Makefile.in
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XercesDefs.hpp
xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in
Modified: xerces/c/branches/jberry/3.0-unstable/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/Makefile.in?rev=178960&r1=178959&r2=178960&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/Makefile.in Sun May 29 07:54:23 2005
@@ -38,7 +38,7 @@
DIST_COMMON = $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure \
- $(top_srcdir)/src/xercesc/util/Xerces_hdr_config.h.in \
+ $(top_srcdir)/src/xercesc/util/Xerces_autoconf_config.h.in \
config/compile config/config.guess config/config.sub \
config/depcomp config/install-sh config/ltmain.sh \
config/missing config/mkinstalldirs
@@ -71,7 +71,7 @@
configure.lineno configure.status.lineno
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = config.h \
- $(top_builddir)/src/xercesc/util/Xerces_hdr_config.h
+ $(top_builddir)/src/xercesc/util/Xerces_autoconf_config.h
CONFIG_CLEAN_FILES =
SOURCES =
DIST_SOURCES =
@@ -287,18 +287,18 @@
rm -f stamp-h1
touch $@
-src/xercesc/util/Xerces_hdr_config.h: src/xercesc/util/stamp-h2
+src/xercesc/util/Xerces_autoconf_config.h: src/xercesc/util/stamp-h2
@if test ! -f $@; then \
rm -f src/xercesc/util/stamp-h2; \
$(MAKE) src/xercesc/util/stamp-h2; \
else :; fi
-src/xercesc/util/stamp-h2:
$(top_srcdir)/src/xercesc/util/Xerces_hdr_config.h.in
$(top_builddir)/config.status
+src/xercesc/util/stamp-h2:
$(top_srcdir)/src/xercesc/util/Xerces_autoconf_config.h.in
$(top_builddir)/config.status
@rm -f src/xercesc/util/stamp-h2
- cd $(top_builddir) && $(SHELL) ./config.status
src/xercesc/util/Xerces_hdr_config.h
+ cd $(top_builddir) && $(SHELL) ./config.status
src/xercesc/util/Xerces_autoconf_config.h
distclean-hdr:
- -rm -f config.h stamp-h1 src/xercesc/util/Xerces_hdr_config.h
src/xercesc/util/stamp-h2
+ -rm -f config.h stamp-h1 src/xercesc/util/Xerces_autoconf_config.h
src/xercesc/util/stamp-h2
mostlyclean-libtool:
-rm -f *.lo
Modified: xerces/c/branches/jberry/3.0-unstable/configure
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/configure?rev=178960&r1=178959&r2=178960&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/configure (original)
+++ xerces/c/branches/jberry/3.0-unstable/configure Sun May 29 07:54:23 2005
@@ -1570,7 +1570,7 @@
{ (exit 1); exit 1; }; }
fi
- ac_config_headers="$ac_config_headers config.h
src/xercesc/util/Xerces_hdr_config.h"
+ ac_config_headers="$ac_config_headers config.h
src/xercesc/util/Xerces_autoconf_config.h"
ac_config_files="$ac_config_files Makefile lib/Makefile src/Makefile
obj/Makefile tests/Makefile samples/Makefile"
@@ -26175,7 +26175,7 @@
"samples/Makefile" ) CONFIG_FILES="$CONFIG_FILES samples/Makefile" ;;
"depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
"config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- "src/xercesc/util/Xerces_hdr_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS
src/xercesc/util/Xerces_hdr_config.h" ;;
+ "src/xercesc/util/Xerces_autoconf_config.h" )
CONFIG_HEADERS="$CONFIG_HEADERS src/xercesc/util/Xerces_autoconf_config.h" ;;
*) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5
echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
{ (exit 1); exit 1; }; };;
Modified: xerces/c/branches/jberry/3.0-unstable/configure.ac
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/configure.ac?rev=178960&r1=178959&r2=178960&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/configure.ac (original)
+++ xerces/c/branches/jberry/3.0-unstable/configure.ac Sun May 29 07:54:23 2005
@@ -28,7 +28,7 @@
AC_CONFIG_LIBOBJ_DIR([xercesc/compat])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
-AC_CONFIG_HEADERS([config.h src/xercesc/util/Xerces_hdr_config.h])
+AC_CONFIG_HEADERS([config.h src/xercesc/util/Xerces_autoconf_config.h])
AC_CONFIG_FILES([Makefile lib/Makefile src/Makefile obj/Makefile
tests/Makefile samples/Makefile])
# Check the target system
Modified: xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in?rev=178960&r1=178959&r2=178960&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/lib/Makefile.in Sun May 29 07:54:23
2005
@@ -87,7 +87,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h \
- $(top_builddir)/src/xercesc/util/Xerces_hdr_config.h
+ $(top_builddir)/src/xercesc/util/Xerces_autoconf_config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
am__DEPENDENCIES_1 = @LTLIBOBJS@
Modified: xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in?rev=178960&r1=178959&r2=178960&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/obj/Makefile.in Sun May 29 07:54:23
2005
@@ -86,7 +86,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h \
- $(top_builddir)/src/xercesc/util/Xerces_hdr_config.h
+ $(top_builddir)/src/xercesc/util/Xerces_autoconf_config.h
CONFIG_CLEAN_FILES =
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
Modified: xerces/c/branches/jberry/3.0-unstable/samples/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/samples/Makefile.in?rev=178960&r1=178959&r2=178960&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/samples/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/samples/Makefile.in Sun May 29
07:54:23 2005
@@ -87,7 +87,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h \
- $(top_builddir)/src/xercesc/util/Xerces_hdr_config.h
+ $(top_builddir)/src/xercesc/util/Xerces_autoconf_config.h
CONFIG_CLEAN_FILES =
am__EXEEXT_1 = CreateDOMDocument$(EXEEXT) DOMCount$(EXEEXT) \
DOMPrint$(EXEEXT) EnumVal$(EXEEXT) MemParse$(EXEEXT) \
Modified: xerces/c/branches/jberry/3.0-unstable/src/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/Makefile.in?rev=178960&r1=178959&r2=178960&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/src/Makefile.in Sun May 29 07:54:23
2005
@@ -143,7 +143,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h \
- $(top_builddir)/src/xercesc/util/Xerces_hdr_config.h
+ $(top_builddir)/src/xercesc/util/Xerces_autoconf_config.h
CONFIG_CLEAN_FILES =
LTLIBRARIES = $(noinst_LTLIBRARIES)
libcfurl_la_LIBADD =
Modified: xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XercesDefs.hpp
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XercesDefs.hpp?rev=178960&r1=178959&r2=178960&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XercesDefs.hpp
(original)
+++ xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/XercesDefs.hpp Sun
May 29 07:54:23 2005
@@ -28,7 +28,7 @@
// used by the remainder of this file.
//
// There are two major configuration files:
-// - xerces_hdr_config.h -- Contains defines that are
safe for
+// - xerces_autoconf_config.h -- Contains defines that are
safe for
//
access through public headers.
//
// - config.h -- Contains
defines that may conflict
@@ -37,7 +37,18 @@
//
// Both of these files are generated through the autoconf/configure
process.
// ---------------------------------------------------------------------------
-#include <xerces_hdr_config.h>
+
+//
+// If this is an autoconf configured build, we include Xerces_autoconf_config.
+// Otherwise we include a preconfigured config appropriate for the particular
+// platform.
+//
+#if FLAG_TO_INDICATE_WINDOWS_BUILD
+# include <xercesc/util/Xerces_windows_config.h>
+#else
+// If the next line generates an error then you haven't run ./configure
+# include <xercesc/util/Xerces_autoconf_config.h>
+#endif
// ---------------------------------------------------------------------------
// Include the Xerces version information; this is kept in a separate file to
Copied:
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_autoconf_config.h
(from r178954,
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_hdr_config.h)
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_autoconf_config.h?p2=xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_autoconf_config.h&p1=xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_hdr_config.h&r1=178954&r2=178960&rev=178960&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_hdr_config.h
(original)
+++
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_autoconf_config.h
Sun May 29 07:54:23 2005
@@ -1,4 +1,4 @@
-/* src/xercesc/util/Xerces_hdr_config.h. Generated by configure. */
+/* src/xercesc/util/Xerces_autoconf_config.h. Generated by configure. */
/*
* Copyright 1999-2004 The Apache Software Foundation.
*
Copied:
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_autoconf_config.h.in
(from r178954,
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_hdr_config.h.in)
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_autoconf_config.h.in?p2=xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_autoconf_config.h.in&p1=xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_hdr_config.h.in&r1=178954&r2=178960&rev=178960&view=diff
==============================================================================
---
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_hdr_config.h.in
(original)
+++
xerces/c/branches/jberry/3.0-unstable/src/xercesc/util/Xerces_autoconf_config.h.in
Sun May 29 07:54:23 2005
@@ -21,48 +21,24 @@
//
// There are two primary xerces configuration header files:
//
-// xerces_hdr_config.h -- For configuration of items that
must be accessable
+// Xerces_autoconf_config.h-- For configuration of items that must be
accessable
// through public
headers. This file has limited information
// and carefully
works to avoid collision of macro names, etc.
//
+// This file is
included by XercesDefs.h. In the event
+// of a
non-configured platform, a similar header specific
+// to the platform
will be included instead.
+//
// config.h -- Generalized autoconf header
file, with much more
// information,
used to supply configuration information
// for use in
implementation files.
//
// For autoconf based builds, this header is configured from by the configure
// script from the .in template file of the same name.
-//
-// For non-autoconf based builds, the default (non-template) copy of the file
-// is used out of the box.
-//
-#ifndef X_CONFIG_HPP
-#define X_CONFIG_HPP
-#if !HAVE_CONFIG_H
-// ===========================================================================
-// This section provides hooks for build environments where autoconf
-// is not used. At a minimum, these environments must supply the definitions
-// below.
-// ===========================================================================
-
-// *** TODO: this is an example/idea for how this should be done
-
-#if WINDOWS_IDE_BUILD
- // Configuration for a build through Visual Studio
- #include <..SOMEPATHTO../WindowsVisualStudioConfig.h>
-#elif MACOS_XCODE_BUILD
- // Configuration for a build through XCode
- #include <..SOMEPATHTO../MacsOSXCodeConfig.h>
-#else
- #error This build must be configured through autoconf or by providing
- #error specific instructions for a non-autoconf build.
-#endif
-
-#else
-// ===========================================================================
-// This section contains defines that are configured through autoconf.
-// ===========================================================================
+#ifndef XERCES_AUTOCONFIG_HPP
+#define XERCES_AUTOCONFIG_HPP
// ---------------------------------------------------------------------------
// These defines are set by configure as appropriate for the platform.
@@ -131,5 +107,4 @@
#define XERCES_DEBUG
#endif
-#endif
#endif
Modified: xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in
URL:
http://svn.apache.org/viewcvs/xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in?rev=178960&r1=178959&r2=178960&view=diff
==============================================================================
--- xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in (original)
+++ xerces/c/branches/jberry/3.0-unstable/tests/Makefile.in Sun May 29 07:54:23
2005
@@ -86,7 +86,7 @@
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/config/mkinstalldirs
CONFIG_HEADER = $(top_builddir)/config.h \
- $(top_builddir)/src/xercesc/util/Xerces_hdr_config.h
+ $(top_builddir)/src/xercesc/util/Xerces_autoconf_config.h
CONFIG_CLEAN_FILES =
am__EXEEXT_1 = DOMTest$(EXEEXT) DOMMemTest$(EXEEXT) \
Normalizer$(EXEEXT) RangeTest$(EXEEXT) Traversal$(EXEEXT) \
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
