From 3d04bc45f617f2f079d9572b6c9663e52424de29 Mon Sep 17 00:00:00 2001
From: Glenn Strauss <gstrauss@gluelogic.com>
Date: Sun, 30 Oct 2016 16:47:53 -0400
Subject: [PATCH] [build] move some build scripts to scripts/

---
 CMakeLists.txt                                                | 2 +-
 Makefile.am                                                   | 4 ++--
 configure.ac                                                  | 1 -
 {cmake => scripts/cmake}/FindLibEV.cmake                      | 0
 {cmake => scripts/cmake}/LighttpdMacros.cmake                 | 0
 ax_prog_cc_for_build.m4 => scripts/m4/ax_prog_cc_for_build.m4 | 0
 6 files changed, 3 insertions(+), 4 deletions(-)
 rename {cmake => scripts/cmake}/FindLibEV.cmake (100%)
 rename {cmake => scripts/cmake}/LighttpdMacros.cmake (100%)
 rename ax_prog_cc_for_build.m4 => scripts/m4/ax_prog_cc_for_build.m4 (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index c1ff0c1e..ec307b02 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -2,7 +2,7 @@ project(lighttpd C)
 
 cmake_minimum_required(VERSION 2.8.2 FATAL_ERROR)
 
-set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+set(CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/scripts/cmake)
 
 include(CTest)
 
diff --git a/Makefile.am b/Makefile.am
index 5453c847..481b808d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,8 +1,8 @@
 SUBDIRS=src doc tests
 
-EXTRA_DIST=autogen.sh SConstruct CMakeLists.txt cmake README.FreeBSD
+EXTRA_DIST=autogen.sh SConstruct CMakeLists.txt README.FreeBSD scripts
 
-ACLOCAL_AMFLAGS = -I m4
+ACLOCAL_AMFLAGS = -I m4 -I scripts/m4
 
 distcleancheck_listfiles = find -type f -exec sh -c 'test -f $(srcdir)/{} || echo {}' ';'
 
diff --git a/configure.ac b/configure.ac
index c3758bc6..cb10b245 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,7 +5,6 @@ AC_INIT([lighttpd], [1.4.43], [contact@lighttpd.net])
 AC_CONFIG_SRCDIR([src/server.c])
 AC_CONFIG_HEADER([config.h])
 AC_CONFIG_MACRO_DIR([m4])
-m4_include(ax_prog_cc_for_build.m4)
 
 AC_CANONICAL_HOST
 
diff --git a/cmake/FindLibEV.cmake b/scripts/cmake/FindLibEV.cmake
similarity index 100%
rename from cmake/FindLibEV.cmake
rename to scripts/cmake/FindLibEV.cmake
diff --git a/cmake/LighttpdMacros.cmake b/scripts/cmake/LighttpdMacros.cmake
similarity index 100%
rename from cmake/LighttpdMacros.cmake
rename to scripts/cmake/LighttpdMacros.cmake
diff --git a/ax_prog_cc_for_build.m4 b/scripts/m4/ax_prog_cc_for_build.m4
similarity index 100%
rename from ax_prog_cc_for_build.m4
rename to scripts/m4/ax_prog_cc_for_build.m4
-- 
2.11.4.GIT