removed graphlib 1.X support

Author: Gregory L. Lee

ChangeLog

@@ -1,4 +1,5 @@
 2012-11-02 Gregory L. Lee <lee218@llnl.gov>
+	* src/STAT_*.[C,h], config/x_ac_graphlib.m4 : removed graphlib 1.X support
 	* src/STAT_*.[C,h], config/x_ac_mrnet.m4 : removed MRNet 2.X support
 
 2012-11-01 Gregory L. Lee <lee218@llnl.gov>

INSTALL

@@ -11,15 +11,17 @@ Dependent Packages
    STAT has several dependencies
 
    Table 1. STAT Dependent Packages
-   Package     What It Does
+   Package What It Does
    Package Web Page
-   Graphlib    Graph creation, merging, and export
+   Graphlib version 2.0 or greater Graph creation, merging, and
+   export
    https://outreach.scidac.gov/projects/stat/
-   Launchmon   Scalable daemon co-location
+   Launchmon Scalable daemon co-location
    http://sourceforge.net/projects/launchmon/
-   Libdwarf    Debug information parsing (Required by StackWalker)
+   Libdwarf Debug information parsing (Required by StackWalker)
    http://reality.sgiweb.org/davea/dwarf.html
-   MRNet       Scalable multicast and reduction network
+   MRNet version 3.0 or greater Scalable multicast and reduction
+   network
    http://www.paradyn.org/mrnet/
    StackWalker Lightweight stack trace sampling
    http://www.paradyn.org/html/downloads.html

config.h.in

@@ -9,9 +9,6 @@
 /* Define DEBUG flag */
 #undef DEBUG
 
-/* Graphlib 1.6 */
-#undef GRAPHLIB16
-
 /* Graphlib 2.0 */
 #undef GRAPHLIB20
 

config/x_ac_graphlib.m4

@@ -1,5 +1,7 @@
 AC_DEFUN([X_AC_GRAPHLIB], [
+
   AM_CONDITIONAL([ENABLE_GRAPHLIB20], false)
+
   AC_ARG_WITH(graphlib, 
     [AS_HELP_STRING([--with-graphlib=prefix],
       [Add the compile and link search paths for graphlib]
@@ -12,11 +14,13 @@ AC_DEFUN([X_AC_GRAPHLIB], [
     [CXXFLAGS="$CXXFLAGS"]
   )
   AC_LANG_PUSH(C++)
+
   AC_CHECK_HEADER(graphlib.h,
     [],
     [AC_MSG_ERROR([graphlib.h is required.  Specify graphlib prefix with --with-graphlib])],
     AC_INCLUDES_DEFAULT
   )
+
   AC_MSG_CHECKING([Checking Graphlib Version])
   graphlib_vers=1
   AC_COMPILE_IFELSE([#include "graphlib.h"
@@ -28,29 +32,17 @@ AC_DEFUN([X_AC_GRAPHLIB], [
       return 0;
     }],
     [AC_DEFINE([GRAPHLIB20], [], [Graphlib 2.0])
-      AC_DEFINE([GRAPHLIB16], [], [Graphlib 1.6])
       graphlib_vers=2.0
       AM_CONDITIONAL([ENABLE_GRAPHLIB20], true)
     ]
   )
-  if test $graphlib_vers = 1; then
-    AC_COMPILE_IFELSE([#include "graphlib.h"
-      #include <stdlib.h>
-      #include <stdio.h>
-      int main()
-      {
-        unsigned long bufLength;
-        graphlib_serializeGraph(NULL, NULL, &bufLength);
-      }],
-      [AC_DEFINE([GRAPHLIB16], [], [Graphlib 1.6])
-        graphlib_vers=1.6
-      ]
-    )
+  if test "$graphlib_vers" = 1 ; then
+    AC_MSG_ERROR([STAT requires graphlib 2.0 or greater.  Specify graphlib prefix with --with-graphlib])
   fi
   AC_MSG_RESULT([$graphlib_vers])
   AC_CHECK_LIB(lnlgraph,graphlib_newGraph,liblnlgraph_found=yes,liblnlgraph_found=no)
   if test "$liblnlgraph_found" = yes; then
-    CXXFLAGS="$CXXFLAGS -DSTAT_BITVECTOR -DGRL_DYNAMIC_NODE_NAME"
+    CXXFLAGS="$CXXFLAGS"
     FELIBS="$FELIBS -llnlgraph"
     BELIBS="$BELIBS -llnlgraph"
     MWLIBS="$MWLIBS -llnlgraph"

configure

@@ -16380,6 +16380,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
    if false; then
   ENABLE_GRAPHLIB20_TRUE=
   ENABLE_GRAPHLIB20_FALSE='#'
@@ -16389,6 +16390,7 @@ else
 fi
 
 
+
 # Check whether --with-graphlib was given.
 if test "${with_graphlib+set}" = set; then
   withval=$with_graphlib; CXXFLAGS="$CXXFLAGS -I${withval}/include"
@@ -16407,6 +16409,7 @@ ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
 ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
 ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
 
+
   { $as_echo "$as_me:$LINENO: checking for graphlib.h" >&5
 $as_echo_n "checking for graphlib.h... " >&6; }
 if test "${ac_cv_header_graphlib_h+set}" = set; then
@@ -16462,6 +16465,7 @@ $as_echo "$as_me: error: graphlib.h is required.  Specify graphlib prefix with -
 fi
 
 
+
   { $as_echo "$as_me:$LINENO: checking Checking Graphlib Version" >&5
 $as_echo_n "checking Checking Graphlib Version... " >&6; }
   graphlib_vers=1
@@ -16498,11 +16502,6 @@ cat >>confdefs.h <<\_ACEOF
 #define GRAPHLIB20 /**/
 _ACEOF
 
-
-cat >>confdefs.h <<\_ACEOF
-#define GRAPHLIB16 /**/
-_ACEOF
-
       graphlib_vers=2.0
        if true; then
   ENABLE_GRAPHLIB20_TRUE=
@@ -16522,51 +16521,10 @@ sed 's/^/| /' conftest.$ac_ext >&5
 fi
 
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-  if test $graphlib_vers = 1; then
-    cat >conftest.$ac_ext <<_ACEOF
-#include "graphlib.h"
-      #include <stdlib.h>
-      #include <stdio.h>
-      int main()
-      {
-        unsigned long bufLength;
-        graphlib_serializeGraph(NULL, NULL, &bufLength);
-      }
-_ACEOF
-rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:$LINENO: $ac_try_echo\""
-$as_echo "$ac_try_echo") >&5
-  (eval "$ac_compile") 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && {
-	 test -z "$ac_cxx_werror_flag" ||
-	 test ! -s conftest.err
-       } && test -s conftest.$ac_objext; then
-
-cat >>confdefs.h <<\_ACEOF
-#define GRAPHLIB16 /**/
-_ACEOF
-
-        graphlib_vers=1.6
-
-
-else
-  $as_echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  if test "$graphlib_vers" = 1 ; then
+    { { $as_echo "$as_me:$LINENO: error: STAT requires graphlib 2.0 or greater.  Specify graphlib prefix with --with-graphlib" >&5
+$as_echo "$as_me: error: STAT requires graphlib 2.0 or greater.  Specify graphlib prefix with --with-graphlib" >&2;}
+   { (exit 1); exit 1; }; }
   fi
   { $as_echo "$as_me:$LINENO: result: $graphlib_vers" >&5
 $as_echo "$graphlib_vers" >&6; }
@@ -16642,7 +16600,7 @@ else
 fi
 
   if test "$liblnlgraph_found" = yes; then
-    CXXFLAGS="$CXXFLAGS -DSTAT_BITVECTOR -DGRL_DYNAMIC_NODE_NAME"
+    CXXFLAGS="$CXXFLAGS"
     FELIBS="$FELIBS -llnlgraph"
     BELIBS="$BELIBS -llnlgraph"
     MWLIBS="$MWLIBS -llnlgraph"

doc/quickstart/stat_quickstart.pdf

@@ -16,7 +16,7 @@ STAT has several dependencies
 </thead>
 <tbody>
 <row rowsep="0">
-    <entry>Graphlib</entry>
+    <entry>Graphlib version 2.0 or greater</entry>
     <entry>Graph creation, merging, and export</entry>
 </row>
 <row rowsep="1">
@@ -37,7 +37,7 @@ STAT has several dependencies
     <entry namest="c1" nameend="c2"><ulink url="http://reality.sgiweb.org/davea/dwarf.html"></ulink></entry>
 </row>
 <row>
-    <entry>MRNet</entry>
+    <entry>MRNet version 3.0 or greater</entry>
     <entry>Scalable multicast and reduction network</entry>
 </row>
 <row rowsep="1">