Date: Sat, 13 Dec 2008 23:10:36 +0000 (UTC) From: Dag-Erling Smorgrav <des@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-vendor@freebsd.org Subject: svn commit: r186064 - vendor/openpam/dist/include/security Message-ID: <200812132310.mBDNAa6M042583@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: des Date: Sat Dec 13 23:10:36 2008 New Revision: 186064 URL: http://svn.freebsd.org/changeset/base/186064 Log: Merge upstream r418: remove static build autodetection. Modified: vendor/openpam/dist/include/security/openpam.h Modified: vendor/openpam/dist/include/security/openpam.h ============================================================================== --- vendor/openpam/dist/include/security/openpam.h Sat Dec 13 22:45:22 2008 (r186063) +++ vendor/openpam/dist/include/security/openpam.h Sat Dec 13 23:10:36 2008 (r186064) @@ -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; \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200812132310.mBDNAa6M042583>