diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-06-10 15:05:41 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-06-10 15:05:41 +0200 |
| commit | 01fc095d6e2fa1b883b3f429085b4aca4254f105 (patch) | |
| tree | 51ca606a357c9c626dbd8067ec89fa9263445e1f /source4/configure.ac | |
| parent | ffbea676771bae16be547529eb1136c61d78203f (diff) | |
| parent | 7206c5fc4a0fc9d310fef199c6ff9d0300bc956b (diff) | |
| download | samba-01fc095d6e2fa1b883b3f429085b4aca4254f105.tar.gz samba-01fc095d6e2fa1b883b3f429085b4aca4254f105.tar.bz2 samba-01fc095d6e2fa1b883b3f429085b4aca4254f105.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir
(This used to be commit 74e1dd28f2f669bc196dc16b68c8b175bf835721)
Diffstat (limited to 'source4/configure.ac')
| -rw-r--r-- | source4/configure.ac | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/source4/configure.ac b/source4/configure.ac index 693d4d7fbd..ca38f6add4 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -1,8 +1,7 @@ dnl -*- mode: m4-mode -*- dnl Process this file with autoconf to produce a configure script. -dnl disabled 2.53 requirement - we do work with 2.52 on suse 7.3 for example -dnl AC_PREREQ(2.53) +AC_PREREQ(2.54) AC_INIT([samba],[4],[samba-technical@samba.org]) @@ -14,7 +13,7 @@ AC_DEFINE(CONFIG_H_IS_FROM_SAMBA,1,[Marker for samba's config.h]) m4_include(build/m4/env.m4) m4_include(lib/replace/samba.m4) m4_include(lib/smbreadline/readline.m4) -m4_include(heimdal_build/config.m4) +m4_include(heimdal_build/internal.m4) m4_include(lib/util/fault.m4) m4_include(lib/util/signal.m4) m4_include(lib/util/util.m4) |