projects
/
shibboleth
/
cpp-xmltooling.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
208033c
)
Fix autoheader warnings.
author
Scott Cantor
<cantor.2@osu.edu>
Tue, 16 Dec 2008 05:15:03 +0000
(
05:15
+0000)
committer
Scott Cantor
<cantor.2@osu.edu>
Tue, 16 Dec 2008 05:15:03 +0000
(
05:15
+0000)
configure.ac
patch
|
blob
|
history
diff --git
a/configure.ac
b/configure.ac
index
c64aaf2
..
c00d6d0
100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-92,7
+92,7
@@
AC_CXX_NAMESPACES
AC_TRY_LINK(
[ class base { public: virtual base *GetPtr( void ) { return this; } }; ],
[ class derived: virtual public base { public: virtual derived *GetPtr( void ) { return this; } }; ],
AC_TRY_LINK(
[ class base { public: virtual base *GetPtr( void ) { return this; } }; ],
[ class derived: virtual public base { public: virtual derived *GetPtr( void ) { return this; } }; ],
- [AC_DEFINE(
HAVE_COVARIANT_RETURNS,1,[Define
if C++ compiler supports covariant virtual methods.])])
+ [AC_DEFINE(
[HAVE_COVARIANT_RETURNS], [1], [Define to 1
if C++ compiler supports covariant virtual methods.])])
# log4shib settings (favor this version over the log4cpp code)
AC_PATH_PROG(LOG4SHIB_CONFIG,log4shib-config)
# log4shib settings (favor this version over the log4cpp code)
AC_PATH_PROG(LOG4SHIB_CONFIG,log4shib-config)
@@
-112,7
+112,7
@@
if test -f "${LOG4SHIB_CONFIG}"; then
[#include <log4shib/Category.hh>
#include <log4shib/CategoryStream.hh>],
[log4shib::Category::getInstance("foo").errorStream() << log4shib::eol],
[#include <log4shib/Category.hh>
#include <log4shib/CategoryStream.hh>],
[log4shib::Category::getInstance("foo").errorStream() << log4shib::eol],
- [AC_DEFINE(
XMLTOOLING_LOG4SHIB,1,[Define
if log4shib library is used.])],
+ [AC_DEFINE(
[XMLTOOLING_LOG4SHIB], [1], [Define to 1
if log4shib library is used.])],
[AC_MSG_ERROR([unable to link with log4shib])])
else
AC_MSG_WARN([log4shib-config not found, may need to use --with-log4shib option])
[AC_MSG_ERROR([unable to link with log4shib])])
else
AC_MSG_WARN([log4shib-config not found, may need to use --with-log4shib option])
@@
-137,7
+137,7
@@
else
[#include <log4cpp/Category.hh>
#include <log4cpp/CategoryStream.hh>],
[log4cpp::Category::getInstance("foo").errorStream() << log4cpp::eol],
[#include <log4cpp/Category.hh>
#include <log4cpp/CategoryStream.hh>],
[log4cpp::Category::getInstance("foo").errorStream() << log4cpp::eol],
- [AC_DEFINE(
XMLTOOLING_LOG4CPP,1,[Define
if log4cpp library is used.])],
+ [AC_DEFINE(
[XMLTOOLING_LOG4CPP], [1], [Define to 1
if log4cpp library is used.])],
[AC_MSG_ERROR([unable to link with log4cpp, need version 1.0 or later])])
else
AC_MSG_ERROR([log4cpp-config not found, may need to use --with-log4cpp option])
[AC_MSG_ERROR([unable to link with log4cpp, need version 1.0 or later])])
else
AC_MSG_ERROR([log4cpp-config not found, may need to use --with-log4cpp option])
@@
-166,7
+166,7
@@
int i = 0;
AC_TRY_LINK(
[#include <xercesc/util/PlatformUtils.hpp>],
[xercesc::XMLPlatformUtils::Initialize()],
AC_TRY_LINK(
[#include <xercesc/util/PlatformUtils.hpp>],
[xercesc::XMLPlatformUtils::Initialize()],
- [AC_DEFINE(
HAVE_LIBXERCESC,1,[Define
if Xerces-C library was found])],
+ [AC_DEFINE(
[HAVE_LIBXERCESC], [1], [Define to 1
if Xerces-C library was found])],
[AC_MSG_ERROR([unable to link with Xerces])])
AC_MSG_CHECKING([whether Xerces is 64-bit clean])
[AC_MSG_ERROR([unable to link with Xerces])])
AC_MSG_CHECKING([whether Xerces is 64-bit clean])
@@
-175,7
+175,7
@@
AC_TRY_COMPILE([#include <xercesc/framework/MemBufInputSource.hpp>],
XMLFilePos testvar;
],
[AC_MSG_RESULT([yes])]
XMLFilePos testvar;
],
[AC_MSG_RESULT([yes])]
- [AC_DEFINE(
XMLTOOLING_XERCESC_64BITSAFE
)],
+ [AC_DEFINE(
[XMLTOOLING_XERCESC_64BITSAFE], [1], [Define to 1 if Xerces has a 64-bit-safe API.]
)],
[AC_MSG_RESULT([no])])
AC_MSG_CHECKING([whether Xerces BinInputStream requires getContentType])
[AC_MSG_RESULT([no])])
AC_MSG_CHECKING([whether Xerces BinInputStream requires getContentType])
@@
-186,7
+186,7
@@
AC_TRY_COMPILE([#include <xercesc/framework/MemBufInputSource.hpp>],
in.getContentType();
],
[AC_MSG_RESULT([yes])]
in.getContentType();
],
[AC_MSG_RESULT([yes])]
- [AC_DEFINE(
XMLTOOLING_XERCESC_INPUTSTREAM_HAS_CONTENTTYPE
)],
+ [AC_DEFINE(
[XMLTOOLING_XERCESC_INPUTSTREAM_HAS_CONTENTTYPE], [1], [Define to 1 if Xerces InputStream class requires getContentType.]
)],
[AC_MSG_RESULT([no])])
AC_MSG_CHECKING([whether Xerces DOMLS API is compliant])
[AC_MSG_RESULT([no])])
AC_MSG_CHECKING([whether Xerces DOMLS API is compliant])
@@
-196,7
+196,7
@@
AC_TRY_COMPILE([#include <xercesc/dom/DOM.hpp>],
DOMLSSerializer *ls = ((DOMImplementationLS*)impl)->createLSSerializer();
],
[AC_MSG_RESULT([yes])]
DOMLSSerializer *ls = ((DOMImplementationLS*)impl)->createLSSerializer();
],
[AC_MSG_RESULT([yes])]
- [AC_DEFINE(
XMLTOOLING_XERCESC_COMPLIANT_DOMLS
)],
+ [AC_DEFINE(
[XMLTOOLING_XERCESC_COMPLIANT_DOMLS], [1], [Define to 1 if Xerces supports a compliant DOMLS API.]
)],
[AC_MSG_RESULT([no])])
AC_MSG_CHECKING([whether Xerces has setIdAttribute(XMLCh*, bool)])
[AC_MSG_RESULT([no])])
AC_MSG_CHECKING([whether Xerces has setIdAttribute(XMLCh*, bool)])
@@
-206,7
+206,7
@@
AC_TRY_COMPILE([#include <xercesc/dom/DOM.hpp>],
elt->setIdAttribute(NULL, false);
],
[AC_MSG_RESULT([yes])]
elt->setIdAttribute(NULL, false);
],
[AC_MSG_RESULT([yes])]
- [AC_DEFINE(
XMLTOOLING_XERCESC_BOOLSETIDATTRIBUTE
)],
+ [AC_DEFINE(
[XMLTOOLING_XERCESC_BOOLSETIDATTRIBUTE], [1], [Define to 1 if Xerces DOM ID methods take extra parameter.]
)],
[AC_MSG_RESULT([no])])
# XML-Security settings
[AC_MSG_RESULT([no])])
# XML-Security settings
@@
-326,8
+326,7
@@
int i = 0;
AC_SUBST(XMLSEC_LIBS)
else
AC_MSG_WARN([xmlsec disabled, building without signature/encryption support])
AC_SUBST(XMLSEC_LIBS)
else
AC_MSG_WARN([xmlsec disabled, building without signature/encryption support])
- AC_DEFINE(XMLTOOLING_NO_XMLSEC,1,
- [Define if you wish to disable XML-Security-dependent features.])
+ AC_DEFINE([XMLTOOLING_NO_XMLSEC], [1], [Define to 1 if you wish to disable XML-Security-dependent features.])
fi
AM_CONDITIONAL(BUILD_XMLSEC,test x_$with_xmlsec != x_no)
fi
AM_CONDITIONAL(BUILD_XMLSEC,test x_$with_xmlsec != x_no)
@@
-335,13
+334,13
@@
AM_CONDITIONAL(BUILD_XMLSEC,test x_$with_xmlsec != x_no)
AC_TRY_LINK(
[#include <string>],
[std::basic_string<unsigned short> foo; foo=foo+(unsigned short)65],
AC_TRY_LINK(
[#include <string>],
[std::basic_string<unsigned short> foo; foo=foo+(unsigned short)65],
- [AC_DEFINE(
HAVE_GOOD_STL,1
,
- [Define if you have an STL implementation that supports useful string specialization.])],
+ [AC_DEFINE(
[HAVE_GOOD_STL], [1]
,
+ [Define
to 1
if you have an STL implementation that supports useful string specialization.])],
)
AC_TRY_LINK(
[#include <vector>],
[std::iterator_traits<std::vector<int>::iterator>::value_type foo=0],
)
AC_TRY_LINK(
[#include <vector>],
[std::iterator_traits<std::vector<int>::iterator>::value_type foo=0],
- [AC_DEFINE(
HAVE_ITERATOR_TRAITS,1
,
+ [AC_DEFINE(
[HAVE_ITERATOR_TRAITS], [1]
,
[Define to 1 if you have an STL implementation that supports std::iterator_traits.])],
)
[Define to 1 if you have an STL implementation that supports std::iterator_traits.])],
)