1 --- Linux-PAM-0.79/.pc/ac-define.patch/configure.in 2005-03-30 06:32:52.000000000 -0800
2 +++ Linux-PAM-0.79/configure.in 2005-04-15 00:14:58.514541928 -0700
5 AC_SUBST(LIBPAM_VERSION_MAJOR)
6 AC_SUBST(LIBPAM_VERSION_MINOR)
7 -AC_DEFINE(LIBPAM_VERSION_MAJOR)
8 -AC_DEFINE(LIBPAM_VERSION_MINOR)
9 +AC_DEFINE_UNQUOTED(LIBPAM_VERSION_MAJOR, $LIBPAM_VERSION_MAJOR, [libpam major version number])
10 +AC_DEFINE_UNQUOTED(LIBPAM_VERSION_MINOR, $LIBPAM_VERSION_MINOR, [libpam minor version number])
13 dnl By default, everything under PAM is installed under the root fs.
16 LOCALSRCDIR=`/bin/pwd` ; AC_SUBST(LOCALSRCDIR)
17 LOCALOBJDIR=`/bin/pwd` ; AC_SUBST(LOCALOBJDIR)
18 -OS=`uname|sed -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
22 dnl Rules needed for the following (hardcoded Linux defaults for now)
24 USESONAME=yes ; AC_SUBST(USESONAME)
25 SOSWITCH="-Wl,-soname -Wl," ; AC_SUBST(SOSWITCH)
26 NEEDSONAME=yes ; AC_SUBST(NEEDSONAME)
27 -LDCONFIG=/sbin/ldconfig ; AC_SUBST(LDCONFIG)
29 +dnl Cross compiling requires no ldconfig, as the library will not be used here.
30 +if test "$cross_compiling" = yes ; then
33 + LDCONFIG=/sbin/ldconfig
39 dnl Checks for programs.
42 dnl lots of debugging information goes to /tmp/pam-debug.log
44 [ --enable-debug specify you are building with debugging on],
45 - WITH_DEBUG=yes ; AC_DEFINE(DEBUG) , WITH_DEBUG=no)
46 + WITH_DEBUG=yes ; AC_DEFINE(DEBUG, 1, [lots of stuff gets written to /tmp/pam-debug.log]) , WITH_DEBUG=no)
49 AC_ARG_ENABLE(memory-debug,
50 [ --enable-memory-debug specify you want every malloc etc. call tracked],
51 - WITH_MEMORY_DEBUG=yes ; AC_DEFINE(MEMORY_DEBUG) , WITH_MEMORY_DEBUG=no)
52 + WITH_MEMORY_DEBUG=yes ; AC_DEFINE(MEMORY_DEBUG, 1, [track all memory allocations and liberations]) , WITH_MEMORY_DEBUG=no)
53 AC_SUBST(WITH_MEMORY_DEBUG)
55 dnl build specially named libraries (for debugging purposes)
56 AC_ARG_ENABLE(libdebug,
57 [ --enable-libdebug specify you are building debugging libraries],
58 - WITH_LIBDEBUG=yes ; AC_DEFINE(WITH_LIBDEBUG) , WITH_LIBDEBUG=no)
59 + WITH_LIBDEBUG=yes ; AC_DEFINE(WITH_LIBDEBUG, 1, [build libraries with different names (suffixed with 'd')]) , WITH_LIBDEBUG=no)
60 AC_SUBST(WITH_LIBDEBUG)
62 dnl have prelude support
63 AC_ARG_ENABLE(prelude,
64 [ --enable-prelude build prelude ids support],
65 - WITH_PRELUDE=yes ; AC_DEFINE(WITH_PRELUDE), WITH_PRELUDE=no)
66 + WITH_PRELUDE=yes ; AC_DEFINE(WITH_PRELUDE, 1, [build prelude ids support]), WITH_PRELUDE=no)
67 AC_SUBST(WITH_PRELUDE)
69 dnl packaging convenience
72 AC_ARG_ENABLE(pamlocking,
73 [ --enable-pamlocking configure libpam to observe a global authentication lock],
74 - WITH_PAMLOCKING=yes ; AC_DEFINE(PAM_LOCKING) , WITH_PAMLOCKING=no)
75 + WITH_PAMLOCKING=yes ; AC_DEFINE(PAM_LOCKING, 1, [provide a global locking facility within libpam]) , WITH_PAMLOCKING=no)
76 AC_SUBST(WITH_PAMLOCKING)
78 AC_ARG_ENABLE(uglyhack,
79 [ --enable-uglyhack configure libpam to try to honor old pam_strerror syntax],
80 - AC_DEFINE(UGLY_HACK_FOR_PRIOR_BEHAVIOR_SUPPORT))
81 + AC_DEFINE(UGLY_HACK_FOR_PRIOR_BEHAVIOR_SUPPORT, 1, [ugly hack to partially support old pam_strerror syntax]))
83 AC_ARG_ENABLE(read-both-confs,
84 [ --enable-read-both-confs read both /etc/pam.d and /etc/pam.conf files],
85 - AC_DEFINE(PAM_READ_BOTH_CONFS))
86 + AC_DEFINE(PAM_READ_BOTH_CONFS, 1, [read both confs - read /etc/pam.d and /etc/pam.conf in serial]))
87 AC_SUBST(PAM_READ_BOTH_CONFS)
89 AC_ARG_ENABLE(static-libpam, [ --enable-static-libpam build a libpam.a library],
91 pam_mail_spool="\"/var/spool/mail\"",
92 pam_mail_spool="\"/var/spool/mail\"")
94 -AC_DEFINE_UNQUOTED(PAM_PATH_MAILDIR, $pam_mail_spool)
95 +AC_DEFINE_UNQUOTED(PAM_PATH_MAILDIR, $pam_mail_spool, [location of the mail spool directory])
97 dnl Checks for libraries.
98 AC_CHECK_LIB(c, __libc_sched_setscheduler, PAM_NEEDS_LIBC=, PAM_NEEDS_LIBC=-lc)
100 dnl At least on Solaris, the existing libcrack must be dynamic.
101 dnl Ought to introduce a check for this.
103 -AC_CHECK_LIB(crack, FascistCheck, HAVE_LIBCRACK=yes ; AC_DEFINE(HAVE_LIBCRACK),
104 +AC_CHECK_LIB(crack, FascistCheck, HAVE_LIBCRACK=yes ; AC_DEFINE(HAVE_LIBCRACK, 1, [we have libcrack available]),
106 AC_SUBST(HAVE_LIBCRACK)
108 -AC_CHECK_LIB(crypt, crypt, HAVE_LIBCRYPT=yes ; AC_DEFINE(HAVE_LIBCRYPT),
109 +AC_CHECK_LIB(crypt, crypt, HAVE_LIBCRYPT=yes ; AC_DEFINE(HAVE_LIBCRYPT, 1, [we have libcrypt - its not part of libc (do we need both definitions?)]),
111 AC_SUBST(HAVE_LIBCRYPT)
112 -AC_CHECK_LIB(util, logwtmp, HAVE_LIBUTIL=yes ; AC_DEFINE(HAVE_LIBUTIL),
113 +AC_CHECK_LIB(util, logwtmp, HAVE_LIBUTIL=yes ; AC_DEFINE(HAVE_LIBUTIL, 1, [we have libutil]),
115 AC_SUBST(HAVE_LIBUTIL)
116 -AC_CHECK_LIB(ndbm, dbm_store, HAVE_LIBNDBM=yes ; AC_DEFINE(HAVE_LIBNDBM),
117 +AC_CHECK_LIB(ndbm, dbm_store, HAVE_LIBNDBM=yes ; AC_DEFINE(HAVE_LIBNDBM, 1, [we have libndbm]),
119 AC_SUBST(HAVE_LIBNDBM)
120 -AC_CHECK_LIB(db, dbm_store, HAVE_LIBDB=yes ; AC_DEFINE(HAVE_LIBDB),
121 +AC_CHECK_LIB(db, dbm_store, HAVE_LIBDB=yes ; AC_DEFINE(HAVE_LIBDB, 1, [we have libdb]),
123 if test x$HAVE_LIBDB != xyes ; then
124 AC_CHECK_LIB(db, db_create, HAVE_LIBDB=yes ; AC_DEFINE(HAVE_LIBDB),
128 -AC_CHECK_LIB(fl, yylex, yyterminate, HAVE_LIBFL=yes ; AC_DEFINE(HAVE_LIBFL),
129 +AC_CHECK_LIB(fl, yylex, yyterminate, HAVE_LIBFL=yes ; AC_DEFINE(HAVE_LIBFL, 1, [have libfl (Flex)]),
132 -AC_CHECK_LIB(nsl, yp_maplist, HAVE_LIBNSL=yes ; AC_DEFINE(HAVE_LIBNSL),
133 +AC_CHECK_LIB(nsl, yp_maplist, HAVE_LIBNSL=yes ; AC_DEFINE(HAVE_LIBNSL, 1, [have libnsl - instead of libc support]),
135 AC_SUBST(HAVE_LIBNSL)
137 if test $HAVE_LIBNSL = yes ; then
138 pwdblibs="$pwdblibs -lnsl"
140 -AC_CHECK_LIB(pwdb, pwdb_db_name, HAVE_LIBPWDB=yes ; AC_DEFINE(HAVE_LIBPWDB),
141 +AC_CHECK_LIB(pwdb, pwdb_db_name, HAVE_LIBPWDB=yes ; AC_DEFINE(HAVE_LIBPWDB, 1, [have libpwdb - don't expect this to be important for much longer]),
142 HAVE_LIBPWDB=no,$pwdblibs)
143 AC_SUBST(HAVE_LIBPWDB)
146 -AC_CHECK_LIB(fl, yywrap, HAVE_LIBFLEX=yes ; AC_DEFINE(HAVE_LIBFLEX),
147 +AC_CHECK_LIB(fl, yywrap, HAVE_LIBFLEX=yes ; AC_DEFINE(HAVE_LIBFLEX, 1, [have libflex]),
149 AC_SUBST(HAVE_LIBFLEX)
150 -AC_CHECK_LIB(l, yywrap, HAVE_LIBLEX=yes ; AC_DEFINE(HAVE_LIBLEX),
151 +AC_CHECK_LIB(l, yywrap, HAVE_LIBLEX=yes ; AC_DEFINE(HAVE_LIBLEX, 1, [have liblex]),
153 AC_SUBST(HAVE_LIBLEX)
154 +AC_CHECK_LIB(cap, capget, HAVE_LIBCAP=yes ; AC_DEFINE(HAVE_LIBCAP, 1, [have libcap (POSIX 1003.e capabilities)]),
156 +AC_SUBST(HAVE_LIBCAP)
158 dnl Checks for header files.
160 @@ -308,44 +318,38 @@
161 -Wnested-externs -Winline -Wshadow"
163 if test "$GCC" = yes; then
164 - CC=gcc ; AC_SUBST(CC)
165 ### May need per-OS attention
166 ### Example: -D_POSIX_SOURCE: needed on Linux but harms Solaris.
169 + case "$target_alias" in
173 LD_D="$CC -shared $LDFLAGS"
174 WARNINGS="$GCC_WARNINGS"
178 LD_L="$CC -shared $LDFLAGS"
181 CC_STATIC="-Xlinker -export-dynamic"
186 OS_CFLAGS="-ansi -pedantic"
187 LD_D="gcc -shared -Xlinker -x"
188 WARNINGS="$GCC_WARNINGS"
192 LD_L="$LD -x -shared"
195 CC_STATIC="-Xlinker -export-dynamic"
203 LD_L=ld -bexpall -bM:SRE -bnoentry
209 + OS=`uname|sed -e 'y/ABCDEFGHIJKLMNOPQRSTUVWXYZ/abcdefghijklmnopqrstuvwxyz/'`
213 @@ -354,34 +358,31 @@
214 ### Non-gcc needs attention on per-OS basis
220 # add some stuff here (see sourceforge bug 534205)
221 # DOCDIR=/System/Documentation/Administration/Libraries/PAM
222 # MANDIR=/usr/share/man
226 ### Support for Solaris-C
232 LD_D="cc -z text -G -R."
242 if test "$OSRELEASE" = 6.5; then
245 PIC= #PIC code is default for IRIX
246 - LD="cc -shared" # modules friendly approach
248 LD_L="ld -G -z redlocsym"
253 echo "IRIX prior to 6.5 not allowed for"