From 3deece559159150a0710d8160f39583ba7f2e582 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 31 Oct 2010 02:17:29 +0100 Subject: 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 Autobuild-Date: Sun Oct 31 02:01:44 UTC 2010 on sn-devel-104 --- source4/torture/libnetapi/config.m4 | 37 ------------------------------------- source4/torture/libnetapi/config.mk | 18 ------------------ 2 files changed, 55 deletions(-) delete mode 100644 source4/torture/libnetapi/config.m4 delete mode 100644 source4/torture/libnetapi/config.mk (limited to 'source4/torture/libnetapi') diff --git a/source4/torture/libnetapi/config.m4 b/source4/torture/libnetapi/config.m4 deleted file mode 100644 index 402f1123a5..0000000000 --- a/source4/torture/libnetapi/config.m4 +++ /dev/null @@ -1,37 +0,0 @@ -############################### -# start SMB_EXT_LIB_NETAPI -# check for netapi.h and -lnetapi - -use_netapi=auto -AC_ARG_ENABLE(netapi, -AS_HELP_STRING([--enable-netapi],[Turn on netapi support (default=auto)]), - [if test x$enable_netapi = xno; then - use_netapi=no - fi]) - - -#if test x$use_netapi = xauto && pkg-config --exists netapi; then -# SMB_EXT_LIB_FROM_PKGCONFIG(NETAPI, netapi < 0.1, -# [use_netapi=yes], -# [use_netapi=no]) -#fi - -SMB_ENABLE(TORTURE_LIBNETAPI,NO) -if test x$use_netapi != xno; then - AC_CHECK_HEADERS(netapi.h) - AC_CHECK_LIB_EXT(netapi, NETAPI_LIBS, libnetapi_init) - AC_CHECK_LIB_EXT(netapi, NETAPI_LIBS, NetUserModalsGet) - AC_CHECK_LIB_EXT(netapi, NETAPI_LIBS, NetUserGetGroups) - AC_CHECK_LIB_EXT(netapi, NETAPI_LIBS, NetUserGetInfo) - AC_CHECK_LIB_EXT(netapi, NETAPI_LIBS, NetUserSetInfo) - if test x"$ac_cv_header_netapi_h" = x"yes" -a x"$ac_cv_lib_ext_netapi_libnetapi_init" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserModalsGet" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserGetGroups" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserGetInfo" = x"yes" -a x"$ac_cv_lib_ext_netapi_NetUserSetInfo" = x"yes";then - AC_DEFINE(ENABLE_LIBNETAPI,1,[Whether we have libnetapi on the host system]) - SMB_ENABLE(NETAPI,YES) - SMB_ENABLE(TORTURE_LIBNETAPI,YES) - else - if test x$use_netapi != xauto; then - AC_MSG_ERROR([--enable-netapi: libnetapi not found]) - fi - fi - SMB_EXT_LIB(NETAPI, $NETAPI_LIBS) -fi diff --git a/source4/torture/libnetapi/config.mk b/source4/torture/libnetapi/config.mk deleted file mode 100644 index 0cd485e44a..0000000000 --- a/source4/torture/libnetapi/config.mk +++ /dev/null @@ -1,18 +0,0 @@ -################################# -# Start SUBSYSTEM TORTURE_LIBNETAPI -[MODULE::TORTURE_LIBNETAPI] -SUBSYSTEM = smbtorture -OUTPUT_TYPE = MERGED_OBJ -INIT_FUNCTION = torture_libnetapi_init -PRIVATE_DEPENDENCIES = \ - POPT_CREDENTIALS \ - NETAPI -# End SUBSYSTEM TORTURE_LIBNETAPI -################################# - -TORTURE_LIBNETAPI_OBJ_FILES = $(addprefix $(torturesrcdir)/libnetapi/, libnetapi.o \ - libnetapi_user.o \ - libnetapi_group.o - libnetapi_server.o) - -$(eval $(call proto_header_template,$(torturesrcdir)/libnetapi/proto.h,$(TORTURE_LIBNETAPI_OBJ_FILES:.o=.c))) -- cgit