=== contrib/openpam/include/security/openpam.h
==================================================================
--- contrib/openpam/include/security/openpam.h	(revision 181430)
+++ contrib/openpam/include/security/openpam.h	(local)
@@ -311,12 +311,9 @@
  */
 #if defined(__FreeBSD__)
 # 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(PAM_STATIC_MODULES)
 /* gcc, static linking */
 # include <sys/cdefs.h>
 # include <linker_set.h>
=== lib/libpam/modules/Makefile.inc
==================================================================
--- lib/libpam/modules/Makefile.inc	(revision 181430)
+++ lib/libpam/modules/Makefile.inc	(local)
@@ -13,6 +13,7 @@
 # For the dynamic case, the modules depend on libpam.so.N
 .if defined(_NO_LIBPAM_SO_YET)
 NO_PIC=
+CFLAGS+=	-DPAM_STATIC_MODULES
 .else
 SHLIB_NAME?=	${LIB}.so.${SHLIB_MAJOR}
 DPADD+=		${LIBPAM}