diff options
| author | Graham Wilson <graham@mknod.org> | 2004-11-12 18:23:15 +0000 |
|---|---|---|
| committer | Graham Wilson <graham@mknod.org> | 2004-11-12 18:23:15 +0000 |
| commit | b4e7d65a954680b3092db0880bcf90aa4a93dec6 (patch) | |
| tree | 09b3c68ed8a3596939f566265cfc535414affb6e | |
| parent | 7ce762e28c9bad597cb03a25723cdc7004fc96b7 (diff) | |
| download | fetchmail-b4e7d65a954680b3092db0880bcf90aa4a93dec6.tar.gz fetchmail-b4e7d65a954680b3092db0880bcf90aa4a93dec6.tar.bz2 fetchmail-b4e7d65a954680b3092db0880bcf90aa4a93dec6.zip | |
Re-add the m4-local directory, in case we need to add more macros in the future. Put the macros we already have back in that directory. (reverts r3924 and r3923)
svn path=/trunk/; revision=4002
| -rw-r--r-- | COPYING | 4 | ||||
| -rw-r--r-- | Makefile.am | 4 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | m4-local/Makefile.am | 2 | ||||
| -rw-r--r-- | m4-local/ac-archive-license.txt (renamed from ac-archive-license.txt) | 0 | ||||
| -rw-r--r-- | m4-local/ac_ma_search_package.m4 (renamed from ac_ma_search_package.m4) | 0 |
6 files changed, 8 insertions, 5 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 ac_ma_search_package.m4 is copyright by Caolan +The file m4-local/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 ac-archive-license.txt. +The license is detailed in m4-local/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 2dbea302..814e7df3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,11 +1,11 @@ # Makefile for fetchmail -SUBDIRS= intl m4 po +SUBDIRS= intl m4 m4-local po AM_CFLAGS= @CEFLAGS@ AM_CPPFLAGS= @CPFLAGS@ -I$(top_srcdir)/intl -I$(top_builddir)/intl AM_LDFLAGS= @LDEFLAGS@ -ACLOCAL_AMFLAGS= -I m4 -I . +ACLOCAL_AMFLAGS= -I m4 -I m4-local AM_YFLAGS= -d BUILT_SOURCES= rcfile_y.h diff --git a/configure.ac b/configure.ac index 897cdf48..c29d2805 100644 --- a/configure.ac +++ b/configure.ac @@ -735,7 +735,8 @@ if test "$needtrio" = 1 ; then fi dnl ----------------------------------------------------------------' -AC_CONFIG_FILES([Makefile m4/Makefile po/Makefile.in intl/Makefile]) +AC_CONFIG_FILES([Makefile m4/Makefile m4-local/Makefile + po/Makefile.in intl/Makefile]) AC_OUTPUT dnl Local Variables: diff --git a/m4-local/Makefile.am b/m4-local/Makefile.am new file mode 100644 index 00000000..2c4cd385 --- /dev/null +++ b/m4-local/Makefile.am @@ -0,0 +1,2 @@ +EXTRA_DIST=ac_ma_search_package.m4 \ + ac-archive-license.txt diff --git a/ac-archive-license.txt b/m4-local/ac-archive-license.txt index e95b0de3..e95b0de3 100644 --- a/ac-archive-license.txt +++ b/m4-local/ac-archive-license.txt diff --git a/ac_ma_search_package.m4 b/m4-local/ac_ma_search_package.m4 index 197f76c4..197f76c4 100644 --- a/ac_ma_search_package.m4 +++ b/m4-local/ac_ma_search_package.m4 |