Author: rhys
Date: Thu Jan 30 13:26:04 2014
New Revision: 1562810
URL: http://svn.apache.org/r1562810
Log:
LOG4CXX-423: Repair autogen script warnings
Minor changes to Autoconf/Automake artifacts so that
libtoolize: (GNU libtool) 2.4.2
automake: automake (GNU automake) 1.12.5
autoconf: autoconf (GNU Autoconf) 2.69
give a clean bill of health when running ./autogen.sh.
Added:
incubator/log4cxx/trunk/configure.ac
- copied, changed from r1562805, incubator/log4cxx/trunk/configure.in
Removed:
incubator/log4cxx/trunk/configure.in
Modified:
incubator/log4cxx/trunk/src/changes/changes.xml
incubator/log4cxx/trunk/src/examples/cpp/Makefile.am
incubator/log4cxx/trunk/src/main/cpp/Makefile.am
incubator/log4cxx/trunk/src/test/cpp/Makefile.am
Copied: incubator/log4cxx/trunk/configure.ac (from r1562805,
incubator/log4cxx/trunk/configure.in)
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/configure.ac?p2=incubator/log4cxx/trunk/configure.ac&p1=incubator/log4cxx/trunk/configure.in&r1=1562805&r2=1562810&rev=1562810&view=diff
==============================================================================
--- incubator/log4cxx/trunk/configure.in (original)
+++ incubator/log4cxx/trunk/configure.ac Thu Jan 30 13:26:04 2014
@@ -1,5 +1,3 @@
-AC_INIT(src/main/cpp/logger.cpp)
-
# Licensed to the Apache Software Foundation (ASF) under one or more
# contributor license agreements. See the NOTICE file distributed with
# this work for additional information regarding copyright ownership.
@@ -14,7 +12,10 @@ AC_INIT(src/main/cpp/logger.cpp)
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
-#
+
+AC_INIT([log4cxx], [0.10.1])
+AC_CONFIG_SRCDIR(src/main/cpp/logger.cpp)
+
# autoconf 2.50 or higher to rebuild aclocal.m4, because the
# AC_CREATE_PREFIX_CONFIG_H macro needs the AS_DIRNAME macro.
AC_PREREQ(2.50)
@@ -37,7 +38,8 @@ AH_VERBATIM([HAVE_NO_EXPLICIT_EXPORTS],
[/* no explicit exports */
#define LOG4CXX_EXPORT])
-AM_INIT_AUTOMAKE(log4cxx, 0.10.1)
+AM_INIT_AUTOMAKE
+
# Checks for programs
# ----------------------------------------------------------------------------
@@ -180,9 +182,9 @@ else
fi
AC_MSG_CHECKING([for wchar_t])
-AC_COMPILE_IFELSE(AC_LANG_SOURCE([[
+AC_COMPILE_IFELSE([AC_LANG_SOURCE([
#include <string>
- std::wstring w;]]), [have_wchar_t=yes], [have_wchar_t=no])
+ std::wstring w;])], [have_wchar_t=yes], [have_wchar_t=no])
AC_MSG_RESULT($have_wchar_t)
if test "$have_wchar_t" = "yes"
then
@@ -333,9 +335,9 @@ AC_ARG_ENABLE(cfstring,
if test "x$enable_cfstring" = xyes; then
AC_MSG_CHECKING([for cfstring])
CPPFLAGS="$CPPFLAGS -framework CoreFoundation"
- AC_COMPILE_IFELSE(AC_LANG_SOURCE([[
+ AC_COMPILE_IFELSE([AC_LANG_SOURCE([
#include <CoreFoundation/CFString.h>
- CFStringRef x = CFSTR("Hello");]]),
[have_cfstring_api=yes], [have_cfstring_api=no])
+ CFStringRef x = CFSTR("Hello");])],
[have_cfstring_api=yes], [have_cfstring_api=no])
AC_MSG_RESULT($have_cfstring_api)
else
have_cfstring_api=no
Modified: incubator/log4cxx/trunk/src/changes/changes.xml
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/changes/changes.xml?rev=1562810&r1=1562809&r2=1562810&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/changes/changes.xml (original)
+++ incubator/log4cxx/trunk/src/changes/changes.xml Thu Jan 30 13:26:04 2014
@@ -24,6 +24,7 @@
<body>
<release version="0.11.0" date="2010-XX-XX"
description="Maintenance release">
+ <action issue="LOGCXX-423" type="fix">Repair autogen
script warnings</action>
<action issue="LOGCXX-249" type="fix">Console appender
crashes if layout is not set</action>
<action issue="LOGCXX-262"
type="fix">socketappendertestcase and xmlsocketappendertestcase not run</action>
<action issue="LOGCXX-263" type="fix">Bad link to
log4cxx-dev archive</action>
Modified: incubator/log4cxx/trunk/src/examples/cpp/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/examples/cpp/Makefile.am?rev=1562810&r1=1562809&r2=1562810&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/examples/cpp/Makefile.am (original)
+++ incubator/log4cxx/trunk/src/examples/cpp/Makefile.am Thu Jan 30 13:26:04
2014
@@ -15,7 +15,7 @@
#
check_PROGRAMS = trivial delayedloop stream console
-INCLUDES = -I$(top_srcdir)/src/main/include -I$(top_builddir)/src/main/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/main/include
-I$(top_builddir)/src/main/include
trivial_SOURCES = trivial.cpp
trivial_LDADD = $(top_builddir)/src/main/cpp/liblog4cxx.la
Modified: incubator/log4cxx/trunk/src/main/cpp/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/main/cpp/Makefile.am?rev=1562810&r1=1562809&r2=1562810&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/main/cpp/Makefile.am (original)
+++ incubator/log4cxx/trunk/src/main/cpp/Makefile.am Thu Jan 30 13:26:04 2014
@@ -15,7 +15,7 @@
#
lib_LTLIBRARIES = liblog4cxx.la
-INCLUDES = -I$(top_srcdir)/src/main/include -I$(top_builddir)/src/main/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/main/include
-I$(top_builddir)/src/main/include
liblog4cxx_la_SOURCES = \
@@ -170,6 +170,6 @@ liblog4cxx_la_SOURCES = \
xmlsocketappender.cpp \
zipcompressaction.cpp
-AM_CPPFLAGS = @CPPFLAGS_ODBC@
+AM_CPPFLAGS += @CPPFLAGS_ODBC@
liblog4cxx_la_LDFLAGS = -version-info @LT_VERSION@ @LIBS_ODBC@ -@APR_LIBS@
Modified: incubator/log4cxx/trunk/src/test/cpp/Makefile.am
URL:
http://svn.apache.org/viewvc/incubator/log4cxx/trunk/src/test/cpp/Makefile.am?rev=1562810&r1=1562809&r2=1562810&view=diff
==============================================================================
--- incubator/log4cxx/trunk/src/test/cpp/Makefile.am (original)
+++ incubator/log4cxx/trunk/src/test/cpp/Makefile.am Thu Jan 30 13:26:04 2014
@@ -22,7 +22,7 @@ noinst_HEADERS = \
$(top_srcdir)/src/test/cpp/xml/*.h \
$(top_srcdir)/src/test/cpp/*.h
-INCLUDES = -I$(top_srcdir)/src/main/include -I$(top_builddir)/src/main/include
+AM_CPPFLAGS = -I$(top_srcdir)/src/main/include
-I$(top_builddir)/src/main/include
check_PROGRAMS = testsuite
