MFH: 292432,r292433,r292434

- Merge OpenBSM 1.2 alpha 4.
- Regenerate config.h for OpenBSM 1.2 alpha 4.
- Add au_notify.2 and MLINKs (added in OpenBSM 1.2 alpha 4).

Relnotes:	yes

1 files changed, 29 insertions, 20 deletions

diff --git a/contrib/openbsm/configure b/contrib/openbsm/configure
index 197a9be..14ae320 100755
--- a/contrib/openbsm/configure
+++ b/contrib/openbsm/configure
@@ -1,9 +1,8 @@
 #! /bin/sh
-# From configure.ac P4: //depot/projects/trustedbsd/openbsm/configure.ac#65 .
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for OpenBSM 1.2-alpha3.
+# Generated by GNU Autoconf 2.69 for OpenBSM 1.2-alpha4.
 #
-# Report bugs to <trustedbsd-audit@TrustesdBSD.org>.
+# Report bugs to <trustedbsd-audit@TrustedBSD.org>.
 #
 #
 # Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
@@ -276,7 +275,7 @@ fi
     $as_echo "$0: be upgraded to zsh 4.3.4 or later."
   else
     $as_echo "$0: Please tell bug-autoconf@gnu.org and
-$0: trustedbsd-audit@TrustesdBSD.org about your system,
+$0: trustedbsd-audit@TrustedBSD.org about your system,
 $0: including any error possibly output before this
 $0: message. Then install a modern shell, or manually run
 $0: the script under such a shell if you do have one."
@@ -591,9 +590,9 @@ MAKEFLAGS=
 # Identity of this package.
 PACKAGE_NAME='OpenBSM'
 PACKAGE_TARNAME='openbsm'
-PACKAGE_VERSION='1.2-alpha3'
-PACKAGE_STRING='OpenBSM 1.2-alpha3'
-PACKAGE_BUGREPORT='trustedbsd-audit@TrustesdBSD.org'
+PACKAGE_VERSION='1.2-alpha4'
+PACKAGE_STRING='OpenBSM 1.2-alpha4'
+PACKAGE_BUGREPORT='trustedbsd-audit@TrustedBSD.org'
 PACKAGE_URL=''
 
 ac_unique_file="bin/auditreduce/auditreduce.c"
@@ -1327,7 +1326,7 @@ if test "$ac_init_help" = "long"; then
   # Omit some internal or obsolete options to make the list less imposing.
   # This message is too long to be a string in the A/UX 3.1 sh.
   cat <<_ACEOF
-\`configure' configures OpenBSM 1.2-alpha3 to adapt to many kinds of systems.
+\`configure' configures OpenBSM 1.2-alpha4 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1397,7 +1396,7 @@ fi
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of OpenBSM 1.2-alpha3:";;
+     short | recursive ) echo "Configuration of OpenBSM 1.2-alpha4:";;
    esac
   cat <<\_ACEOF
 
@@ -1448,7 +1447,7 @@ Some influential environment variables:
 Use these variables to override the choices made by `configure' or to help
 it to find libraries and programs with nonstandard names/locations.
 
-Report bugs to <trustedbsd-audit@TrustesdBSD.org>.
+Report bugs to <trustedbsd-audit@TrustedBSD.org>.
 _ACEOF
 ac_status=$?
 fi
@@ -1511,7 +1510,7 @@ fi
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-OpenBSM configure 1.2-alpha3
+OpenBSM configure 1.2-alpha4
 generated by GNU Autoconf 2.69
 
 Copyright (C) 2012 Free Software Foundation, Inc.
@@ -1856,9 +1855,9 @@ $as_echo "$as_me: WARNING: $2: see the Autoconf documentation" >&2;}
 $as_echo "$as_me: WARNING: $2:     section \"Present But Cannot Be Compiled\"" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $2: proceeding with the compiler's result" >&5
 $as_echo "$as_me: WARNING: $2: proceeding with the compiler's result" >&2;}
-( $as_echo "## ----------------------------------------------- ##
-## Report this to trustedbsd-audit@TrustesdBSD.org ##
-## ----------------------------------------------- ##"
+( $as_echo "## ---------------------------------------------- ##
+## Report this to trustedbsd-audit@TrustedBSD.org ##
+## ---------------------------------------------- ##"
      ) | sed "s/^/$as_me: WARNING:     /" >&2
     ;;
 esac
@@ -1991,7 +1990,7 @@ cat >config.log <<_ACEOF
 This file contains any messages produced by compilers while
 running configure, to aid debugging if configure makes a mistake.
 
-It was created by OpenBSM $as_me 1.2-alpha3, which was
+It was created by OpenBSM $as_me 1.2-alpha4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
@@ -2344,7 +2343,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
 ac_aux_dir=
 for ac_dir in config "$srcdir"/config; do
   if test -f "$ac_dir/install-sh"; then
@@ -11132,6 +11130,17 @@ CC="$lt_save_CC"
 # Only expand once:
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ln -s works" >&5
+$as_echo_n "checking whether ln -s works... " >&6; }
+LN_S=$as_ln_s
+if test "$LN_S" = "ln -s"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, using $LN_S" >&5
+$as_echo "no, using $LN_S" >&6; }
+fi
+
 for ac_prog in 'bison -y' byacc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -11552,7 +11561,7 @@ fi
 # Define the identity of the package.
 
  PACKAGE=OpenBSM
- VERSION=1.2-alpha3
+ VERSION=1.2-alpha4
 
 
 cat >>confdefs.h <<_ACEOF
@@ -14174,7 +14183,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 # report actual input values of CONFIG_FILES etc. instead of their
 # values after options handling.
 ac_log="
-This file was extended by OpenBSM $as_me 1.2-alpha3, which was
+This file was extended by OpenBSM $as_me 1.2-alpha4, which was
 generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
@@ -14234,13 +14243,13 @@ $config_headers
 Configuration commands:
 $config_commands
 
-Report bugs to <trustedbsd-audit@TrustesdBSD.org>."
+Report bugs to <trustedbsd-audit@TrustedBSD.org>."
 
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
 ac_cs_version="\\
-OpenBSM config.status 1.2-alpha3
+OpenBSM config.status 1.2-alpha4
 configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"