Skip to content

Commit 1a69708

Browse files
committed
Update to Automake 1.14.1 and change "gnu" project to "foreign" so that README
can be README.md.
1 parent b9992b2 commit 1a69708

File tree

5 files changed

+16
-17
lines changed

5 files changed

+16
-17
lines changed

Makefile.in

+7-8
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.14 from Makefile.am.
1+
# Makefile.in generated by automake 1.14.1 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -103,9 +103,8 @@ DIST_COMMON = $(srcdir)/src/Makefile.am \
103103
$(srcdir)/qt5debugappender/Makefile.am \
104104
$(srcdir)/swig/Makefile.common.am \
105105
$(srcdir)/swig/python/Makefile.am $(srcdir)/tests/Makefile.am \
106-
INSTALL NEWS README AUTHORS ChangeLog $(srcdir)/Makefile.in \
107-
$(srcdir)/Makefile.am $(top_srcdir)/configure \
108-
$(am__configure_deps) \
106+
$(srcdir)/Makefile.in $(srcdir)/Makefile.am \
107+
$(top_srcdir)/configure $(am__configure_deps) \
109108
$(top_srcdir)/include/log4cplus/config.h.in \
110109
$(top_srcdir)/include/log4cplus/config/defines.hxx.in \
111110
mkinstalldirs $(top_srcdir)/tests/atlocal.in \
@@ -848,15 +847,15 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/sr
848847
@for dep in $?; do \
849848
case '$(am__configure_deps)' in \
850849
*$$dep*) \
851-
echo ' cd $(srcdir) && $(AUTOMAKE) --gnu'; \
852-
$(am__cd) $(srcdir) && $(AUTOMAKE) --gnu \
850+
echo ' cd $(srcdir) && $(AUTOMAKE) --foreign'; \
851+
$(am__cd) $(srcdir) && $(AUTOMAKE) --foreign \
853852
&& exit 0; \
854853
exit 1;; \
855854
esac; \
856855
done; \
857-
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu Makefile'; \
856+
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign Makefile'; \
858857
$(am__cd) $(top_srcdir) && \
859-
$(AUTOMAKE) --gnu Makefile
858+
$(AUTOMAKE) --foreign Makefile
860859
.PRECIOUS: Makefile
861860
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
862861
@case '$?' in \

aclocal.m4

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# generated automatically by aclocal 1.14 -*- Autoconf -*-
1+
# generated automatically by aclocal 1.14.1 -*- Autoconf -*-
22

33
# Copyright (C) 1996-2013 Free Software Foundation, Inc.
44

@@ -35,7 +35,7 @@ AC_DEFUN([AM_AUTOMAKE_VERSION],
3535
[am__api_version='1.14'
3636
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
3737
dnl require some minimum version. Point them to the right macro.
38-
m4_if([$1], [1.14], [],
38+
m4_if([$1], [1.14.1], [],
3939
[AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
4040
])
4141

@@ -51,7 +51,7 @@ m4_define([_AM_AUTOCONF_VERSION], [])
5151
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
5252
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
5353
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
54-
[AM_AUTOMAKE_VERSION([1.14])dnl
54+
[AM_AUTOMAKE_VERSION([1.14.1])dnl
5555
m4_ifndef([AC_AUTOCONF_VERSION],
5656
[m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
5757
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])

configure.ac

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
dnl Process this file with autoconf to produce a configure script.
22
dnl This version of log4cplus requires the follwing autotools versions:
33
dnl autoconf-2.69
4-
dnl automake-1.14
4+
dnl automake-1.14.1
55
dnl libtool-2.4.2
66

77
AC_INIT([log4cplus],[1.2.0])
88
AC_CANONICAL_TARGET
99
AC_CONFIG_SRCDIR([src/logger.cxx])
1010
AC_CONFIG_MACRO_DIR([m4])
11-
AM_INIT_AUTOMAKE([1.14 no-define no-dist nostdinc gnu subdir-objects -Wall])
11+
AM_INIT_AUTOMAKE([1.14 no-define no-dist nostdinc foreign subdir-objects -Wall])
1212
AC_CONFIG_TESTDIR([tests])
1313
AM_MAINTAINER_MODE([enable])
1414
AM_PROG_AR

include/Makefile.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Makefile.in generated by automake 1.14 from Makefile.am.
1+
# Makefile.in generated by automake 1.14.1 from Makefile.am.
22
# @configure_input@
33

44
# Copyright (C) 1994-2013 Free Software Foundation, Inc.
@@ -426,9 +426,9 @@ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__confi
426426
exit 1;; \
427427
esac; \
428428
done; \
429-
echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu include/Makefile'; \
429+
echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign include/Makefile'; \
430430
$(am__cd) $(top_srcdir) && \
431-
$(AUTOMAKE) --gnu include/Makefile
431+
$(AUTOMAKE) --foreign include/Makefile
432432
.PRECIOUS: Makefile
433433
Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
434434
@case '$?' in \

scripts/doautoreconf.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/bin/sh
22

3-
export AUTOMAKE_SUFFIX=-1.14.0
3+
export AUTOMAKE_SUFFIX=-1.14.1
44
export AUTOCONF_SUFFIX=-2.69
55
export LIBTOOL_SUFFIX=-2.4.2
66

0 commit comments

Comments
 (0)