From: Michael R Sweet Date: Sun, 17 Jul 2022 22:52:35 +0000 (-0400) Subject: Fix link libraries on AIX (Issue #375) X-Git-Tag: v2.4.3~163 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cac6d48addd4be360ef558fbd0cdc3ccfe72505d;p=thirdparty%2Fcups.git Fix link libraries on AIX (Issue #375) --- diff --git a/config-scripts/cups-sharedlibs.m4 b/config-scripts/cups-sharedlibs.m4 index 6e1e092b38..53e331ac3a 100644 --- a/config-scripts/cups-sharedlibs.m4 +++ b/config-scripts/cups-sharedlibs.m4 @@ -1,7 +1,7 @@ dnl dnl Shared library support for CUPS. dnl -dnl Copyright © 2021 by OpenPrinting. +dnl Copyright © 2021-2022 by OpenPrinting. dnl Copyright © 2007-2018 by Apple Inc. dnl Copyright © 1997-2005 by Easy Software Products, all rights reserved. dnl @@ -84,6 +84,9 @@ AC_SUBST([LIBCUPSSTATIC]) AS_IF([test x$enable_shared = xno], [ LINKCUPS="../cups/lib$cupsbase.a \$(LIBS)" EXTLINKCUPS="-lcups \$LIBS" +], [test "$host_os_name" = aix], [ + LINKCUPS="-L../cups -l${cupsbase} \$LIBS" + EXTLINKCUPS="-lcups \$LIBS" ], [ LINKCUPS="-L../cups -l${cupsbase}" EXTLINKCUPS="-lcups" diff --git a/configure b/configure index 792f99c54d..c44cb8619d 100755 --- a/configure +++ b/configure @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.71 for CUPS 2.4.2. +# Generated by GNU Autoconf 2.71 for CUPS 2.4.3. # # Report bugs to . # @@ -610,8 +610,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='CUPS' PACKAGE_TARNAME='cups' -PACKAGE_VERSION='2.4.2' -PACKAGE_STRING='CUPS 2.4.2' +PACKAGE_VERSION='2.4.3' +PACKAGE_STRING='CUPS 2.4.3' PACKAGE_BUGREPORT='https://github.com/openprinting/cups/issues' PACKAGE_URL='https://openprinting.github.io/cups' @@ -1504,7 +1504,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures CUPS 2.4.2 to adapt to many kinds of systems. +\`configure' configures CUPS 2.4.3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1570,7 +1570,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of CUPS 2.4.2:";; + short | recursive ) echo "Configuration of CUPS 2.4.3:";; esac cat <<\_ACEOF @@ -1756,7 +1756,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -CUPS configure 2.4.2 +CUPS configure 2.4.3 generated by GNU Autoconf 2.71 Copyright (C) 2021 Free Software Foundation, Inc. @@ -2111,7 +2111,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by CUPS $as_me 2.4.2, which was +It was created by CUPS $as_me 2.4.3, which was generated by GNU Autoconf 2.71. Invocation command line was $ $0$ac_configure_args_raw @@ -3242,8 +3242,8 @@ done ac_config_headers="$ac_config_headers config.h" -CUPS_VERSION="2.4.2" -CUPS_API_VERSION="$(echo 2.4.2 | awk -F. '{print $1 "." $2}')" +CUPS_VERSION="2.4.3" +CUPS_API_VERSION="$(echo 2.4.3 | awk -F. '{print $1 "." $2}')" CUPS_BUILD="cups-$CUPS_VERSION" @@ -7782,6 +7782,12 @@ then : LINKCUPS="../cups/lib$cupsbase.a \$(LIBS)" EXTLINKCUPS="-lcups \$LIBS" +elif test "$host_os_name" = aix +then : + + LINKCUPS="-L../cups -l${cupsbase} \$LIBS" + EXTLINKCUPS="-lcups \$LIBS" + else $as_nop LINKCUPS="-L../cups -l${cupsbase}" @@ -12828,7 +12834,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by CUPS $as_me 2.4.2, which was +This file was extended by CUPS $as_me 2.4.3, which was generated by GNU Autoconf 2.71. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -12893,7 +12899,7 @@ ac_cs_config_escaped=`printf "%s\n" "$ac_cs_config" | sed "s/^ //; s/'/'\\\\\\\\ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config='$ac_cs_config_escaped' ac_cs_version="\\ -CUPS config.status 2.4.2 +CUPS config.status 2.4.3 configured by $0, generated by GNU Autoconf 2.71, with options \\"\$ac_cs_config\\" diff --git a/configure.ac b/configure.ac index 76793ce8ac..47b1e791d6 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ dnl We need at least autoconf 2.71... AC_PREREQ([2.71]) dnl Package name and version... -AC_INIT([CUPS],[2.4.2],[https://github.com/openprinting/cups/issues],[cups],[https://openprinting.github.io/cups]) +AC_INIT([CUPS],[2.4.3],[https://github.com/openprinting/cups/issues],[cups],[https://openprinting.github.io/cups]) dnl This line is provided to ensure that you don't run the autoheader program dnl against this project. Doing so is completely unsupported and WILL cause