From 61066331823c04649c2a03648c494344530f95c3 Mon Sep 17 00:00:00 2001 From: Craig Small Date: Wed, 23 Feb 2005 04:27:50 +0000 Subject: [PATCH] fixed enable-flask problem in configure script --- ChangeLog | 6 +----- configure.in | 13 ++++++++----- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/ChangeLog b/ChangeLog index 45bfc5e..d3e7fde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,8 +1,3 @@ -2005-02-23 gettextize - - * Makefile.am (ACLOCAL_AMFLAGS): New variable. - * configure.in (AC_CONFIG_FILES): Add m4/Makefile. - Changes in 21.6 (not released yet) =============== * Minor typo (specificiation) fixed @@ -20,6 +15,7 @@ Changes in 21.6 (not released yet) * Warning in killall.1 about process changing names Debian #187941 * Removed include termcap.h to fix RH include problem. * Added Vietnamese translation + * Fixed --enable-flask logic SF#1094205 Changes in 21.5 =============== diff --git a/configure.in b/configure.in index 1c9917a..1bb7e0c 100644 --- a/configure.in +++ b/configure.in @@ -1,5 +1,5 @@ dnl Process this file with autoconf to produce a configure script. -AC_INIT([psmisc],[21.6cvs]) +AC_INIT([psmisc],[21.6pre1]) AC_PREREQ(2.59) AC_CONFIG_SRCDIR([src/comm.h]) AC_CONFIG_HEADER([config.h]) @@ -14,10 +14,13 @@ dnl checks for options AC_SUBST([FLASK_LINUX]) AC_ARG_ENABLE([flask], [AS_HELP_STRING([--enable-flask], [Enable Security-Enhanced Linux features])], - [AC_DEFINE([FLASK_LINUX], [1], [Use Security-Enhanced Linux features]) - AC_CHECK_LIB([secure], [avc_toggle], [FLASK_LIB=-lsecure], [ - AC_MSG_ERROR([Cannot find selinux/ secure static library]) ]) ], - []) + [enable_flask=$enableval], + [enable_flask="no"]) +if test "$enable_flask" = "yes"; then + AC_DEFINE([FLASK_LINUX], [1], [Use Security-Enhanced Linux features]) + AC_CHECK_LIB([secure], [avc_toggle], [FLASK_LIB=-lsecure], [ + AC_MSG_ERROR([Cannot find selinux/ secure static library]) ]) +fi AC_SUBST([FLASK_LIB]) dnl Checks for libraries. -- 2.40.0