diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2010-10-31 02:17:29 +0100 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2010-10-31 02:01:44 +0000 |
commit | 3deece559159150a0710d8160f39583ba7f2e582 (patch) | |
tree | 861600d7060d1ca8764c26f7ecc2cb82a4a44bec /nsswitch | |
parent | 9401189d5435632bcc6a177845ce03beaa804113 (diff) | |
download | samba-3deece559159150a0710d8160f39583ba7f2e582.tar.gz samba-3deece559159150a0710d8160f39583ba7f2e582.tar.bz2 samba-3deece559159150a0710d8160f39583ba7f2e582.zip |
s4: Remove the old perl/m4/make/mk-based build system.
The new waf-based build system now has all the same functionality, and
the old build system has been broken for quite some time.
Autobuild-User: Jelmer Vernooij <jelmer@samba.org>
Autobuild-Date: Sun Oct 31 02:01:44 UTC 2010 on sn-devel-104
Diffstat (limited to 'nsswitch')
-rw-r--r-- | nsswitch/config.m4 | 46 | ||||
-rw-r--r-- | nsswitch/config.mk | 41 | ||||
-rw-r--r-- | nsswitch/libwbclient/config.mk | 10 | ||||
-rw-r--r-- | nsswitch/nsstest.m4 | 8 |
4 files changed, 0 insertions, 105 deletions
diff --git a/nsswitch/config.m4 b/nsswitch/config.m4 deleted file mode 100644 index 8966e35aa9..0000000000 --- a/nsswitch/config.m4 +++ /dev/null @@ -1,46 +0,0 @@ -###### -AC_CHECK_HEADERS(nss.h nss_common.h ns_api.h ) - -case "$host_os" in - *linux*) - if test x"$MERGED_BUILD" != x"1"; then - SMB_BUILD_LIBRARY(nss_winbind, - [../nsswitch/winbind_nss_linux.o], - [LIBWINBIND-CLIENT]) - SMB_MAKE_SETTINGS([nss_winbind_VERSION = 2]) - SMB_MAKE_SETTINGS([nss_winbind_SOVERSION = 2]) - fi - ;; - *) - ;; -esac -##### - -##### -#All the pam requirement tests are regrouped here -#It is mandatory not to remove them otherwise it will break badly the source4/auth part -AC_CHECK_HEADERS(security/pam_appl.h) -AC_CHECK_LIB_EXT(pam, PAM_LIBS, pam_start) -# This part is need for the compilation -AC_CHECK_HEADERS(security/pam_modules.h pam/pam_modules.h,,,[[ - #if HAVE_SECURITY_PAM_APPL_H - #include <security/pam_appl.h> - #endif - #if HAVE_PAM_PAM_APPL_H - #include <pam/pam_appl.h> - #endif -]]) - -SMB_EXT_LIB(PAM, $PAM_LIBS) - -if test x"$ac_cv_header_security_pam_appl_h" = x"yes" -a x"$ac_cv_lib_ext_pam_pam_start" = x"yes";then - SMB_ENABLE(PAM,YES) - if test x"$MERGED_BUILD" != x"1"; then - SMB_BUILD_LIBRARY(pam_winbind,[../nsswitch/pam_winbind.o], - [LIBWBCLIENT LIBWINBIND-CLIENT LIBINIPARSER PAM], - [-DLOCALEDIR=\\\"${datarootdir}/locale\\\"], - [], - [../nsswitch/pam_winbind.\$(SHLIBEXT)]) - fi -fi -##### diff --git a/nsswitch/config.mk b/nsswitch/config.mk deleted file mode 100644 index 8654d96ae5..0000000000 --- a/nsswitch/config.mk +++ /dev/null @@ -1,41 +0,0 @@ -[SUBSYSTEM::LIBWINBIND-CLIENT] - -LIBWINBIND-CLIENT_OBJ_FILES = $(nsswitchsrcdir)/wb_common.o -$(LIBWINBIND-CLIENT_OBJ_FILES): CFLAGS+=-DWINBINDD_SOCKET_DIR=\"$(winbindd_socket_dir)\" -DSOCKET_WRAPPER_DISABLE=1 - -################################# -# Start BINARY nsstest -[BINARY::nsstest] -INSTALLDIR = BINDIR -PRIVATE_DEPENDENCIES = \ - LIBSAMBA-UTIL \ - LIBREPLACE_EXT \ - LIBSAMBA-HOSTCONFIG \ - NSS_WRAPPER -# End BINARY nsstest -################################# - -nsstest_OBJ_FILES = $(nsswitchsrcdir)/nsstest.o - -################################# -# Start BINARY wbinfo -[BINARY::wbinfo] -INSTALLDIR = BINDIR -PRIVATE_DEPENDENCIES = \ - LIBSAMBA-UTIL \ - LIBREPLACE_EXT \ - LIBCLI_AUTH \ - LIBPOPT \ - POPT_SAMBA \ - LIBWINBIND-CLIENT \ - LIBWBCLIENT \ - LIBTEVENT \ - UTIL_TEVENT \ - LIBASYNC_REQ \ - UID_WRAPPER -# End BINARY nsstest -################################# - -wbinfo_OBJ_FILES = \ - $(nsswitchsrcdir)/wbinfo.o -$(wbinfo_OBJ_FILES): CFLAGS+=-DWINBINDD_SOCKET_DIR=\"$(winbindd_socket_dir)\" diff --git a/nsswitch/libwbclient/config.mk b/nsswitch/libwbclient/config.mk deleted file mode 100644 index 2b7b0f4900..0000000000 --- a/nsswitch/libwbclient/config.mk +++ /dev/null @@ -1,10 +0,0 @@ -[SUBSYSTEM::LIBWBCLIENT] -PUBLIC_DEPENDENCIES = LIBTALLOC - -LIBWBCLIENT_OBJ_FILES = $(addprefix $(libwbclientsrcdir)/, wbc_guid.o \ - wbc_idmap.o \ - wbclient.o \ - wbc_pam.o \ - wbc_pwd.o \ - wbc_sid.o \ - wbc_util.o ) diff --git a/nsswitch/nsstest.m4 b/nsswitch/nsstest.m4 deleted file mode 100644 index 37596489c0..0000000000 --- a/nsswitch/nsstest.m4 +++ /dev/null @@ -1,8 +0,0 @@ -case "$host_os" in - *linux*) - SMB_ENABLE(nsstest,YES) - ;; - *) - SMB_ENABLE(nsstest,NO) - ;; -esac |