Merge branch 'master' of https://github.com/clicon/clixon

CHANGELOG.md

@@ -19,7 +19,7 @@
 
 ### Minor changes
 * Removed unnecessary configure dependencies
-  * libnsl, libcrypt, libm, if_vlan,...
+  * libnsl, libcrypt, if_vlan,...
 * pseudo-plugin added, to enable callbacks also for main programs. Useful for extensions
 
 ### Corrected Bugs

apps/cli/cli_generate.c

@@ -52,7 +52,6 @@
 #include <fcntl.h>
 #include <syslog.h>
 #include <sys/param.h>
-#include <math.h> /* For pow() kludge in cvtype_max2str_dup2 */
 
 /* cligen */
 #include <cligen/cligen.h>

configure.ac

@@ -61,6 +61,7 @@ AC_DEFINE_UNQUOTED(CLIXON_VERSION_MAJOR, $CLIXON_VERSION_MAJOR, [Clixon major re
 AC_DEFINE_UNQUOTED(CLIXON_VERSION_MINOR, $CLIXON_VERSION_MINOR, [Clixon minor release])
 AC_DEFINE_UNQUOTED(CLIXON_VERSION_PATCH, $CLIXON_VERSION_PATCH, [Clixon path version])
 
+AC_CHECK_LIB(m, main)
 
 # AC_SUBST(var) makes @var@ appear in makefiles.
 # clixon versions spread to Makefile's (.so files) and variable in build.c
@@ -91,6 +92,7 @@ AC_SUBST(with_restconf) # If yes, compile apps/restconf
 AC_SUBST(enable_stdyangs) 
 AC_SUBST(wwwdir,/www-data)
 AC_SUBST(wwwuser,www-data)
+
 #
 AC_PROG_CC()
 AC_PROG_CPP

example/main/example_cli.c

@@ -39,7 +39,6 @@
 #include <syslog.h>
 #include <unistd.h>
 #include <assert.h>
-#include <math.h>
 #include <sys/stat.h>
 #include <sys/time.h>
 #include <sys/param.h>

include/clixon_config.h.in

@@ -42,6 +42,9 @@
 /* Define to 1 if you have the `fcgi' library (-lfcgi). */
 #undef HAVE_LIBFCGI
 
+/* Define to 1 if you have the `m' library (-lm). */
+#undef HAVE_LIBM
+
 /* Define to 1 if you have the `socket' library (-lsocket). */
 #undef HAVE_LIBSOCKET
 

lib/src/clixon_xpath.c

@@ -70,7 +70,6 @@
 #include <assert.h>
 #include <syslog.h>
 #include <fcntl.h>
-#include <math.h>
 
 /* cligen */
 #include <cligen/cligen.h>

lib/src/clixon_xpath_ctx.c

@@ -45,7 +45,7 @@
 #include <assert.h>
 #include <syslog.h>
 #include <fcntl.h>
-#include <math.h>
+#include <math.h>  /* NaN */
 
 /* cligen */
 #include <cligen/cligen.h>

lib/src/clixon_xpath_eval.c

@@ -68,7 +68,7 @@
 #include <assert.h>
 #include <syslog.h>
 #include <fcntl.h>
-#include <math.h>
+#include <math.h> /* NaN */
 
 /* cligen */
 #include <cligen/cligen.h>