diff options
Diffstat (limited to 'source4/lib')
| -rw-r--r-- | source4/lib/cmdline/config.m4 | 7 | ||||
| -rw-r--r-- | source4/lib/ldb/config.mk | 4 | ||||
| -rw-r--r-- | source4/lib/popt/config.m4 | 5 | ||||
| -rw-r--r-- | source4/lib/registry/config.mk | 3 | ||||
| -rw-r--r-- | source4/lib/tdb/config.mk | 3 |
5 files changed, 9 insertions, 13 deletions
diff --git a/source4/lib/cmdline/config.m4 b/source4/lib/cmdline/config.m4 index 8316dff10f..a8b50c786f 100644 --- a/source4/lib/cmdline/config.m4 +++ b/source4/lib/cmdline/config.m4 @@ -72,10 +72,9 @@ AC_CHECK_LIB(readline, rl_completion_matches, TMP_LIBCMDLINE_OBJS="lib/cmdline/readline.o lib/cmdline/popt_common.o" TMP_LIBCMDLINE_LIBS="$TERMLIBS" -#hack... -LIBS="$LIBS $TERMLIBS" +SMB_EXT_LIB(READLINE, [$TERMLIBS]) SMB_SUBSYSTEM(LIBCMDLINE,[], [${TMP_LIBCMDLINE_OBJS}], - [ALLLIBS], - [LIBPOPT]) + [], + [LIBPOPT EXT_LIB_READLINE]) diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index 639652ea55..10b8c76f97 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -3,8 +3,8 @@ [MODULE::libldb_ldap] INIT_OBJ_FILES = \ lib/ldb/ldb_ldap/ldb_ldap.o -REQUIRED_LIBRARIES = \ - LDAP +REQUIRED_SUBSYSTEMS = \ + EXT_LIB_LDAP # End MODULE libldb_tdb ################################################ diff --git a/source4/lib/popt/config.m4 b/source4/lib/popt/config.m4 index 5af1d08d20..ff4455efa2 100644 --- a/source4/lib/popt/config.m4 +++ b/source4/lib/popt/config.m4 @@ -33,9 +33,8 @@ else AC_MSG_RESULT(no) fi -#hack -LIBS="$LIBS ${TMP_LIBPOPT_LIBS}" +SMB_EXT_LIB(POPT, [${TMP_LIBPOPT_LIBS}]) SMB_SUBSYSTEM(LIBPOPT,[], [${TMP_LIBPOPT_OBJS}], - []) + [EXT_LIB_POPT]) diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk index dacd6d5295..bebd8bf1d7 100644 --- a/source4/lib/registry/config.mk +++ b/source4/lib/registry/config.mk @@ -44,8 +44,7 @@ REQUIRED_SUBSYSTEMS = \ INIT_FUNCTION = registry_gconf_init INIT_OBJ_FILES = \ lib/registry/reg_backend_gconf/reg_backend_gconf.o -REQUIRED_LIBRARIES = \ - gconf +REQUIRED_SUBSYSTEMS = EXT_LIB_gconf # End MODULE registry_gconf ################################################ diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk index 6339b91761..1801e30e0a 100644 --- a/source4/lib/tdb/config.mk +++ b/source4/lib/tdb/config.mk @@ -30,8 +30,7 @@ REQUIRED_SUBSYSTEMS = \ OBJ_FILES= \ lib/tdb/tools/tdbtest.o REQUIRED_SUBSYSTEMS = \ - LIBTDB -REQUIRED_LIBRARIES = GDBM + LIBTDB EXT_LIB_GDBM # End BINARY tdbtest ################################################ |