more cleaning up for selinux

diff --git a/Makefile.in b/Makefile.in
index 6b83bf72f0e4636ca68f15c75e05c34c7231c035..acb790276168450b05dbe6f54512af0a0ba6d16f 100644 (file)
--- 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 3fcaf4138034cbe161564038cd46d72a68528cc0..7c630cfe2c846c9a71b09ca3bdefd28ba92146d6 100755 (executable)
--- 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 8cd58fd11599a5e50d338b497f646b38f8a6b938..a2746c2dcf1b488341807e835e9a009b490a302d 100644 (file)
--- 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 ea83d2a52a4d363e9738a7ff4bad34ce8645a9c3..4a17b89c79d78e68074622d2be0b08a351b2e657 100644 (file)
--- 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 81ec932d1186763bb1e28ce2462a96947592f409..f4388c5765219860d7d3c443442fe6f262cdd672 100644 (file)
--- 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@