[PATCH xf86-video-modesetting 1/2] build: Put m4 macros in m4 subdirectory

Thierry Reding thierry.reding at avionic-design.de
Thu Nov 8 05:28:09 PST 2012


This silences a warning from libtoolize when running the autogen.sh
script.

Signed-off-by: Thierry Reding <thierry.reding at avionic-design.de>
---
 Makefile.am  | 2 ++
 autogen.sh   | 1 +
 configure.ac | 1 +
 3 files changed, 4 insertions(+)

diff --git a/Makefile.am b/Makefile.am
index 8e4dfdb..a7ab3e0 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,6 +18,8 @@
 #  IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
 #  CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 
+ACLOCAL_AMFLAGS = -I m4
+
 SUBDIRS = src man
 
 MAINTAINERCLEANFILES = ChangeLog INSTALL
diff --git a/autogen.sh b/autogen.sh
index 904cd67..f83ed27 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -5,6 +5,7 @@ test -z "$srcdir" && srcdir=.
 
 ORIGDIR=`pwd`
 cd $srcdir
+test -d m4 || mkdir m4
 
 autoreconf -v --install || exit 1
 cd $ORIGDIR || exit $?
diff --git a/configure.ac b/configure.ac
index b6815c4..58b1666 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,6 +28,7 @@ AC_INIT([xf86-video-modesetting],
         [xf86-video-modesetting])
 AC_CONFIG_SRCDIR([Makefile.am])
 AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR(.)
 AC_SYS_LARGEFILE
 
-- 
1.8.0



More information about the xorg-devel mailing list