diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2006-04-27 16:05:05 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:05:03 -0500 |
| commit | 8d137d97858a618c8c5451bb7b11fb95990540c8 (patch) | |
| tree | 19cb5130f64c02dba17cc53950233fc1c0e02974 /source4/lib/replace | |
| parent | 8ee028df8839323b4d7c9e8dbea21e9169629cf3 (diff) | |
| download | samba-8d137d97858a618c8c5451bb7b11fb95990540c8.tar.gz samba-8d137d97858a618c8c5451bb7b11fb95990540c8.tar.bz2 samba-8d137d97858a618c8c5451bb7b11fb95990540c8.zip | |
r15295: Fix some dependencies
Move unistr-specific code to lib/charset/. Remove _m from some places where it's not needed.
(This used to be commit 03224e112424968fc3f547c6159c7ccae2d1aa5b)
Diffstat (limited to 'source4/lib/replace')
| -rw-r--r-- | source4/lib/replace/config.mk | 4 | ||||
| -rw-r--r-- | source4/lib/replace/readline.m4 | 8 |
2 files changed, 4 insertions, 8 deletions
diff --git a/source4/lib/replace/config.mk b/source4/lib/replace/config.mk index bc1301984a..4fd5402f61 100644 --- a/source4/lib/replace/config.mk +++ b/source4/lib/replace/config.mk @@ -16,7 +16,3 @@ OBJ_FILES = replace.o \ PUBLIC_DEPENDENCIES = REPLACE_READDIR # End SUBSYSTEM LIBREPLACE ############################## - -[SUBSYSTEM::SMBREADLINE] -OBJ_FILES = readline.o -PRIVATE_PROTO_HEADER = readline.h diff --git a/source4/lib/replace/readline.m4 b/source4/lib/replace/readline.m4 index b71ced7eb7..34b538f10a 100644 --- a/source4/lib/replace/readline.m4 +++ b/source4/lib/replace/readline.m4 @@ -72,10 +72,10 @@ AC_MSG_CHECKING(whether to use extern readline) if test x"$EXTERNAL_READLINE" = x"yes"; then AC_MSG_RESULT(yes) AC_DEFINE(HAVE_LIBREADLINE,1,[Whether the system has readline]) - SMB_SUBSYSTEM(LIBREADLINE, [], [SMBREADLINE EXT_READLINE]) - SMB_EXT_LIB(EXT_READLINE, [${TERMLIBS}]) - SMB_ENABLE(EXT_READLINE,YES) + SMB_SUBSYSTEM(SMBREADLINE, [lib/replace/readline.o], [READLINE]) + SMB_EXT_LIB(READLINE, [${TERMLIBS}]) + SMB_ENABLE(READLINE,YES) else - SMB_SUBSYSTEM(LIBREADLINE, [], [SMBREADLINE]) + SMB_SUBSYSTEM(SMBREADLINE, [lib/replace/readline.o], []) AC_MSG_RESULT(no) fi |