diff options
| -rw-r--r-- | COPYING | 4 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | ac-archive-license.txt (renamed from m4-local/ac-archive-license.txt) | 0 | ||||
| -rw-r--r-- | ac_ma_search_package.m4 (renamed from m4-local/ac_ma_search_package.m4) | 0 | ||||
| -rw-r--r-- | configure.in | 3 | ||||
| -rw-r--r-- | m4-local/Makefile.am | 2 |
6 files changed, 5 insertions, 8 deletions
@@ -14,11 +14,11 @@ by its author, Craig Metz: ipv6_connect.c. The following files are explicitly GPL-licensed: getopt1.c, getopt.c, getopt.h. -The file m4-local/ac_ma_search_package.m4 is copyright by Caolan +The file ac_ma_search_package.m4 is copyright by Caolan McNamara <caolan@skynet.ie> with fixes from Alexandre Duret-Lutz <duret_g@lrde.epita.fr>, Matthew Mueller <donut@azstarnet.com> and Matthias Andree <matthias.andree@gmx.de> -The license is detailed in m4-local/ac-archive-license.txt. +The license is detailed in ac-archive-license.txt. All other code in the distribution incorporates the copy of GPL version 2 below by reference. diff --git a/Makefile.am b/Makefile.am index ddea7800..d6da0430 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,11 @@ # Makefile for fetchmail -SUBDIRS= intl m4 m4-local po +SUBDIRS= intl m4 po AM_CFLAGS= @CEFLAGS@ AM_CPPFLAGS= @CPFLAGS@ -I$(top_srcdir)/intl -I$(top_builddir)/intl AM_LDFLAGS= @LDEFLAGS@ -ACLOCAL_AMFLAGS= -I m4 -I m4-local +ACLOCAL_AMFLAGS= -I m4 -I . AM_YFLAGS= -d BUILT_SOURCES= rcfile_y.h diff --git a/m4-local/ac-archive-license.txt b/ac-archive-license.txt index e95b0de3..e95b0de3 100644 --- a/m4-local/ac-archive-license.txt +++ b/ac-archive-license.txt diff --git a/m4-local/ac_ma_search_package.m4 b/ac_ma_search_package.m4 index 197f76c4..197f76c4 100644 --- a/m4-local/ac_ma_search_package.m4 +++ b/ac_ma_search_package.m4 diff --git a/configure.in b/configure.in index 58ca6aaa..730dad70 100644 --- a/configure.in +++ b/configure.in @@ -682,8 +682,7 @@ AC_SUBST(CPFLAGS) AC_SUBST(CEFLAGS) AC_SUBST(LDEFLAGS) -AC_CONFIG_FILES([Makefile m4/Makefile m4-local/Makefile - po/Makefile.in intl/Makefile]) +AC_CONFIG_FILES([Makefile m4/Makefile po/Makefile.in intl/Makefile]) AC_OUTPUT dnl Local Variables: diff --git a/m4-local/Makefile.am b/m4-local/Makefile.am deleted file mode 100644 index 2c4cd385..00000000 --- a/m4-local/Makefile.am +++ /dev/null @@ -1,2 +0,0 @@ -EXTRA_DIST=ac_ma_search_package.m4 \ - ac-archive-license.txt |