Changeset 0fd4ad6

Timestamp:

03/16/07 15:32:06 (14 years ago)

Author:

Shane Alcock <salcock@…>

Branches:

4.0.1-hotfixes, cachetimestamps, develop, dpdk-ndag, etsilive, getfragoff, help, libtrace4, master, ndag_format, pfring, rc-4.0.1, rc-4.0.2, rc-4.0.3, rc-4.0.4, ringdecrementfix, ringperformance, ringtimestampfixes

Children:

b778083

Parents:

a1b899f

Message:

Libtrace now makes the DAG driver version number available
Configure didn't seem to deal very well with machines that didn't have DAG

Files:

• configure.in (modified) (3 diffs)
• lib/libtrace.h.in (modified) (1 diff)

configure.in

@@ -177 +177 @@
 libtrace_dag=false
 libtrace_dag2_4=false
+dag_drv_v="DAG not present"
 if test "$with_dag" != no; then
         AC_MSG_CHECKING(whether we have DAG API)
@@ -213 +214 @@
         fi
         AC_MSG_RESULT($libtrace_dag)
-        
-        AC_MSG_CHECKING(if we are using DAG 2.4)
-        if grep '2.4.' $dag_root/VERSION > /dev/null 2>&1; then
-                libtrace_dag2_4=true
-                AC_DEFINE(DAG_VERSION_2_4, 1, [define if using DAG 2.4])
-        else
-                libtrace_dag2_4=false
-        fi
-        AC_MSG_RESULT($libtrace_dag2_4)
-fi
-
+
+        if test "$libtrace_dag" != false; then
+                AC_MSG_CHECKING(if we are using DAG 2.4)
+                if grep '2.4.' $dag_root/VERSION > /dev/null 2>&1; then
+                        libtrace_dag2_4=true
+                        AC_DEFINE(DAG_VERSION_2_4, 1, [define if using DAG 2.4])
+                else
+                        libtrace_dag2_4=false
+                fi
+                AC_MSG_RESULT($libtrace_dag2_4)
+                dag_drv_v=`cat $dag_root/VERSION`
+        fi
+fi
+DAG_VERSION_NUM=$dag_drv_v
 AC_CHECK_LIB(z, gzopen)
 
@@ -248 +252 @@
 AC_SUBST([LIBTRACE_MID])
 AC_SUBST([LIBTRACE_MINOR])
-
+AC_SUBST([DAG_VERSION_NUM])
 dnl and finally, output our Makefiles
 AC_OUTPUT

lib/libtrace.h.in

@@ -132 +132 @@
 
 #define LIBTRACE_SVN_REVISION 0
-
+#define DAG_DRIVER_V "@DAG_VERSION_NUM@"
+    
 #ifdef __cplusplus 
 extern "C" {