diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 17:20:54 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 17:20:54 +0200 |
| commit | 9ef623beda5d6a7507ff6c871117c8f88e547441 (patch) | |
| tree | dff1dc9cb6de1389a9aa18af51349e1fbef90b83 /source4/configure.ac | |
| parent | a347ab83f447d7921d5d427e56f6965342b25834 (diff) | |
| parent | c8bff39df639c70afc94b1795c94629ee8b7b482 (diff) | |
| download | samba-9ef623beda5d6a7507ff6c871117c8f88e547441.tar.gz samba-9ef623beda5d6a7507ff6c871117c8f88e547441.tar.xz samba-9ef623beda5d6a7507ff6c871117c8f88e547441.zip | |
Merge branch 'singlepopt' into single
Conflicts:
source4/Makefile
Diffstat (limited to 'source4/configure.ac')
| -rw-r--r-- | source4/configure.ac | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/configure.ac b/source4/configure.ac index c91589b7d2..357121a43b 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -21,7 +21,7 @@ m4_include(lib/util/fsusage.m4) m4_include(lib/util/xattr.m4) m4_include(lib/util/capability.m4) m4_include(lib/util/time.m4) -m4_include(lib/popt/samba.m4) +m4_include(../popt/samba.m4) m4_include(lib/charset/config.m4) m4_include(lib/socket/config.m4) m4_include(lib/zlib.m4) |