Skip to content

Commit 5584bc0

Browse files
Merge pull request #394 from orbea/libtool
config-scripts: Fix --enable-libtool-unsupported
2 parents 8ea6cf8 + fa19220 commit 5584bc0

1 file changed

Lines changed: 13 additions & 12 deletions

File tree

config-scripts/cups-libtool.m4

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,20 +9,21 @@ dnl Licensed under Apache License v2.0. See the file "LICENSE" for more
99
dnl information.
1010
dnl
1111

12-
AC_ARG_ENABLE([libtool_unsupported], AS_HELP_STRING([--enable-libtool-unsupported=/path/to/libtool], [build with libtool (UNSUPPORTED)]), [
13-
AS_IF([test x$enable_libtool_unsupported != xno], [
14-
AS_IF([test x$enable_libtool_unsupported = xyes], [
15-
AC_MSG_ERROR([Use --enable-libtool-unsupported=/path/to/libtool.])
16-
])
17-
LIBTOOL="$enable_libtool_unsupported"
18-
enable_shared="no"
19-
AC_MSG_WARN([WARNING: libtool is not supported.])
20-
], [
21-
LIBTOOL=""
12+
AC_ARG_ENABLE([libtool_unsupported],
13+
AS_HELP_STRING([--enable-libtool-unsupported=/path/to/libtool],
14+
[build with libtool (UNSUPPORTED)]),
15+
[], [enable_libtool_unsupported=no])
16+
17+
AS_IF([test x$enable_libtool_unsupported != xno], [
18+
AS_IF([test x$enable_libtool_unsupported = xyes], [
19+
AC_MSG_ERROR([Use --enable-libtool-unsupported=/path/to/libtool.])
20+
],[
21+
AC_MSG_WARN([libtool is not supported.])
2222
])
23-
])
2423
25-
AS_IF([test x$LIBTOOL != x], [
24+
LIBTOOL="$enable_libtool_unsupported"
25+
enable_shared="no"
26+
2627
DSO="\$(LIBTOOL) --mode=link --tag=CC ${CC}"
2728
DSOXX="\$(LIBTOOL) --mode=link --tag=CXX ${CXX}"
2829

0 commit comments

Comments
 (0)