pam: configure.in, libpam/Makefile.am, libpam/pam_prelude.c - sort...
baggins
baggins at pld-linux.org
Tue Jul 12 16:57:33 CEST 2005
Author: baggins Date: Tue Jul 12 14:57:33 2005 GMT
Module: pam Tag: HEAD
---- Log message:
- sorted out autoconf and prelude
---- Files affected:
pam:
configure.in (1.58 -> 1.59)
pam/libpam:
Makefile.am (1.12 -> 1.13) , pam_prelude.c (1.4 -> 1.5)
---- Diffs:
================================================================
Index: pam/configure.in
diff -u pam/configure.in:1.58 pam/configure.in:1.59
--- pam/configure.in:1.58 Tue Jul 12 14:15:03 2005
+++ pam/configure.in Tue Jul 12 16:57:28 2005
@@ -55,6 +55,14 @@
AC_DEFINE(LINUX_PAM)
+dnl Checks for programs.
+
+AC_PROG_MAKE_SET
+AC_PROG_YACC
+AM_PROG_LEX
+AC_PROG_INSTALL
+AC_PROG_LN_S
+
AC_MSG_CHECKING(whether ln -sf works)
AC_CACHE_VAL(ac_cv_prog_LN_S,
[rm -f conftestdata
@@ -76,6 +84,68 @@
PICFLAG=$lt_prog_compiler_pic
AC_SUBST(PICFLAG)
+AC_PROG_CC
+
+case "$GCC" in
+ yes)
+ CFLAGS="$CFLAGS -Wall"
+ # CFLAGS="$CFLAGS -Wwrite-strings"
+ # CFLAGS="$CFLAGS -Wpointer-arith"
+ # CFLAGS="$CFLAGS -Wcast-qual"
+ # CFLAGS="$CFLAGS -Wcast-align"
+ # CFLAGS="$CFLAGS -Wtraditional"
+ # CFLAGS="$CFLAGS -Wstrict-prototypes"
+ # CFLAGS="$CFLAGS -Wmissing-prototypes"
+ # CFLAGS="$CFLAGS -Wnested-externs"
+ # CFLAGS="$CFLAGS -Winline"
+ # CFLAGS="$CFLAGS -Wshadow"
+
+ AC_CACHE_CHECK(whether ${CC-cc} accepts -pipe, ac_cv_prog_cc_pipe,
+ [echo 'void f(){}' > conftest.c
+ if test -z "`${CC-cc} -pipe -c conftest.c 2>&1`"; then
+ ac_cv_prog_cc_pipe=yes
+ else
+ ac_cv_prog_cc_pipe=no
+ fi
+ rm -f conftest*
+ ])
+
+ case "$ac_cv_prog_cc_pipe" in
+ yes)
+ CFLAGS="$CFLAGS -pipe"
+ ;;
+ esac
+ ;;
+esac
+
+case "$host" in
+ *-*-linux*)
+ AC_DEFINE(linux)
+ ;;
+ *-*-solaris*)
+ AC_DEFINE(solaris)
+ ;;
+ *-*-sunos*)
+ AC_DEFINE(sunos)
+ ;;
+ *-*-hpux*)
+ AC_DEFINE(hpux)
+ ;;
+esac
+
+case "$host" in
+ x86_64*|ppc64*|powerpc64*|sparc64*|s390x*) libdirname=lib64
+ ;;
+ *) libdirname=lib
+ ;;
+esac
+AC_SUBST(libdirname)
+
+CFLAGS="$CFLAGS -D$host_cpu -D_GNU_SOURCE \
+ -DLIBPAM_VERSION_MAJOR=$LIBPAM_VERSION_MAJOR \
+ -DLIBPAM_VERSION_MINOR=$LIBPAM_VERSION_MINOR \
+ -DLIBPAM_VERSION_STRING=\"\\\"$LIBPAM_VERSION_MAJOR.$LIBPAM_VERSION_MINOR\\\"\""
+
AC_MSG_CHECKING([whether to build shared modules])
AC_ARG_ENABLE(
shared_modules, [ --enable-shared-modules build shared modules [default=yes]],
@@ -171,117 +241,59 @@
AC_MSG_RESULT([yes])
)
-AC_CHECK_LIB(selinux, getfilecon, selinux_present=true, selinux_present=false)
AC_MSG_CHECKING([whether to use SELinux])
AC_ARG_ENABLE(selinux, [ --enable-selinux Enable SELinux support [default=yes]],
if test "$enableval" = "yes" -o "$selinux" = "yes"; then
- if test "$selinux_present" = "false"; then
- AC_MSG_RESULT([no])
- AC_MSG_ERROR(Cannot find libselinux)
- else
- AC_MSG_RESULT([yes])
- fi
+ AC_MSG_RESULT([yes])
+ enable_selinux=true
else
AC_MSG_RESULT([no])
- AC_MSG_WARN(SELinux support will not be enabled. pam_selinux and pam_selinux_check module will not be built!)
+ enable_selinux=false
fi,
- if test "$selinux_present" = "false"; then
- AC_MSG_RESULT([no])
- AC_MSG_WARN(SELinux support will not be enabled. pam_selinux and pam_selinux_check module will not be built!)
- else
- AC_MSG_RESULT([yes])
- fi
+ AC_MSG_RESULT([yes])
+ enable_selinux=maybe
)
-AM_CONDITIONAL(SELINUX_PRESENT, test x$selinux_present = xtrue)
-AC_DEFINE(WITH_SELINUX)
-AM_PATH_LIBPRELUDE(0.9.0, prelude_present=true, prelude_present=false)
+if test "$enable_selinux" = "false"; then
+ AC_MSG_WARN(SELinux support will not be enabled. pam_selinux module and pam_selinux_check will not be built!)
+else
+ AC_CHECK_LIB(selinux, getfilecon,
+ enable_selinux=true
+ AC_DEFINE(WITH_SELINUX),
+ enable_selinux=false
+ if test "$enable_selinux" = "maybe"; then
+ AC_MSG_WARN(SELinux support will not be enabled. pam_selinux module and pam_selinux_check will not be built!)
+ else
+ AC_MSG_ERROR(Cannot find libselinux)
+ fi)
+fi
+AM_CONDITIONAL(SELINUX_PRESENT, test x$enable_selinux = xtrue)
+
AC_MSG_CHECKING([whether to use Prelude IDS])
AC_ARG_ENABLE(prelude, [ --enable-prelude Enable Prelude IDS support in libpam [default=yes]],
if test "$enableval" = "yes" -o "$prelude" = "yes"; then
AC_MSG_RESULT([yes])
- if test "$prelude_present" = "false"; then
- AC_MSG_ERROR(Cannot find libprelude: Is libprelude-config in the path?)
- fi
+ enable_prelude=true
else
AC_MSG_RESULT([no])
- AC_MSG_WARN(Prelude IDS support in libpam will not be enabled.)
+ enable_prelude=false
fi,
AC_MSG_RESULT([yes])
- if test "$prelude_present" = "false"; then
- AC_MSG_WARN(Prelude IDS support in libpam will not be enabled.)
- fi
+ enable_prelude=maybe
)
-AM_CONDITIONAL(PRELUDE_PRESENT, test x$prelude_present = xtrue)
-AC_DEFINE(WITH_PRELUDE)
-
-dnl Checks for programs.
-AC_PROG_CC
-case "$GCC" in
- yes)
- CFLAGS="$CFLAGS -Wall"
- # CFLAGS="$CFLAGS -Wwrite-strings"
- # CFLAGS="$CFLAGS -Wpointer-arith"
- # CFLAGS="$CFLAGS -Wcast-qual"
- # CFLAGS="$CFLAGS -Wcast-align"
- # CFLAGS="$CFLAGS -Wtraditional"
- # CFLAGS="$CFLAGS -Wstrict-prototypes"
- # CFLAGS="$CFLAGS -Wmissing-prototypes"
- # CFLAGS="$CFLAGS -Wnested-externs"
- # CFLAGS="$CFLAGS -Winline"
- # CFLAGS="$CFLAGS -Wshadow"
-
- AC_CACHE_CHECK(whether ${CC-cc} accepts -pipe, ac_cv_prog_cc_pipe,
- [echo 'void f(){}' > conftest.c
- if test -z "`${CC-cc} -pipe -c conftest.c 2>&1`"; then
- ac_cv_prog_cc_pipe=yes
- else
- ac_cv_prog_cc_pipe=no
- fi
- rm -f conftest*
- ])
-
- case "$ac_cv_prog_cc_pipe" in
- yes)
- CFLAGS="$CFLAGS -pipe"
- ;;
- esac
- ;;
-esac
-
-case "$host" in
- *-*-linux*)
- AC_DEFINE(linux)
- ;;
- *-*-solaris*)
- AC_DEFINE(solaris)
- ;;
- *-*-sunos*)
- AC_DEFINE(sunos)
- ;;
- *-*-hpux*)
- AC_DEFINE(hpux)
- ;;
-esac
-
-case "$host" in
- x86_64*|ppc64*|powerpc64*|sparc64*|s390x*) libdirname=lib64
- ;;
- *) libdirname=lib
- ;;
-esac
-AC_SUBST(libdirname)
-
-CFLAGS="$CFLAGS -D$host_cpu -D_GNU_SOURCE \
- -DLIBPAM_VERSION_MAJOR=$LIBPAM_VERSION_MAJOR \
- -DLIBPAM_VERSION_MINOR=$LIBPAM_VERSION_MINOR"
-
-AC_PROG_MAKE_SET
-AC_PROG_YACC
-AM_PROG_LEX
-AC_PROG_INSTALL
-AC_PROG_LN_S
+if test "$enable_prelude" = "false"; then
+ AC_MSG_WARN(Prelude IDS support in libpam will not be enabled.)
+else
+ AM_PATH_LIBPRELUDE(0.9.0,
+ CFLAGS="$CFLAGS $LIBPRELUDE_CFLAGS -DLIBPRELUDE_CONFIG_PREFIX=\"\$(LIBPRELUDE_CONFIG_PREFIX)\""
+ AC_DEFINE(WITH_PRELUDE),
+ if test "$enable_prelude" = "maybe"; then
+ AC_MSG_WARN(Prelude IDS support in libpam will not be enabled.)
+ else
+ AC_MSG_ERROR(Cannot find libprelude: Is libprelude-config in the path?)
+ fi)
+fi
AC_CHECK_HEADERS(paths.h)
AC_ARG_WITH(mailspool,
================================================================
Index: pam/libpam/Makefile.am
diff -u pam/libpam/Makefile.am:1.12 pam/libpam/Makefile.am:1.13
--- pam/libpam/Makefile.am:1.12 Thu Apr 7 16:17:14 2005
+++ pam/libpam/Makefile.am Tue Jul 12 16:57:28 2005
@@ -22,10 +22,11 @@
STATIC_SRC = pam_static.c
pam_static.o: pam_static.c $(top_srcdir)/modules/_static_module_objects
pam_static.lo: pam_static.c $(top_srcdir)/modules/_static_module_objects
-libpam_la_LIBADD = ../pamcrypt/libpamcrypt.la
-libpam_la_LDFLAGS = -version-info $(PAM_VERSION_INFO) -Wl,--whole-archive $(MODULES) -Wl,--no-whole-archive
+libpam_la_LIBADD = ../pamcrypt/libpamcrypt.la $(LIBPRELUDE_LIBS)
+libpam_la_LDFLAGS = -version-info $(PAM_VERSION_INFO) -Wl,--whole-archive $(MODULES) -Wl,--no-whole-archive $(LIBPRELUDE_LDFLAGS)
else
-libpam_la_LDFLAGS = -version-info $(PAM_VERSION_INFO)
+libpam_la_LIBADD = $(LIBPRELUDE_LIBS)
+libpam_la_LDFLAGS = -version-info $(PAM_VERSION_INFO) $(LIBPRELUDE_LDFLAGS)
endif
================================================================
Index: pam/libpam/pam_prelude.c
diff -u pam/libpam/pam_prelude.c:1.4 pam/libpam/pam_prelude.c:1.5
--- pam/libpam/pam_prelude.c:1.4 Tue Jul 12 14:14:39 2005
+++ pam/libpam/pam_prelude.c Tue Jul 12 16:57:28 2005
@@ -5,6 +5,8 @@
* (C) Sebastien Tricaud 2005 <toady at gscore.org>
*/
+#include "config.h"
+
#include <stdio.h>
#include <syslog.h>
@@ -26,7 +28,6 @@
#define DEFAULT_ANALYZER_CONFIG LIBPRELUDE_CONFIG_PREFIX "/default/idmef-client.conf"
#define PAM_VERSION LIBPAM_VERSION_STRING
-
static const char *
pam_get_item_service(pam_handle_t *pamh)
================================================================
---- CVS-web:
http://cvs.pld-linux.org/pam/configure.in?r1=1.58&r2=1.59&f=u
http://cvs.pld-linux.org/pam/libpam/Makefile.am?r1=1.12&r2=1.13&f=u
http://cvs.pld-linux.org/pam/libpam/pam_prelude.c?r1=1.4&r2=1.5&f=u
More information about the pld-cvs-commit
mailing list