If a module directory was specified on the configure command line, the

OPENPAM_MODULES_DIR macro was defined in config.h in addition to
CFLAGS.  Place OPENPAM_MODULES_DIR unconditionally in config.h and
remove it from CFLAGS.


git-svn-id: svn+ssh://svn.openpam.org/svn/openpam/trunk@462 185d5e19-27fe-0310-9dcf-9bff6b9f3609

autogen.des

@@ -14,6 +14,7 @@ export CONFIG_SHELL=/bin/sh
 	--with-doc \
 	--with-pam-unix \
 	--with-su \
+	--with-modules-dir=/usr/lib \
 	--enable-developer-warnings \
 	--enable-werror \
 	"$@"

configure.ac

@@ -48,13 +48,13 @@ AC_ARG_WITH([modules-dir],
 	[OpenPAM modules directory]),
     [AS_IF([test x"$withval" != x"no"], [
 	OPENPAM_MODULES_DIR="$withval"
-	AC_DEFINE_UNQUOTED(OPENPAM_MODULES_DIR,
-	    "$OPENPAM_MODULES_DIR",
-	    [OpenPAM modules directory])
     ], [
 	OPENPAM_MODULES_DIR="$libdir"
     ])],
     [OPENPAM_MODULES_DIR="$libdir"])
+AC_DEFINE_UNQUOTED(OPENPAM_MODULES_DIR,
+    "$OPENPAM_MODULES_DIR",
+    [OpenPAM modules directory])
 AC_SUBST(OPENPAM_MODULES_DIR)
 
 AC_ARG_WITH([doc],

lib/Makefile.am

@@ -53,8 +53,6 @@ libpam_la_SOURCES = \
 	pam_vprompt.c \
 	$(NULL)
 
-libpam_la_CFLAGS = -DOPENPAM_MODULES_DIR='"@OPENPAM_MODULES_DIR@/"'
-
 libpam_la_LDFLAGS = -no-undefined -version-info @LIB_MAJ@
 libpam_la_LIBADD = @DL_LIBS@