From db88ad1a27df6f036f2f6421168c42dc65efb1ae Mon Sep 17 00:00:00 2001
From: Chris Dunlap <cdunlap@llnl.gov>
Date: Thu, 18 May 2006 00:03:42 +0000
Subject: [PATCH] * config/x_ac_meta.m4: Changed META_ALIAS to not include
 release if 1.

---
 ChangeLog           |  2 ++
 config/x_ac_meta.m4 |  3 ++-
 configure           | 25 +++++++++++++------------
 3 files changed, 17 insertions(+), 13 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 7211cfd5..0c085e93 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2006-05-17  Chris Dunlap  <cdunlap@llnl.gov>
 
+	* config/x_ac_meta.m4: Changed META_ALIAS to not include release if 1.
+
 	* : Released 0.5.3.
 
 	* HISTORY, META, NEWS: Updated for 0.5.3 release.
diff --git a/config/x_ac_meta.m4 b/config/x_ac_meta.m4
index b192cb3b..96d04b74 100644
--- a/config/x_ac_meta.m4
+++ b/config/x_ac_meta.m4
@@ -45,7 +45,8 @@ AC_DEFUN([X_AC_META], [
 
     if test -n "$META_NAME" -a -n "$META_VERSION"; then
         META_ALIAS="$META_NAME-$META_VERSION"
-        test -n "$META_RELEASE" && META_ALIAS="$META_ALIAS-$META_RELEASE"
+        test -n "$META_RELEASE" -a "$META_RELEASE" != "1" \
+          && META_ALIAS="$META_ALIAS-$META_RELEASE"
         AC_DEFINE_UNQUOTED([META_ALIAS], ["$META_ALIAS"],
           [Define the project alias string (name-ver or name-ver-rel).]
         )
diff --git a/configure b/configure
index c3a56a2c..597b7d39 100755
--- a/configure
+++ b/configure
@@ -1536,7 +1536,8 @@ _ACEOF
 
     if test -n "$META_NAME" -a -n "$META_VERSION"; then
         META_ALIAS="$META_NAME-$META_VERSION"
-        test -n "$META_RELEASE" && META_ALIAS="$META_ALIAS-$META_RELEASE"
+        test -n "$META_RELEASE" -a "$META_RELEASE" != "1" \
+          && META_ALIAS="$META_ALIAS-$META_RELEASE"
 
 cat >>confdefs.h <<_ACEOF
 #define META_ALIAS "$META_ALIAS"
@@ -6804,7 +6805,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 6807 "configure"
+#line 6808 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -6902,7 +6903,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 6905 "configure"
+#line 6906 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -7051,7 +7052,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7054 "configure"' > conftest.$ac_ext
+  echo '#line 7055 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -7739,11 +7740,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:7742: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:7743: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:7746: \$? = $ac_status" >&5
+   echo "$as_me:7747: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8033,11 +8034,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8036: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8037: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8040: \$? = $ac_status" >&5
+   echo "$as_me:8041: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8137,11 +8138,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8140: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8141: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8144: \$? = $ac_status" >&5
+   echo "$as_me:8145: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -8193,11 +8194,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8196: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8197: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8200: \$? = $ac_status" >&5
+   echo "$as_me:8201: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized