summaryrefslogtreecommitdiff
path: root/source4/utils
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-09-06 01:36:02 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:17:35 -0500
commita59706f721c70e9a4f78eb2296bb746b912ce9d0 (patch)
tree6a0744113bec965cfec156f6c68cb905ee1ebe5c /source4/utils
parenta83286d91cd3ff61b276955b1e0998f9e8ebc527 (diff)
downloadsamba-a59706f721c70e9a4f78eb2296bb746b912ce9d0.tar.gz
samba-a59706f721c70e9a4f78eb2296bb746b912ce9d0.tar.bz2
samba-a59706f721c70e9a4f78eb2296bb746b912ce9d0.zip
r18121: Simplify m4 code, hopefully fix Samba4 build problems.
(This used to be commit 1adf65b4d7c5d2d4f65d4b28575bdf2368a42139)
Diffstat (limited to 'source4/utils')
-rw-r--r--source4/utils/config.mk8
-rw-r--r--source4/utils/net/config.mk2
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/utils/config.mk b/source4/utils/config.mk
index 442a7466e4..69d5a3b77f 100644
--- a/source4/utils/config.mk
+++ b/source4/utils/config.mk
@@ -9,7 +9,7 @@ OBJ_FILES = \
PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
- POPT_EXT \
+ LIBPOPT \
POPT_SAMBA \
NDR_TABLE
MANPAGE = man/ndrdump.1
@@ -26,7 +26,7 @@ OBJ_FILES = \
PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
- POPT_EXT \
+ LIBPOPT \
POPT_SAMBA \
POPT_CREDENTIALS \
gensec \
@@ -83,7 +83,7 @@ PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
LIBCLI_NBT \
- POPT_EXT \
+ LIBPOPT \
POPT_SAMBA \
LIBNETIF \
LIBCLI_RESOLVE
@@ -99,7 +99,7 @@ OBJ_FILES = \
PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
- POPT_EXT \
+ LIBPOPT \
samba-socket \
POPT_SAMBA \
LIBCLI_RESOLVE \
diff --git a/source4/utils/net/config.mk b/source4/utils/net/config.mk
index 6985f1475c..c07d6a67cb 100644
--- a/source4/utils/net/config.mk
+++ b/source4/utils/net/config.mk
@@ -16,7 +16,7 @@ PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG \
LIBSAMBA-UTIL \
LIBSAMBA-NET \
- POPT_EXT \
+ LIBPOPT \
POPT_SAMBA \
POPT_CREDENTIALS
# End BINARY net