From 285a865d9ff9a0dff484b5c880f3d17097692175 Mon Sep 17 00:00:00 2001 From: Nate Bargmann Date: Wed, 9 Apr 2025 13:40:53 -0500 Subject: [PATCH] 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. --- configure.ac | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) 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