From daf9b062f7d169d3fe51b9492fc92f0395235f27 Mon Sep 17 00:00:00 2001
From: Craig Small <csmall@users.sourceforge.net>
Date: Thu, 5 Sep 2002 22:54:17 +0000
Subject: [PATCH] more cleaning up for selinux

---
 Makefile.in     |  1 +
 configure       | 10 ++++++----
 configure.in    |  3 ++-
 doc/Makefile.in |  1 +
 src/Makefile.in |  1 +
 5 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 6b83bf7..acb7902 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -69,6 +69,7 @@ DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 ECHO = @ECHO@
 EXEEXT = @EXEEXT@
+FLASK_LINUX = @FLASK_LINUX@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
diff --git a/configure b/configure
index 3fcaf41..7c630cf 100755
--- a/configure
+++ b/configure
@@ -1711,6 +1711,7 @@ INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 # some platforms.
 
 
+
 # Check whether --enable-flask or --disable-flask was given.
 if test "${enable_flask+set}" = set; then
   enableval="$enable_flask"
@@ -4187,7 +4188,7 @@ test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
 case $host in
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 4190 "configure"' > conftest.$ac_ext
+  echo '#line 4191 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -4719,7 +4720,7 @@ chmod -w .
 save_CFLAGS="$CFLAGS"
 CFLAGS="$CFLAGS -o out/conftest2.$ac_objext"
 compiler_c_o=no
-if { (eval echo configure:4722: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
+if { (eval echo configure:4723: \"$ac_compile\") 1>&5; (eval $ac_compile) 2>out/conftest.err; } && test -s out/conftest2.$ac_objext; then
   # The compiler can only warn and ignore the option if not recognized
   # So say no if there are warnings
   if test -s out/conftest.err; then
@@ -6533,7 +6534,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6536 "configure"
+#line 6537 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6631,7 +6632,7 @@ else
     lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 6634 "configure"
+#line 6635 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10968,6 +10969,7 @@ s,@AMDEP_TRUE@,$AMDEP_TRUE,;t t
 s,@AMDEP_FALSE@,$AMDEP_FALSE,;t t
 s,@AMDEPBACKSLASH@,$AMDEPBACKSLASH,;t t
 s,@DEPDIR@,$DEPDIR,;t t
+s,@FLASK_LINUX@,$FLASK_LINUX,;t t
 s,@CC@,$CC,;t t
 s,@CFLAGS@,$CFLAGS,;t t
 s,@LDFLAGS@,$LDFLAGS,;t t
diff --git a/configure.in b/configure.in
index 8cd58fd..a2746c2 100644
--- a/configure.in
+++ b/configure.in
@@ -4,7 +4,8 @@ AM_CONFIG_HEADER(config.h)
 AM_INIT_AUTOMAKE(psmisc,21.1cvs)
 
 dnl checks for options
-AC_ARG_ENABLE([flask],[  --enable-flask  Enable Security-Enhanced Linux features],
+AC_SUBST(FLASK_LINUX)
+AC_ARG_ENABLE(flask,[  --enable-flask  Enable Security-Enhanced Linux features],
 	AC_DEFINE([FLASK_LINUX],1,[Use Security-Enhanced Linux features]),)
 
 dnl Checks for programs.
diff --git a/doc/Makefile.in b/doc/Makefile.in
index ea83d2a..4a17b89 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -69,6 +69,7 @@ DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 ECHO = @ECHO@
 EXEEXT = @EXEEXT@
+FLASK_LINUX = @FLASK_LINUX@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
diff --git a/src/Makefile.in b/src/Makefile.in
index 81ec932..f4388c5 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -69,6 +69,7 @@ DEPDIR = @DEPDIR@
 DLLTOOL = @DLLTOOL@
 ECHO = @ECHO@
 EXEEXT = @EXEEXT@
+FLASK_LINUX = @FLASK_LINUX@
 GENCAT = @GENCAT@
 GLIBC21 = @GLIBC21@
 GMSGFMT = @GMSGFMT@
-- 
2.40.0