Cleanup for libtool fixes (Issue #394)

diff --git a/CHANGES.md b/CHANGES.md
index 63a02c8aa1be7890cba7a5abcb79358123c5c716..381a943e601d7dd6985d0483f12abf838619ba7a 100644 (file)
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -5,6 +5,7 @@ Changes in CUPS v2.4.3 (TBA)
 ----------------------------
 
 - Added a title with device uri for found network printers (Issues #402, #393)
+- Fixed `--enable-libtool-unsupported` (Issue #394)
 - Fixed configuration on RISC-V machines (Issue #404)
 - Fixed the `device_uri` invalid pointer for driverless printers with `.local`
   hostname (Issue #419)

diff --git a/config-scripts/cups-libtool.m4 b/config-scripts/cups-libtool.m4
index 80f6158cd9d3a1fa240622eded6a1d741046ed71..e084c793b69f462955c6815755facbd6d8625674 100644 (file)
--- a/config-scripts/cups-libtool.m4
+++ b/config-scripts/cups-libtool.m4
@@ -1,5 +1,5 @@
 dnl
-dnl Libtool stuff for CUPS.
+dnl GNU libtool stuff for CUPS.
 dnl
 dnl Copyright © 2021-2022 by OpenPrinting.
 dnl Copyright © 2007-2018 by Apple Inc.
@@ -9,14 +9,16 @@ dnl Licensed under Apache License v2.0.  See the file "LICENSE" for more
 dnl information.
 dnl
 
-AC_ARG_ENABLE([libtool_unsupported],
-    AS_HELP_STRING([--enable-libtool-unsupported=/path/to/libtool],
-        [build with libtool (UNSUPPORTED)]),
-    [], [enable_libtool_unsupported=no])
+AC_ARG_ENABLE([libtool_unsupported], [
+    AS_HELP_STRING([--enable-libtool-unsupported=/path/to/libtool], [build with libtool (UNSUPPORTED)])
+], [
+], [
+    enable_libtool_unsupported=no
+])
 
 AS_IF([test x$enable_libtool_unsupported != xno], [
-    AS_IF([test x$enable_libtool_unsupported = xyes], [
-        AC_MSG_ERROR([Use --enable-libtool-unsupported=/path/to/libtool.])
+    AS_IF([test "x$enable_libtool_unsupported" = xyes], [
+        AC_MSG_ERROR([Use '--enable-libtool-unsupported=/path/to/libtool'.])
     ],[
         AC_MSG_WARN([libtool is not supported.])
     ])

diff --git a/configure b/configure
index c44cb8619d6428f8df36ab1e4a1d950f26373dd9..e48a2d3ea4964b1999c2468e0b5cd0cb94a3eddb 100755 (executable)
--- a/configure
+++ b/configure
@@ -1586,8 +1586,10 @@ Optional Features:
   --enable-acl            build with POSIX ACL support
   --disable-dbus          build without DBUS support
   --disable-shared        do not create shared libraries
-  --enable-libtool-unsupported=/path/to/libtool
+
+      --enable-libtool-unsupported=/path/to/libtool
                           build with libtool (UNSUPPORTED)
+
   --enable-debug          build with debugging symbols
   --enable-debug-guards   build with memory allocation guards
   --enable-debug-printfs  build with CUPS_DEBUG_LOG support
@@ -7856,31 +7858,31 @@ fi
 if test ${enable_libtool_unsupported+y}
 then :
   enableval=$enable_libtool_unsupported;
-    if test x$enable_libtool_unsupported != xno
-then :
 
-       if test x$enable_libtool_unsupported = xyes
-then :
+else $as_nop
 
-           as_fn_error $? "Use --enable-libtool-unsupported=/path/to/libtool." "$LINENO" 5
+    enable_libtool_unsupported=no
 
 fi
-       LIBTOOL="$enable_libtool_unsupported"
-       enable_shared="no"
-       { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: WARNING: libtool is not supported." >&5
-printf "%s\n" "$as_me: WARNING: WARNING: libtool is not supported." >&2;}
 
-else $as_nop
 
-       LIBTOOL=""
+if test x$enable_libtool_unsupported != xno
+then :
 
-fi
+    if test "x$enable_libtool_unsupported" = xyes
+then :
 
-fi
+        as_fn_error $? "Use '--enable-libtool-unsupported=/path/to/libtool'." "$LINENO" 5
 
+else $as_nop
 
-if test x$LIBTOOL != x
-then :
+        { printf "%s\n" "$as_me:${as_lineno-$LINENO}: WARNING: libtool is not supported." >&5
+printf "%s\n" "$as_me: WARNING: libtool is not supported." >&2;}
+
+fi
+
+    LIBTOOL="$enable_libtool_unsupported"
+    enable_shared="no"
 
     DSO="\$(LIBTOOL) --mode=link --tag=CC ${CC}"
     DSOXX="\$(LIBTOOL) --mode=link --tag=CXX ${CXX}"