diff options
| author | Nalin Dahyabhai <nalin@redhat.com> | 2012-01-10 12:59:32 -0500 |
|---|---|---|
| committer | Nalin Dahyabhai <nalin@redhat.com> | 2012-01-10 12:59:32 -0500 |
| commit | 8ab9c6d9abb7632ea959a9bb8a207a42474de2e0 (patch) | |
| tree | 5b68a796ba969b90b8a56a758a08ed26d79aedb3 | |
| parent | f1454876c60e44586a0a335cbb4178a11eedf82a (diff) | |
| download | slapi-nis-8ab9c6d9abb7632ea959a9bb8a207a42474de2e0.tar.gz slapi-nis-8ab9c6d9abb7632ea959a9bb8a207a42474de2e0.tar.xz slapi-nis-8ab9c6d9abb7632ea959a9bb8a207a42474de2e0.zip | |
- make refint and memberof tests the default
- add an option to add -Wl,-z,nodelete to the link flags
| -rw-r--r-- | configure.ac | 33 | ||||
| -rw-r--r-- | src/Makefile.am | 5 |
2 files changed, 26 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index a3ade02..44cd752 100644 --- a/configure.ac +++ b/configure.ac @@ -386,28 +386,41 @@ AC_DEFINE_UNQUOTED(NIS_PLUGIN_CONTINUE_WITHOUT_PORTMAP_ENV,"$NIS_PLUGIN_CONTINUE AC_SUBST(NIS_PLUGIN_CONTINUE_WITHOUT_PORTMAP_ENV) AC_SUBST(TRACE_CMD) -TESTS_USE_REFINT=false -TESTS_USE_MEMBEROF=false +CONFIGURED_LINK_FLAGS= +AC_ARG_ENABLE(unloading, + AS_HELP_STRING([--disable-unloading], + [attempt to mark the plugins as not-to-be-unloaded]), + if test x$enableval = xno ; then + AC_MSG_RESULT([marking plugins as not-to-be-unloaded]) + [CONFIGURED_LINK_FLAGS='-Wl,-z,nodelete'] + else + AC_MSG_RESULT([leaving plugins as okay-to-unload]) + fi, + AC_MSG_RESULT([leaving plugins as okay-to-unload])) +AC_SUBST(CONFIGURED_LINK_FLAGS) + +TESTS_USE_REFINT=true +TESTS_USE_MEMBEROF=true AC_ARG_ENABLE(tests-with-refint, - AS_HELP_STRING([--enable-tests-with-refint], - [load the refint plugin when doing tests]), + AS_HELP_STRING([--disable-tests-with-refint], + [skip tests which use the the refint plugin]), if test x$enableval = xyes ; then AC_MSG_RESULT([running tests with referential integrity enabled]) - TESTS_USE_REFINT=true else AC_MSG_RESULT([running tests with referential integrity disabled]) + TESTS_USE_REFINT=false fi, - AC_MSG_RESULT([running tests with referential integrity disabled])) + AC_MSG_RESULT([running tests with referential integrity enabled])) AC_ARG_ENABLE(tests-with-memberof, - AS_HELP_STRING([--enable-tests-with-memberof], - [load the memberof plugin when doing tests]), + AS_HELP_STRING([--disable-tests-with-memberof], + [skip tests which are impacted by the memberof plugin]), if test x$enableval = xyes ; then AC_MSG_RESULT([running tests with memberof enabled]) - TESTS_USE_MEMBEROF=true else AC_MSG_RESULT([running tests with memberof disabled]) + TESTS_USE_MEMBEROF=false fi, - AC_MSG_RESULT([running tests with memberof disabled])) + AC_MSG_RESULT([running tests with memberof enabled])) AC_SUBST(TESTS_USE_REFINT) AC_SUBST(TESTS_USE_MEMBEROF) diff --git a/src/Makefile.am b/src/Makefile.am index 684dbbc..6c8666b 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -2,6 +2,7 @@ AM_CFLAGS = $(LDAP_CFLAGS) $(RUNTIME_CFLAGS) $(TIRPC_CFLAGS) $(RPC_CFLAGS) AM_LDFLAGS = -module -avoid-version -export-symbols-regex '.*_plugin_init' LIBPTHREAD = @LIBPTHREAD@ LIBWRAP = @LIBWRAP@ +CONFIGURED_LINK_FLAGS = @CONFIGURED_LINK_FLAGS@ plugindir = $(libdir)/dirsrv/plugins @@ -46,7 +47,7 @@ nisserver_plugin_la_SOURCES = \ portmap.h \ wrap.c \ wrap.h -nisserver_plugin_la_LIBADD = $(LDAP_LIBS) $(RUNTIME_LIBS) $(TIRPC_LIBS) $(LIBWRAP) $(RPC_LIBS) $(LIBPTHREAD) +nisserver_plugin_la_LIBADD = $(LDAP_LIBS) $(RUNTIME_LIBS) $(TIRPC_LIBS) $(LIBWRAP) $(RPC_LIBS) $(LIBPTHREAD) $(CONFIGURED_LINK_FLAGS) schemacompat_plugin_la_SOURCES = \ back-sch.c \ @@ -61,7 +62,7 @@ schemacompat_plugin_la_SOURCES = \ plugin.h \ wrap.c \ wrap.h -schemacompat_plugin_la_LIBADD = $(LDAP_LIBS) $(RUNTIME_LIBS) $(LIBPTHREAD) +schemacompat_plugin_la_LIBADD = $(LDAP_LIBS) $(RUNTIME_LIBS) $(LIBPTHREAD) $(CONFIGURED_LINK_FLAGS) noinst_LTLIBRARIES = dummy-nis-plugin.la dummy_nis_plugin_la_SOURCES = \ |