summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPavel Roskin <plroskin@gmail.com>2016-01-29 22:52:06 -0800
committerPavel Roskin <plroskin@gmail.com>2016-01-29 23:41:40 -0800
commit2694fa9dacbb6afac5fd7e2a094ffff0c0ed3279 (patch)
treec9ac02d30afff8fcdc46dfff1b83631a57208886
parenta452d8d36aafda4a873f8c035a3fe3fd51fabd96 (diff)
downloadxrdp-proprietary-2694fa9dacbb6afac5fd7e2a094ffff0c0ed3279.tar.gz
xrdp-proprietary-2694fa9dacbb6afac5fd7e2a094ffff0c0ed3279.zip
Create the m4 directory for Autoconf macro files
Keeping separate files is more maintainable than merging them into a single aclocal.m4 file. It is easier for users to understand where those files come from. Automake knows how to distribute files in the m4 directory.
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac1
-rw-r--r--m4/.gitignore1
3 files changed, 4 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am
index e8905c98..aa32a502 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,3 +1,5 @@
+ACLOCAL_AMFLAGS = -I m4
+
EXTRA_DIST = bootstrap COPYING design.txt faq-compile.txt faq-general.txt file-loc.txt install.txt prog_std.txt readme.txt
if XRDP_NEUTRINORDP
diff --git a/configure.ac b/configure.ac
index 12c298e0..79e38d0d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,6 +4,7 @@ AC_PREREQ(2.59)
AC_INIT([xrdp], [0.9.0], [xrdp-devel@googlegroups.com])
AC_CONFIG_HEADERS(config_ac.h:config_ac-h.in)
AM_INIT_AUTOMAKE([1.6 foreign])
+AC_CONFIG_MACRO_DIRS([m4])
AC_PROG_CC
AC_C_CONST
AC_PROG_LIBTOOL
diff --git a/m4/.gitignore b/m4/.gitignore
new file mode 100644
index 00000000..0f4126cd
--- /dev/null
+++ b/m4/.gitignore
@@ -0,0 +1 @@
+*.m4