Merge branch 'develop'

Copyright

@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2007-2015, Juniper Networks Inc.
+ * Copyright (c) 2007-2017, Juniper Networks Inc.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without

bin/gt

@@ -101,12 +101,16 @@ case "$op" in
         git remote show origin
         ;;
 
-    log)
+    clog)
        colors='--format=format:%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(dim white) - %an%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n %C(white)%s%C(reset)'
 	git log --graph --abbrev-commit --decorate --all "${colors}" "$@"
         echo ''
 	;;
 
+    log)
+        git log "$@"
+        ;;
+
     make-gh-pages)
         url=`git config --get remote.origin.url`
 	base=`basename "$url" .git`

configure.ac

@@ -105,25 +105,34 @@ AM_CONDITIONAL([SLAX_WARNINGS_HIGH], [test "$SLAX_WARNINGS" != "no"])
 AC_MSG_CHECKING([whether to build with debugging])
 AC_ARG_ENABLE([debug],
     [  --enable-debug    Turn on debugging],
-    [SLAX_DEBUG=yes; AC_DEFINE([SLAX_DEBUG], [1], [Enable debugging])],
+    [SLAX_DEBUG=$enableval],
     [SLAX_DEBUG=no])
 AC_MSG_RESULT([$SLAX_DEBUG])
+if test "$SLAX_DEBUG" != "no"; then
+    AC_DEFINE([SLAX_DEBUG], [1], [Enable debugging])
+fi
 AM_CONDITIONAL([SLAX_DEBUG], [test "$SLAX_DEBUG" != "no"])
 
 AC_MSG_CHECKING([whether to build with readline])
 AC_ARG_ENABLE([readline],
     [  --enable-readline    Enable support for GNU readline],
-    [HAVE_READLINE=yes; AC_DEFINE([HAVE_READLINE], [1], [Support readline])],
+    [HAVE_READLINE=$enableval],
     [HAVE_READLINE=no])
 AC_MSG_RESULT([$HAVE_READLINE])
+if test "$HAVE_READLINE" != "no"; then
+    AC_DEFINE([HAVE_READLINE], [1], [Support readline])
+fi
 AM_CONDITIONAL([HAVE_READLINE], [test "$HAVE_READLINE" != "no"])
 
 AC_MSG_CHECKING([whether to build with libedit])
 AC_ARG_ENABLE([libedit],
     [  --enable-libedit    Enable support for libedit (BSD readline)],
-    [HAVE_LIBEDIT=yes; AC_DEFINE([HAVE_LIBEDIT], [1], [Support libedit])],
+    [HAVE_LIBEDIT=$enableval],
     [HAVE_LIBEDIT=no])
 AC_MSG_RESULT([$HAVE_LIBEDIT])
+if test "$HAVE_LIBEDIT" != "no"; then
+    AC_DEFINE([HAVE_LIBEDIT], [1], [Support libedit])
+fi
 AM_CONDITIONAL([HAVE_LIBEDIT], [test "$HAVE_LIBEDIT" != "no"])
 
 AC_MSG_CHECKING([compiler for gcc])
@@ -415,6 +424,96 @@ AC_COMPILE_IFELSE(
     ]
 )
 
+# Look for "struct clockinfo" for sysctl printing
+AC_MSG_CHECKING([for struct clockinfo])
+AC_COMPILE_IFELSE(
+    [AC_LANG_PROGRAM([[
+#include <sys/types.h>
+#include <sys/time.h>
+]],
+                     [[struct clockinfo ci; ci.hz = 0;]])],
+    [
+        AC_MSG_RESULT([yes])
+        AC_DEFINE_UNQUOTED([HAVE_CLOCKINFO], 1,
+	                   [Define to 1 if you have the `clockinfo' struct.])
+    ],
+    [
+        AC_MSG_RESULT([no])
+    ]
+)
+
+# Look for "struct clockinfo" tickadj for sysctl printing
+AC_MSG_CHECKING([for struct clockinfo.tickadj])
+AC_COMPILE_IFELSE(
+    [AC_LANG_PROGRAM([[
+#include <sys/types.h>
+#include <sys/time.h>
+]],
+                     [[struct clockinfo ci; ci.tickadj = 0;]])],
+    [
+        AC_MSG_RESULT([yes])
+        AC_DEFINE_UNQUOTED([HAVE_CLOCKINFO_TICKADJ], 1,
+	                   [Define to 1 if you have the `clockinfo.tickadj' fiel.])
+    ],
+    [
+        AC_MSG_RESULT([no])
+    ]
+)
+
+# Look for "struct loadavg" for sysctl printing
+AC_MSG_CHECKING([for struct loadavg])
+AC_COMPILE_IFELSE(
+    [AC_LANG_PROGRAM([[
+#include <sys/types.h>
+#include <sys/resource.h>
+#include <sys/sysctl.h>
+]],
+                     [[struct loadavg la; la.fscale = 0;]])],
+    [
+        AC_MSG_RESULT([yes])
+        AC_DEFINE_UNQUOTED([HAVE_LOADAVG], 1,
+	                   [Define to 1 if you have the `loadavg' struct.])
+    ],
+    [
+        AC_MSG_RESULT([no])
+    ]
+)
+
+# Look for "struct xsw_usage" for sysctl printing
+AC_MSG_CHECKING([for struct xsw_usage])
+AC_COMPILE_IFELSE(
+    [AC_LANG_PROGRAM([[
+#include <sys/types.h>
+#include <sys/sysctl.h>
+]],
+                     [[struct xsw_usage xsu; xsu.xsu_total = 0;]])],
+    [
+        AC_MSG_RESULT([yes])
+        AC_DEFINE_UNQUOTED([HAVE_XSW_USAGE], 1,
+	                   [Define to 1 if you have the `xsw_usage' struct.])
+    ],
+    [
+        AC_MSG_RESULT([no])
+    ]
+)
+
+# Look for "dev_t" for sysctl printing
+AC_MSG_CHECKING([for struct dev_t])
+AC_COMPILE_IFELSE(
+    [AC_LANG_PROGRAM([[
+#include <sys/types.h>
+]],
+                     [[dev_t dev; dev = 0;]])],
+    [
+        AC_MSG_RESULT([yes])
+        AC_DEFINE_UNQUOTED([HAVE_DEV_T], 1,
+	                   [Define to 1 if you have the `dev_t' type.])
+    ],
+    [
+        AC_MSG_RESULT([no])
+    ]
+)
+
 case $host_os in
      darwin-13*)
 #        LIBTOOL=libtool

doc/Makefile.am

@@ -72,7 +72,7 @@ OXTRADOC_SRC_FILES = \
 
 EXTRA_DIST += ${OXTRADOC_SRC_FILES}
 
-doc docs: ${OUTPUT}.txt ${OUTPUT}.html
+doc docs: ${OUTPUT}.txt ${OUTPUT}.html html
 
 ${OUTPUT}.txt: ${INPUT} ${OXTRADOC}
 	${OXTRADOC_CMD} -m text -o $@ $<
@@ -111,3 +111,14 @@ uninstall-hook:
 		${RM} -f ${OXTRADOC_INSTALL_DIR}/`basename $$file` ; \
         done
 	${RM} -f ${DESTDIR}${bindir}/oxtradoc
+
+SPHINX = python3 -msphinx
+
+html sphinx sphinx-html:
+	${GREP} '.. admonition: ' ${srcdir}/*rst; true
+	${SPHINX} -M html ${srcdir} sphinx
+
+clean-local: sphinx-clean
+
+sphinx-clean:
+	${SPHINX} -M clean ${srcdir} sphinx