[Hamlib-commits] Hamlib -- Ham radio control libraries branch master updated. 34698df17acf6cc2ee72d3944b4149f0f621515a

[n0nb <n0...@us...>]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Hamlib -- Ham radio control libraries".

The branch, master has been updated
       via  34698df17acf6cc2ee72d3944b4149f0f621515a (commit)
       via  285a865d9ff9a0dff484b5c880f3d17097692175 (commit)
      from  d8a3aac62587e7e73cc27d165115a5ee3833baa8 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 34698df17acf6cc2ee72d3944b4149f0f621515a
Merge: d8a3aac62 285a865d9
Author: Nate Bargmann <n0...@n0...>
Date:   Wed Apr 9 14:05:33 2025 -0500

    Merge pull request #1694 from N0NB/static_lib
    
    Restore libtool default of building shared and static libs


commit 285a865d9ff9a0dff484b5c880f3d17097692175
Author: Nate Bargmann <n0...@n0...>
Date:   Wed Apr 9 13:40:53 2025 -0500

    Restore libtool default of building shared and static libs
    
    Commit 43159e5 prevented the libtool default of building both shared and
    static libraries during a compilation run.
    
    This addresses GitHub issue 1500 that seeks to enable both shared and
    static libs.
    
    At this point, I have not found the motivation for commit 43159e5
    despite searching all forums and the mailing list.  While the reason
    might not now be ever known, restoring the default behavior alligns the
    project with other software package.

diff --git a/configure.ac b/configure.ac
index 9bf5390d2..a2b22ed0b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -43,23 +43,23 @@ m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 ## ------------------------------ ##
 ## Hamlib specific configuration. ##
 ## ------------------------------ ##
-AC_ARG_ENABLE([shared],
-              [AS_HELP_STRING([--enable-shared],
-                              [Enable shared libraries @<:@default=yes@:>@])],
-              [enable_shared=$enableval],
-              [enable_shared=yes])
-AC_ARG_ENABLE([static],
-              [AS_HELP_STRING([--enable-static],
-                              [Enable static libraries @<:@default=check@:>@])],
-              [enable_static=$enableval],
-              [enable_static=check])
-
-AS_IF([test "x$enable_static" = "xyes"], [
-    enable_shared=no
-])
-AS_IF([test "x$enable_static" = "xyes" && test "x$enable_shared" = "xyes"], [
-    AC_MSG_ERROR([Both --enable-static and --enable-shared cannot be enabled at the same time.])
-])
+dnl AC_ARG_ENABLE([shared],
+dnl               [AS_HELP_STRING([--enable-shared],
+dnl                               [Enable shared libraries @<:@default=yes@:>@])],
+dnl               [enable_shared=$enableval],
+dnl               [enable_shared=yes])
+dnl AC_ARG_ENABLE([static],
+dnl               [AS_HELP_STRING([--enable-static],
+dnl                               [Enable static libraries @<:@default=check@:>@])],
+dnl               [enable_static=$enableval],
+dnl               [enable_static=check])
+dnl
+dnl AS_IF([test "x$enable_static" = "xyes"], [
+dnl     enable_shared=no
+dnl ])
+dnl AS_IF([test "x$enable_static" = "xyes" && test "x$enable_shared" = "xyes"], [
+dnl     AC_MSG_ERROR([Both --enable-static and --enable-shared cannot be enabled at the same time.])
+dnl ])
 
 dnl New backends must be listed here!  Also the new Makefile path must be
 dnl added to AC_CONFIG_FILES near the end of this file.  See README.developer

-----------------------------------------------------------------------

Summary of changes:
 configure.ac | 34 +++++++++++++++++-----------------
 1 file changed, 17 insertions(+), 17 deletions(-)


hooks/post-receive
-- 
Hamlib -- Ham radio control libraries