Changeset 462 in openpam


Ignore:
Timestamp:
Nov 2, 2011, 3:04:31 PM (8 years ago)
Author:
Dag-Erling Smørgrav
Message:

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.

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/autogen.des

    r395 r462  
    1515        --with-pam-unix \
    1616        --with-su \
     17        --with-modules-dir=/usr/lib \
    1718        --enable-developer-warnings \
    1819        --enable-werror \
  • trunk/configure.ac

    r438 r462  
    4949    [AS_IF([test x"$withval" != x"no"], [
    5050        OPENPAM_MODULES_DIR="$withval"
    51         AC_DEFINE_UNQUOTED(OPENPAM_MODULES_DIR,
    52             "$OPENPAM_MODULES_DIR",
    53             [OpenPAM modules directory])
    5451    ], [
    5552        OPENPAM_MODULES_DIR="$libdir"
    5653    ])],
    5754    [OPENPAM_MODULES_DIR="$libdir"])
     55AC_DEFINE_UNQUOTED(OPENPAM_MODULES_DIR,
     56    "$OPENPAM_MODULES_DIR",
     57    [OpenPAM modules directory])
    5858AC_SUBST(OPENPAM_MODULES_DIR)
    5959
  • trunk/lib/Makefile.am

    r455 r462  
    5454        $(NULL)
    5555
    56 libpam_la_CFLAGS = -DOPENPAM_MODULES_DIR='"@OPENPAM_MODULES_DIR@/"'
    57 
    5856libpam_la_LDFLAGS = -no-undefined -version-info @LIB_MAJ@
    5957libpam_la_LIBADD = @DL_LIBS@
Note: See TracChangeset for help on using the changeset viewer.