summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Coopersmith <alan.coopersmith@sun.com>2010-03-15 23:34:04 -0700
committerAlan Coopersmith <alan.coopersmith@sun.com>2010-03-15 23:34:21 -0700
commitc9cdd56df50f280e90ba95cfa933222f94ad2677 (patch)
treed8698c19f3f4bf3a928b65682c009b2b427f74f7
parentb9226288b96f0c5988d2c2f52718674d39803a5e (diff)
Move m4 macros to m4 subdir as automake/libtool recommend
Signed-off-by: Alan Coopersmith <alan.coopersmith@sun.com>
-rw-r--r--.gitignore5
-rw-r--r--Makefile.am1
-rw-r--r--configure.ac1
-rw-r--r--m4/ac_define_dir.m4 (renamed from acinclude.m4)0
4 files changed, 7 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index a99636d..0f38e26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -80,3 +80,8 @@ chooser
xdm
xdmshell
+m4/libtool.m4
+m4/lt~obsolete.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
diff --git a/Makefile.am b/Makefile.am
index 7c1df5e..b2ddf68 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -196,3 +196,4 @@ ChangeLog:
dist-hook: ChangeLog INSTALL
+ACLOCAL_AMFLAGS = -I m4
diff --git a/configure.ac b/configure.ac
index b2f0922..6d3c77a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,6 +25,7 @@ AC_PREREQ([2.60])
AC_INIT(xdm,[1.1.9],[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],xdm)
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+AC_CONFIG_MACRO_DIR([m4])
# Require xorg-macros: XORG_DEFAULT_OPTIONS
m4_ifndef([XORG_MACROS_VERSION],
diff --git a/acinclude.m4 b/m4/ac_define_dir.m4
index 44971b9..44971b9 100644
--- a/acinclude.m4
+++ b/m4/ac_define_dir.m4