common/autoconf/lib-cups.m4

*** 70,96 ****
      if test "x$CUPS_FOUND" = xno; then
        # Are the cups headers installed in the default /usr/include location?
        AC_CHECK_HEADERS([cups/cups.h cups/ppd.h], [
            CUPS_FOUND=yes
            CUPS_CFLAGS=
-           DEFAULT_CUPS=yes
        ])
      fi
      if test "x$CUPS_FOUND" = xno; then
        # Getting nervous now? Lets poke around for standard Solaris third-party
        # package installation locations.
        AC_MSG_CHECKING([for cups headers])
        if test -s $SYSROOT/opt/sfw/cups/include/cups/cups.h; then
          # An SFW package seems to be installed!
          CUPS_FOUND=yes
!         CUPS_CFLAGS="-I$SYSROOT/opt/sfw/cups/include"
        elif test -s $SYSROOT/opt/csw/include/cups/cups.h; then
          # A CSW package seems to be installed!
          CUPS_FOUND=yes
!         CUPS_CFLAGS="-I$SYSROOT/opt/csw/include"
        fi
!       AC_MSG_RESULT([$CUPS_FOUND])
      fi
      if test "x$CUPS_FOUND" = xno; then
        HELP_MSG_MISSING_DEPENDENCY([cups])
        AC_MSG_ERROR([Could not find cups! $HELP_MSG ])
      fi
--- 70,104 ----
      if test "x$CUPS_FOUND" = xno; then
        # Are the cups headers installed in the default /usr/include location?
        AC_CHECK_HEADERS([cups/cups.h cups/ppd.h], [
            CUPS_FOUND=yes
            CUPS_CFLAGS=
        ])
      fi
      if test "x$CUPS_FOUND" = xno; then
        # Getting nervous now? Lets poke around for standard Solaris third-party
        # package installation locations.
        AC_MSG_CHECKING([for cups headers])
        if test -s $SYSROOT/opt/sfw/cups/include/cups/cups.h; then
          # An SFW package seems to be installed!
          CUPS_FOUND=yes
!         CUPS_PATH="$SYSROOT/opt/sfw/cups/include"
        elif test -s $SYSROOT/opt/csw/include/cups/cups.h; then
          # A CSW package seems to be installed!
          CUPS_FOUND=yes
!         CUPS_PATH="$SYSROOT/opt/csw/include"
!       elif test -s /usr/local/include/cups/cups.h; then
!         # Default FreeBSD/OpenBSD location
!         CUPS_FOUND=yes
!         CUPS_PATH="/usr/local/include"
!       elif test -s /usr/pkg/include/cups/cups.h; then
!         # Default NetBSD location
!         CUPS_FOUND=yes
!         CUPS_PATH="/usr/pkg/include"
        fi
!       AC_MSG_RESULT([$CUPS_FOUND, at $CUPS_PATH])
!       CUPS_CFLAGS="-I$CUPS_PATH"
      fi
      if test "x$CUPS_FOUND" = xno; then
        HELP_MSG_MISSING_DEPENDENCY([cups])
        AC_MSG_ERROR([Could not find cups! $HELP_MSG ])
      fi