From 82eef86fbc04f27c74b94dc2054a8fd2de375e13 Mon Sep 17 00:00:00 2001
From: Quincey Koziol <koziol@hdfgroup.org>
Date: Fri, 8 Aug 2003 13:28:03 -0500
Subject: [svn-r7290] Purpose:     Code cleanup/minor bug fixes

Description:
    Corrected a few typos and changed the order that the printf() format
strings are tested for 'long long's to move 'll' ahead of 'q', since 'll' is
the form for the ANSI C99 standard.

Platforms tested:
    h5committested

Misc. update:
---
 configure    |  7 +++----
 configure.in | 25 ++++++++++++-------------
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/configure b/configure
index 26f10df..7907e60 100755
--- a/configure
+++ b/configure
@@ -8553,7 +8553,6 @@ echo "${ECHO_T}production" >&6
     CFLAGS="$CFLAGS $PROD_CFLAGS"
     CXXFLAGS="$CXXFLAGS $PROD_CXXFLAGS"
     CPPFLAGS="$CPPFLAGS $PROD_CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $PROD_CPPFLAGS"
     ;;
   X-|X-no)
     enable_production="no"
@@ -30265,8 +30264,8 @@ echo "${ECHO_T}no" >&6
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 
-echo "$as_me:$LINENO: checking for TIOCGGETD" >&5
-echo $ECHO_N "checking for TIOCGGETD... $ECHO_C" >&6
+echo "$as_me:$LINENO: checking for TIOCGETD" >&5
+echo $ECHO_N "checking for TIOCGETD... $ECHO_C" >&6
 cat >conftest.$ac_ext <<_ACEOF
 #line $LINENO "configure"
 #include "confdefs.h"
@@ -30904,7 +30903,7 @@ else
   LD_LIBRARY_PATH="$LD_LIBRARY_PATH`echo $LDFLAGS | sed -e 's/-L/:/g' -e 's/ //g'`"
 export LD_LIBRARY_PATH
 
-for hdf5_cv_printf_ll in l L q ll unknown; do
+for hdf5_cv_printf_ll in l L ll q unknown; do
    if test "$cross_compiling" = yes; then
   continue
 else
diff --git a/configure.in b/configure.in
index 968f726..58dfdf8 100644
--- a/configure.in
+++ b/configure.in
@@ -597,7 +597,6 @@ case "X-$enable_production" in
     CFLAGS="$CFLAGS $PROD_CFLAGS"
     CXXFLAGS="$CXXFLAGS $PROD_CXXFLAGS"
     CPPFLAGS="$CPPFLAGS $PROD_CPPFLAGS"
-    CPPFLAGS="$CPPFLAGS $PROD_CPPFLAGS"
     ;;
   X-|X-no)
     enable_production="no"
@@ -1598,7 +1597,7 @@ AC_DEFINE([HAVE_TIOCGWINSZ], [1],
 AC_MSG_RESULT([yes]),
 AC_MSG_RESULT([no]))
 
-AC_MSG_CHECKING([for TIOCGGETD])
+AC_MSG_CHECKING([for TIOCGETD])
 AC_TRY_COMPILE([#include <sys/ioctl.h>],[int w=TIOCGETD;],
 AC_DEFINE([HAVE_TIOCGETD], [1],
           [Define if the ioctl TIOCGETD is defined])
@@ -1623,8 +1622,8 @@ AC_MSG_CHECKING([for __attribute__ extension])
 AC_TRY_COMPILE(,[int __attribute__((unused)) x],
                AC_DEFINE([HAVE_ATTRIBUTE], [1],
                          [Define if the __attribute__(()) extension is present])
-               AC_MSG_RESULT(yes),
-               AC_MSG_RESULT(no))
+               AC_MSG_RESULT([yes]),
+               AC_MSG_RESULT([no]))
 
 AC_MSG_CHECKING([for __FUNCTION__ extension])
 AC_TRY_COMPILE(,[(void)__FUNCTION__],
@@ -1646,7 +1645,7 @@ AC_CACHE_VAL([hdf5_cv_printf_ll],
 LD_LIBRARY_PATH="$LD_LIBRARY_PATH`echo $LDFLAGS | sed -e 's/-L/:/g' -e 's/ //g'`"
 export LD_LIBRARY_PATH
 
-for hdf5_cv_printf_ll in l L q ll unknown; do
+for hdf5_cv_printf_ll in l L ll q unknown; do
    AC_TRY_RUN([
 #include <stdio.h>
 #include <stdlib.h>
@@ -1738,10 +1737,10 @@ case "X-$enableval" in
                                     [int fd = 0; gpfs_fcntl(fd, (void *)0);],
                                     AC_DEFINE(HAVE_GPFS, 1,
                                               [Define if we have GPFS support])
-                                    AC_MSG_RESULT(yes)
+                                    AC_MSG_RESULT([yes])
                                     LIBS="$LIBS -lgpfs"
                                     GPFS="yes",
-                                    AC_MSG_RESULT(no)
+                                    AC_MSG_RESULT([no])
                                     GPFS="no"))
     ;;
   X-no|*)
@@ -1769,20 +1768,20 @@ case "X-$DEBUG_PKG" in
   X-|X-yes)
     DEBUG_PKG="d,e,f,g,hg,i,mm,o,p,s,t,v,z"
     CPPFLAGS="$CPPFLAGS -UNDEBUG"
-    AC_MSG_RESULT(default ($DEBUG_PKG))
+    AC_MSG_RESULT([default ($DEBUG_PKG)])
     ;;
   X-all)
     DEBUG_PKG=$all_packages
     CPPFLAGS="$CPPFLAGS -UNDEBUG"
-    AC_MSG_RESULT(all ($DEBUG_PKG))
+    AC_MSG_RESULT([all ($DEBUG_PKG)])
     ;;
   X-no|X-none)
-    AC_MSG_RESULT(none)
+    AC_MSG_RESULT([none])
     DEBUG_PKG=
     CPPFLAGS="$CPPFLAGS -DNDEBUG"
     ;;
   *)
-    AC_MSG_RESULT($DEBUG_PKG)
+    AC_MSG_RESULT([$DEBUG_PKG])
     ;;
 esac
 
@@ -2124,7 +2123,7 @@ dnl
 AC_SUBST([ADD_PARALLEL_FILES]) ADD_PARALLEL_FILES="no"
 
 if test -n "$PARALLEL"; then
-  dnl Should the 'testpar' directory participate in the build?
+  dnl The 'testpar' directory should participate in the build
   TESTPARALLEL=testpar
 
   dnl We are building a parallel library
@@ -2508,7 +2507,7 @@ SEARCH="$SEARCH_RULE`eval $cmd`"
 export SEARCH
 
 dnl We don't need to say when we're entering directories if we're using
-dnl GNU make becuase make does it for us.
+dnl GNU make because make does it for us.
 if test "X$GMAKE" = "Xyes"; then
   AC_SUBST([SETX]) SETX=":"
 else
-- 
cgit v0.12