OML support

config-userlevel.h.in

@@ -2,6 +2,13 @@
 #ifndef CLICK_CONFIG_USERLEVEL_H
 #define CLICK_CONFIG_USERLEVEL_H
 
+/* Define to use OML (OMF Measurement Library) */
+#undef CLICK_OML
+
+/* Define if you have Sigar header file */
+#undef HAVE_LIBSIGAR_SIGAR_H
+#undef HAVE_SIGAR_H
+
 /* Define if you have the __thread storage class specifier. */
 #undef HAVE___THREAD_STORAGE_CLASS
 

configure

@@ -844,6 +844,7 @@ enable_dmalloc
 enable_valgrind
 enable_schedule_debugging
 enable_intel_cpu
+with_oml
 with_netmap
 with_proper
 with_expat
@@ -1544,6 +1545,7 @@ Optional Packages:
   --with-linux-map[=FILE] filename for Linux System.map [LINUXDIR/System.map]
   --with-freebsd[=SRC,INC] FreeBSD source code is in SRC [/usr/src/sys],
                           include directory is INC [/usr/include]
+  --with-oml              enable OML (OMF Measurement Library) [no]
   --with-netmap           enable netmap [no]
   --with-proper[=PREFIX]  use PlanetLab Proper library (optional)
   --with-expat[=PREFIX]   locate expat XML library (optional)
@@ -10580,6 +10582,49 @@ done
 
 
 
+# Check whether --with-oml was given.
+if test "${with_oml+set}" = set; then :
+  withval=$with_oml; :
+else
+  with_oml=no
+fi
+
+if test "$with_oml" = yes; then 
+
+  ac_fn_cxx_check_header_mongrel "$LINENO" "oml2/omlc.h" "ac_cv_header_oml2_omlc_h" "$ac_includes_default"
+  if test "x$ac_cv_header_oml2_omlc_h" = xyes; then :
+    cat >>confdefs.h <<_ACEOF
+#define CLICK_OML
+_ACEOF
+  LIBS="-loml2  $LIBS"
+  else
+    as_fn_error $? "
+=========================================
+
+Can't find OML header file 'oml2/omlc.h'.
+Try again without '--with-oml'.
+
+=========================================" "$LINENO" 5
+  fi
+fi
+
+# Check whether Sigar header file is available.
+ac_fn_cxx_check_header_mongrel "$LINENO" "libsigar/sigar.h" "ac_cv_header_libsigar_sigar_h" "$ac_includes_default"
+if test "x$ac_cv_header_libsigar_sigar_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBSIGAR_SIGAR_H
+_ACEOF
+  LIBS="-lsigar  $LIBS"
+else
+  ac_fn_cxx_check_header_mongrel "$LINENO" "sigar.h" "ac_cv_header_sigar_h" "$ac_includes_default"
+  if test "x$ac_cv_header_sigar_h" = xyes; then :
+    cat >>confdefs.h <<_ACEOF
+#define HAVE_SIGAR_H
+_ACEOF
+  LIBS="-lsigar  $LIBS"
+  fi
+fi
+
 # Check whether --with-netmap was given.
 if test "${with_netmap+set}" = set; then :
   withval=$with_netmap; use_netmap=$withval

configure.in

@@ -993,6 +993,15 @@ dnl
 dnl more features
 dnl
 
+dnl OML (OMF Measurement Library)
+
+AC_ARG_WITH([oml],
+    [AS_HELP_STRING([[--with-oml]], [support OML (OMF Measurement Library) measurements])],
+    [:], [with_oml=no])
+if test "$with_oml" = yes; then
+    AC_DEFINE_UNQUOTED([CLICK_OML], $with_oml)
+fi
+
 dnl statistics
 
 AC_ARG_ENABLE(stats, [[  --enable-stats[=LEVEL]  enable statistics collection]], :, enable_stats=no)