diff options
author | des <des@FreeBSD.org> | 2008-12-13 23:10:36 +0000 |
---|---|---|
committer | des <des@FreeBSD.org> | 2008-12-13 23:10:36 +0000 |
commit | ea3a1a6d6a0338978fdab1a47c943e1f6ac16c84 (patch) | |
tree | 1cb612a42a87f09b807512f9922449b8b917a3f4 | |
parent | 646ea20decc87530f871e5c56e96980c93fcf391 (diff) | |
download | FreeBSD-src-ea3a1a6d6a0338978fdab1a47c943e1f6ac16c84.zip FreeBSD-src-ea3a1a6d6a0338978fdab1a47c943e1f6ac16c84.tar.gz |
Merge upstream r418: remove static build autodetection.
-rw-r--r-- | include/security/openpam.h | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/include/security/openpam.h b/include/security/openpam.h index 3361d62..a149feb 100644 --- a/include/security/openpam.h +++ b/include/security/openpam.h @@ -1,6 +1,6 @@ /*- * Copyright (c) 2002-2003 Networks Associates Technology, Inc. - * Copyright (c) 2004-2007 Dag-Erling Smørgrav + * Copyright (c) 2004-2008 Dag-Erling Smørgrav * All rights reserved. * * This software was developed for the FreeBSD Project by ThinkSec AS and @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $Id: openpam.h 408 2007-12-21 11:36:24Z des $ + * $Id: openpam.h 418 2008-12-13 22:39:24Z des $ */ #ifndef SECURITY_OPENPAM_H_INCLUDED @@ -309,18 +309,17 @@ struct pam_module { * Infrastructure for static modules using GCC linker sets. * You are not expected to understand this. */ -#if defined(__FreeBSD__) +#if !defined(PAM_SOEXT) # define PAM_SOEXT ".so" -#else -# undef NO_STATIC_MODULES -# define NO_STATIC_MODULES #endif -#if defined(__GNUC__) && !defined(__PIC__) && !defined(NO_STATIC_MODULES) +#if defined(OPENPAM_STATIC_MODULES) +# if !defined(__GNUC__) +# error "Don't know how to build static modules on non-GNU compilers" +# endif /* gcc, static linking */ # include <sys/cdefs.h> # include <linker_set.h> -# define OPENPAM_STATIC_MODULES # define PAM_EXTERN static # define PAM_MODULE_ENTRY(name) \ static char _pam_name[] = name PAM_SOEXT; \ |