[svn-r13928] Purpose: 1) Moving H5_CXX_HAVE_OFFSETOF macro to src/H5pubconf.h file.

         2) Removing configuration of c++/src/H5cxx_pubconf.h file.

Reasoning: the additional pubconf file caused compilation complications, this is cleaner.

Tested:  kagiso, smirom

1 files changed, 25 insertions, 47 deletions

diff --git a/configure b/configure
index 7686b80..8643a79 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Id: configure.in 13913 2007-06-25 22:42:04Z epourmal .
+# From configure.in Id: configure.in 13925 2007-06-28 20:36:08Z mcgreevy .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.61 for HDF5 1.8.0-beta2post1.
 #
@@ -6529,12 +6529,6 @@ fi
 
 
 
-  ac_config_headers="$ac_config_headers c++/src/H5cxx_config.h"
-
-
-  ac_config_commands="$ac_config_commands default-2"
-
-
   { echo "$as_me:$LINENO: checking if $CXX has offsetof extension" >&5
 echo $ECHO_N "checking if $CXX has offsetof extension... $ECHO_C" >&6; }
     cat >conftest.$ac_ext <<_ACEOF
@@ -6593,7 +6587,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
        } && test -s conftest.$ac_objext; then
 
 cat >>confdefs.h <<\_ACEOF
-#define HAVE_OFFSETOF 1
+#define CXX_HAVE_OFFSETOF 1
 _ACEOF
 
     { echo "$as_me:$LINENO: result: yes" >&5
@@ -7927,7 +7921,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 7930 "configure"' > conftest.$ac_ext
+  echo '#line 7924 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -10201,11 +10195,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:10204: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10198: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10208: \$? = $ac_status" >&5
+   echo "$as_me:10202: \$? = $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.
@@ -10469,11 +10463,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:10472: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10466: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:10476: \$? = $ac_status" >&5
+   echo "$as_me:10470: \$? = $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.
@@ -10573,11 +10567,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:10576: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:10570: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:10580: \$? = $ac_status" >&5
+   echo "$as_me:10574: \$? = $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
@@ -12953,7 +12947,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 12956 "configure"
+#line 12950 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13053,7 +13047,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 13056 "configure"
+#line 13050 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -15405,11 +15399,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:15408: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15402: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15412: \$? = $ac_status" >&5
+   echo "$as_me:15406: \$? = $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.
@@ -15509,11 +15503,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:15512: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15506: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15516: \$? = $ac_status" >&5
+   echo "$as_me:15510: \$? = $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
@@ -17079,11 +17073,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:17082: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17076: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17086: \$? = $ac_status" >&5
+   echo "$as_me:17080: \$? = $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.
@@ -17183,11 +17177,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:17186: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17180: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17190: \$? = $ac_status" >&5
+   echo "$as_me:17184: \$? = $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
@@ -19381,11 +19375,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:19384: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19378: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19388: \$? = $ac_status" >&5
+   echo "$as_me:19382: \$? = $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.
@@ -19649,11 +19643,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:19652: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19646: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:19656: \$? = $ac_status" >&5
+   echo "$as_me:19650: \$? = $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.
@@ -19753,11 +19747,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:19756: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:19750: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:19760: \$? = $ac_status" >&5
+   echo "$as_me:19754: \$? = $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
@@ -53224,7 +53218,6 @@ cat >>$CONFIG_STATUS <<_ACEOF
 
 AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
 
-
 _ACEOF
 
 cat >>$CONFIG_STATUS <<\_ACEOF
@@ -53236,8 +53229,6 @@ do
     "src/H5config.h") CONFIG_HEADERS="$CONFIG_HEADERS src/H5config.h" ;;
     "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
     "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
-    "c++/src/H5cxx_config.h") CONFIG_HEADERS="$CONFIG_HEADERS c++/src/H5cxx_config.h" ;;
-    "default-2") CONFIG_COMMANDS="$CONFIG_COMMANDS default-2" ;;
     "src/libhdf5.settings") CONFIG_FILES="$CONFIG_FILES src/libhdf5.settings" ;;
     "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
     "src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
@@ -54160,19 +54151,6 @@ echo "$as_me: error: cannot create directory $as_dir" >&2;}
   done
 done
  ;;
-    "default-2":C)
-    echo "creating c++/src/H5cxx_pubconf.h"
-    sed 's/#define /#define H5_CXX_/' <c++/src/H5cxx_config.h |\
-      sed 's/#undef /#undef H5_CXX_/' >pubconf
-    if test ! -f c++/src/H5cxx_pubconf.h; then
-      /bin/mv -f pubconf c++/src/H5cxx_pubconf.h
-    elif (diff pubconf c++/src/H5cxx_pubconf.h >/dev/null); then
-      rm -f pubconf
-      echo "c++/src/H5cxx_pubconf.h is unchanged"
-    else
-      /bin/mv -f pubconf c++/src/H5cxx_pubconf.h
-    fi
-   ;;
 
   esac
 done # for ac_tag