summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-08-23 06:40:10 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:34:24 -0500
commit805c860f6b38bea4db7b39658b80207f55c97338 (patch)
treeb79543fd008cb27913a7343d4f2000086c71db2b /source4
parentba90b652d918fb34f1e43083f8283f669c73c340 (diff)
downloadsamba-805c860f6b38bea4db7b39658b80207f55c97338.tar.gz
samba-805c860f6b38bea4db7b39658b80207f55c97338.tar.bz2
samba-805c860f6b38bea4db7b39658b80207f55c97338.zip
r9506: as the included file only contains a macro and no logic for configure move the
include to aclocal.m4 metze (This used to be commit 1b777217ba2e7ee7bf4932fe5bea18a306207d0f)
Diffstat (limited to 'source4')
-rw-r--r--source4/aclocal.m41
-rw-r--r--source4/configure.in3
2 files changed, 1 insertions, 3 deletions
diff --git a/source4/aclocal.m4 b/source4/aclocal.m4
index 030488ba45..0d4f9b5ce5 100644
--- a/source4/aclocal.m4
+++ b/source4/aclocal.m4
@@ -316,3 +316,4 @@ fi
sinclude(build/m4/public.m4)
sinclude(build/m4/core.m4)
+sinclude(build/m4/ax_cflags_gcc_option.m4)
diff --git a/source4/configure.in b/source4/configure.in
index e78751c05e..752b7ad52f 100644
--- a/source4/configure.in
+++ b/source4/configure.in
@@ -9,9 +9,6 @@ AC_INIT([samba],[],[samba-technical@samba.org])
AC_CONFIG_SRCDIR([include/includes.h])
AC_CONFIG_HEADER(include/config.h)
-# Macros used by configuration rules.
-sinclude(build/m4/ax_cflags_gcc_option.m4)
-
# Configuration rules.
sinclude(build/m4/env.m4)
sinclude(build/m4/rewrite.m4)