From f0def17b8513dd42d0f2a5a4e3ad24c219ef4a4f Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 26 Sep 2022 12:37:52 +0200
Subject: [PATCH] New pre version: 6.0.0.PRE

---
 CHANGELOG.md   |   4 ++
 README.md      |   2 +-
 configure      | 124 +++++++++++++++++++++++++++----------------------
 configure.ac   |   7 +--
 doc/DEVELOP.md |   1 +
 5 files changed, 79 insertions(+), 59 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 34500dc4..97bc23bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Clixon Changelog
 
+* [6.0.0](#600) Expected: November 2022
 * [5.9.0](#590) 24 September 2022
 * [5.8.0](#580) 28 July 2022
 * [5.7.0](#570) 17 May 2022
@@ -36,6 +37,9 @@
 * [3.3.2](#332) Aug 27 2017
 * [3.3.1](#331) June 7 2017
 
+## 6.0.0
+Expected: November 2022
+
 ## 5.9.0
 24 September 2022
 
diff --git a/README.md b/README.md
index 429ea0ed..7fab0f3b 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ See [documentation](https://clixon-docs.readthedocs.io), [project page](https://
 Clixon is open-source and dual licensed. Either Apache License, Version 2.0 or GNU
 General Public License Version 2; you choose, see [LICENSE.md](LICENSE.md).
 
-Clixon has a master branch continuously tested with CI, but releases are made ca every second month. Latest 5.8.0 release is from July 2022. Next is planned for September 2022. See [CHANGELOG.md](CHANGELOG.md) release history.
+Clixon has a master branch continuously tested with CI, but releases are made ca every second month. Latest 5.9.0 release is from September 2022. Next is planned for November 2022. See [CHANGELOG.md](CHANGELOG.md) release history.
 
 Clixon interaction is best done posting issues, pull requests, or joining the
 [slack channel](https://clixondev.slack.com).
diff --git a/configure b/configure
index 6c22ca24..1b701d7b 100755
--- a/configure
+++ b/configure
@@ -2273,10 +2273,10 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 
-CLIXON_VERSION_MAJOR="5"
-CLIXON_VERSION_MINOR="9"
+CLIXON_VERSION_MAJOR="6"
+CLIXON_VERSION_MINOR="0"
 CLIXON_VERSION_PATCH="0"
-CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\""
+CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}.PRE\""
 
 # Debug flag
 # Check whether --enable-debug was given.
@@ -4639,58 +4639,6 @@ $as_echo "publish is $ac_enable_publish" >&6; }
 
 if test "$ac_enable_publish" = "yes"; then
    # publish streams uses libcurl
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_global_init in -lcurl" >&5
-$as_echo_n "checking for curl_global_init in -lcurl... " >&6; }
-if ${ac_cv_lib_curl_curl_global_init+:} false; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lcurl  $LIBS"
-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-/* Override any GCC internal prototype to avoid an error.
-   Use char because int might match the return type of a GCC
-   builtin and then its argument prototype would still apply.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-char curl_global_init ();
-int
-main ()
-{
-return curl_global_init ();
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_c_try_link "$LINENO"; then :
-  ac_cv_lib_curl_curl_global_init=yes
-else
-  ac_cv_lib_curl_curl_global_init=no
-fi
-rm -f core conftest.err conftest.$ac_objext \
-    conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_global_init" >&5
-$as_echo "$ac_cv_lib_curl_curl_global_init" >&6; }
-if test "x$ac_cv_lib_curl_curl_global_init" = xyes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBCURL 1
-_ACEOF
-
-  LIBS="-lcurl $LIBS"
-
-else
-  as_fn_error $? "libcurl missing" "$LINENO" 5
-fi
-
-
-$as_echo "#define CLIXON_PUBLISH_STREAMS 1" >>confdefs.h
-
-fi
-
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
@@ -4951,6 +4899,72 @@ fi
 done
 
 
+for ac_header in curl.h
+do :
+  ac_fn_c_check_header_mongrel "$LINENO" "curl.h" "ac_cv_header_curl_h" "$ac_includes_default"
+if test "x$ac_cv_header_curl_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_CURL_H 1
+_ACEOF
+
+else
+  as_fn_error $? "curl missing" "$LINENO" 5
+fi
+
+done
+
+   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_global_init in -lcurl" >&5
+$as_echo_n "checking for curl_global_init in -lcurl... " >&6; }
+if ${ac_cv_lib_curl_curl_global_init+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lcurl  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char curl_global_init ();
+int
+main ()
+{
+return curl_global_init ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_link "$LINENO"; then :
+  ac_cv_lib_curl_curl_global_init=yes
+else
+  ac_cv_lib_curl_curl_global_init=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_curl_curl_global_init" >&5
+$as_echo "$ac_cv_lib_curl_curl_global_init" >&6; }
+if test "x$ac_cv_lib_curl_curl_global_init" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBCURL 1
+_ACEOF
+
+  LIBS="-lcurl $LIBS"
+
+else
+  as_fn_error $? "libcurl missing" "$LINENO" 5
+fi
+
+
+$as_echo "#define CLIXON_PUBLISH_STREAMS 1" >>confdefs.h
+
+fi
+
 for ac_header in cligen/cligen.h
 do :
   ac_fn_c_check_header_mongrel "$LINENO" "cligen/cligen.h" "ac_cv_header_cligen_cligen_h" "$ac_includes_default"
diff --git a/configure.ac b/configure.ac
index f8b4d5e7..17bdea01 100644
--- a/configure.ac
+++ b/configure.ac
@@ -47,10 +47,10 @@ AC_INIT(lib/clixon/clixon.h.in)
 # where autotool scripts are: install-sh, config.sub, config.guess
 AC_CONFIG_AUX_DIR(config-aux)
 
-CLIXON_VERSION_MAJOR="5"
-CLIXON_VERSION_MINOR="9"
+CLIXON_VERSION_MAJOR="6"
+CLIXON_VERSION_MINOR="0"
 CLIXON_VERSION_PATCH="0"
-CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\""
+CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}.PRE\""
 
 # Debug flag
 AC_ARG_ENABLE(debug, AS_HELP_STRING([--enable-debug],[Build with debug symbols, default: no]),[
@@ -204,6 +204,7 @@ AC_MSG_RESULT(publish is $ac_enable_publish)
 
 if test "$ac_enable_publish" = "yes"; then
    # publish streams uses libcurl
+   AC_CHECK_HEADERS(curl.h,[], AC_MSG_ERROR([curl missing]))	
    AC_CHECK_LIB(curl, curl_global_init,, AC_MSG_ERROR([libcurl missing]))
    AC_DEFINE(CLIXON_PUBLISH_STREAMS, 1, [Enable publish of notification streams using SSE and curl])
 fi
diff --git a/doc/DEVELOP.md b/doc/DEVELOP.md
index f360dde2..9d2c2d25 100644
--- a/doc/DEVELOP.md
+++ b/doc/DEVELOP.md
@@ -276,6 +276,7 @@ gdb clixon_cli
 What to think about when doing a new release.
 * Ensure all tests run OK
 * review CHANGELOG, write one-liner
+* review README.md wording about latest release
 * New yang/clicon/clixon-config@XXX.yang revision?
 * In configure.ac, for minor releases change CLIXON_VERSION in configure.ac to eg: (minor should have been bumped):
 ```