From 411a67f9d6b024ee6d1c110036fab2f723f62f1d Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 20 Feb 2023 09:40:12 +0100
Subject: [PATCH] Start of 6.2.0.PRE development. Removed autoconf requirement
 to have libcurl

---
 .github/workflows/ci.yml |  2 +-
 CHANGELOG.md             |  4 ++++
 configure                | 25 ++++---------------------
 configure.ac             | 18 ++++++------------
 4 files changed, 15 insertions(+), 34 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0f503a37..222f13f0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
     - name: install cligen
       run: (git clone https://github.com/clicon/cligen.git && cd cligen && ./configure && make && sudo make install)
     - name: install dependencies
-      run: sudo apt install -y libssl-dev libnghttp2-dev libcurl4-openssl-dev
+      run: sudo apt install -y libssl-dev libnghttp2-dev
     - name: configure
       run: ./configure
 # 2) Use docker for tests
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3ce5cf28..0d4e90cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 # Clixon Changelog
 
+* [6.2.0](#620) Expected: April 2023
 * [6.1.0](#610) 19 Feb 2023
 * [6.0.0](#600) 29 Nov 2022
 * [5.9.0](#590) 24 September 2022
@@ -38,6 +39,9 @@
 * [3.3.2](#332) Aug 27 2017
 * [3.3.1](#331) June 7 2017
 
+## 6.2.0
+Expected: April 2023
+
 ## 6.1.0
 19 Feb 2023
 
diff --git a/configure b/configure
index cfbffb27..65def8d0 100755
--- a/configure
+++ b/configure
@@ -726,7 +726,6 @@ enable_option_checking
 enable_debug
 with_cligen
 enable_yang_patch
-with_libcurl
 enable_publish
 with_restconf
 enable_http1
@@ -1392,8 +1391,6 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-cligen=dir       Use CLIGEN installation in this dir
-  --without-libcurl       Disable use of libcurl, affects publish
-                          notification, including clixon_util_stream
   --with-restconf=native  Integration with embedded web server (DEFAULT)
   --with-restconf=fcgi    FCGI interface for stand-alone web rev-proxy eg
                           nginx
@@ -2284,9 +2281,9 @@ ac_configure="$SHELL $ac_aux_dir/configure"  # Please don't use this var.
 
 
 CLIXON_VERSION_MAJOR="6"
-CLIXON_VERSION_MINOR="1"
+CLIXON_VERSION_MINOR="2"
 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.
@@ -4683,16 +4680,7 @@ $as_echo "#define CLIXON_YANG_PATCH 1" >>confdefs.h
 
 fi
 
-# publish streams uses libcurl
-
-# Check whether --with-libcurl was given.
-if test "${with_libcurl+set}" = set; then :
-  withval=$with_libcurl; with_libcurl=$withval
-else
-  with_libcurl=yes
-fi
-
-if test "x${with_libcurl}" != "xno"; then
+# Check curl, needed for tests but not for clixon core
 
 { $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; }
@@ -4961,13 +4949,11 @@ if test "x$ac_cv_header_curl_curl_h" = xyes; then :
 #define HAVE_CURL_CURL_H 1
 _ACEOF
 
-else
-  as_fn_error $? "curl header(s) missing" "$LINENO" 5
 fi
 
 done
 
-   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for curl_global_init in -lcurl" >&5
+{ $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
@@ -5010,11 +4996,8 @@ _ACEOF
 
   LIBS="-lcurl $LIBS"
 
-else
-  as_fn_error $? "libcurl missing" "$LINENO" 5
 fi
 
-fi
 
 # Experimental: Curl publish notification stream to eg Nginx nchan.
 # Check whether --enable-publish was given.
diff --git a/configure.ac b/configure.ac
index 1a4d6daf..57e57f75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -48,9 +48,9 @@ AC_INIT(lib/clixon/clixon.h.in)
 AC_CONFIG_AUX_DIR(config-aux)
 
 CLIXON_VERSION_MAJOR="6"
-CLIXON_VERSION_MINOR="1"
+CLIXON_VERSION_MINOR="2"
 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]),[
@@ -201,16 +201,10 @@ if test "${enable_yang_patch}" = "yes"; then
    AC_DEFINE(CLIXON_YANG_PATCH, 1, [Enable YANG patch, RFC 8072])
 fi
 
-# publish streams uses libcurl
-AC_ARG_WITH([libcurl],
-	[AS_HELP_STRING([--without-libcurl],
-	   [Disable use of libcurl, affects publish notification, including clixon_util_stream])],
-	[with_libcurl=$withval],[with_libcurl=yes])
-if test "x${with_libcurl}" != "xno"; then
-   AC_CHECK_HEADERS(curl/curl.h,[], AC_MSG_ERROR([curl header(s) missing]))
-   AC_CHECK_LIB(curl, curl_global_init,, AC_MSG_ERROR([libcurl missing]))
-fi
-
+# Check curl, needed for tests but not for clixon core
+AC_CHECK_HEADERS(curl/curl.h,[])
+AC_CHECK_LIB(curl, curl_global_init)
+   
 # Experimental: Curl publish notification stream to eg Nginx nchan. 
 AC_ARG_ENABLE(publish, AS_HELP_STRING([--enable-publish],
 	[Enable publish of notification streams using SSE and curl]),[