9fb365997d
Update to 3.12.6 PR pkgsrc/46475 remove use of strnlen to support building on older platforms that do not support the function. Changelog/Release Notes: Significant Changes: - 'hp-check' tool when run with "--fix" option resolves missing dependencies/groups/plugin and disable SELinux - Added PIN to PRINT support for HP Color LaserJet CM4540 MFP - libusb-1.0 support added Added Support for the Following New Printers: - HP DeskJet Ink Advantage 2510 All-in-One Series - HP DeskJet Ink Advantage 3525 e-All-in-One - HP DeskJet Ink Advantage 4610 All-in-One Series - HP DeskJet Ink Advantage 4620 e-All-in-One Series - HP DeskJet Ink Advantage 5525 e-All-in-One - HP DeskJet 2510 All-in-One Series - HP DeskJet 3520 e-All-in-One Series - HP OfficeJet 4610 All-in-One Series - HP OfficeJet 4620 e-All-in-One Series - HP Photosmart 5520 e-All-in-One Series - HP LaserJet 400 M401 - HP LaserJet 400 MFP M425 Series - HP LaserJet Enterprise 500 MFP M525 Series - HP LaserJet Enterprise 500 Color MFP M575 Series - HP LaserJet Professional P 1102w Printer - HP LaserJet Professional P1107w Printer - HP LaserJet Professional P1107 Printer - HP LaserJet Professional P1109w Printer - HP LaserJet Professional P1109 Printer - HP LaserJet Professional M1137 MFP - HP LaserJet Professional M1138 MFP - HP LaserJet Professional M1139 MFP - HP LaserJet Professional P1567 - HP LaserJet Professional P1568 - HP LaserJet Professional P1569 - HP LaserJet Professional P1607dn Printer - HP LaserJet Professional P1608dn Printer - HP LaserJet Professional P1609dn Printer Launchpad fixes: 1007836 - Log files from Print to Photo Tray attempt, not working Issues fixed: - HPLIP installation hangs at "Remove and Install" on Fedora 16 64bit OS - Supplies information was not getting refreshed unless hp-toolbox was re-launched - Fix for multiple queues configured warning message - Added dynamic cartridge part number display support for LEDM devices - Enabled Low ink alert message display for LEDM devices Detailed Change Log: - libusb-1.0 support added - cleaned up hp-upgrade zombie processes - Added auto refresh in hp-systray when new device added or removed using hp-toolbox - Fixed the issue of Dbus install failure centOS 6 - Removed obsolete ftime function and added gettimeofday - Added the hplipjs filter in the hplip.list.in file to include this filter in the RHEL5 & RHEL6 for PIN to PRINT - SELinux disable supported in hp-check --fix - Added Wget as dependency in HPLIP build
97 lines
4.5 KiB
Text
97 lines
4.5 KiB
Text
$NetBSD: patch-aa,v 1.2 2012/06/23 04:50:07 schnoebe Exp $
|
|
|
|
# lots of portability changes to configure.in, removing hard-coded paths
|
|
# and pulling in the dynamic library loading modules..
|
|
|
|
# pushed upstream as https://bugs.launchpad.net/hplip/+bug/726207
|
|
|
|
--- configure.in.orig 2012-06-05 09:32:41.000000000 +0000
|
|
+++ configure.in
|
|
@@ -34,14 +34,15 @@ AC_DISABLE_STATIC
|
|
# Checks for programs.
|
|
AC_PROG_CXX
|
|
AC_PROG_CC
|
|
+AM_PROG_CC_C_O
|
|
AC_PROG_INSTALL
|
|
+AC_LIBTOOL_DLOPEN
|
|
AC_PROG_LIBTOOL
|
|
|
|
# Checks for required libraries, don't set global -lpthread, -lm, -ljpeg, ... here, set in Makefile.
|
|
AC_CHECK_LIB([pthread], [pthread_create], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libpthread support], 7)])
|
|
AC_CHECK_LIB([m], [pow], [LIBS="$LIBS"], [AC_MSG_ERROR([cannot find libm math support], 10)])
|
|
AC_CHECK_LIB([jpeg], [jpeg_set_defaults],[LIBS="$LIBS"], [AC_MSG_ERROR(["cannot find libjpeg support"], 102)])
|
|
-AC_CHECK_LIB([dl], [dlopen], [LIBS="$LIBS" AC_DEFINE([HAVE_LIBDL])], [AC_MSG_ERROR(["cannot find libdl support"], 104)])
|
|
|
|
# Checks for required header files.
|
|
AC_CHECK_HEADERS(pthread.h,, [AC_MSG_ERROR([cannot find pthread-devel support], 7)])
|
|
@@ -324,25 +325,25 @@ else
|
|
fi
|
|
AM_CONDITIONAL(LIBUSB01_BUILD, test x$libusb01_build = xyes)
|
|
|
|
-AC_ARG_WITH(cupsbackenddir, AC_HELP_STRING([--with-cupsbackenddir=DIR], [set cups backend install directory [default=/usr/lib/cups/backend]]),
|
|
- cupsbackenddir=$withval, cupsbackenddir="/usr/lib/cups/backend")
|
|
+AC_ARG_WITH(cupsbackenddir, AC_HELP_STRING([--with-cupsbackenddir=DIR], [set cups backend install directory [default=libdir/cups/backend]]),
|
|
+ cupsbackenddir=$withval, cupsbackenddir="$libdir/cups/backend")
|
|
|
|
-AC_ARG_WITH(cupsfilterdir, AC_HELP_STRING([--with-cupsfilterdir=DIR], [set cups filter install directory [default=/usr/lib/cups/filter]]),
|
|
- cupsfilterdir=$withval, cupsfilterdir="/usr/lib/cups/filter")
|
|
+AC_ARG_WITH(cupsfilterdir, AC_HELP_STRING([--with-cupsfilterdir=DIR], [set cups filter install directory [default=libdir/cups/filter]]),
|
|
+ cupsfilterdir=$withval, cupsfilterdir="$libdir/cups/filter")
|
|
|
|
-AC_ARG_WITH(icondir, AC_HELP_STRING([--with-icondir=DIR], [set hplip.desktop install directory [default=/usr/share/applications]]),
|
|
- icondir=$withval, icondir="/usr/share/applications")
|
|
+AC_ARG_WITH(icondir, AC_HELP_STRING([--with-icondir=DIR], [set hplip.desktop install directory [default=datadir/applications]]),
|
|
+ icondir=$withval, icondir="$datadir/applications")
|
|
|
|
-AC_ARG_WITH(systraydir, AC_HELP_STRING([--with-systraydir=DIR], [set hplip-systray.desktop install directory [default=/etc/xdg/autostart]]),
|
|
- systraydir=$withval, systraydir="/etc/xdg/autostart")
|
|
+AC_ARG_WITH(systraydir, AC_HELP_STRING([--with-systraydir=DIR], [set hplip-systray.desktop install directory [default=sysconfdir/xdg/autostart]]),
|
|
+ systraydir=$withval, systraydir="$sysconfdir/xdg/autostart")
|
|
|
|
AC_ARG_WITH(hpppddir, AC_HELP_STRING([--with-hpppddir=DIR], [set hp ppd install directory [default=datadir/ppd/HP]]),
|
|
hpppddir=$withval, hpppddir="$datadir/ppd/HP")
|
|
|
|
-if test -f "/usr/share/cups/mime/mime.types"; then
|
|
- abs_mimedir="/usr/share/cups/mime/"
|
|
+if test -f "$datadir/cups/mime/mime.types"; then
|
|
+ abs_mimedir="$datadir/cups/mime/"
|
|
else
|
|
- abs_mimedir="/etc/cups/"
|
|
+ abs_mimedir="$sysconfdir/etc/cups/"
|
|
fi
|
|
AC_ARG_WITH(mimedir, AC_HELP_STRING([--with-mimedir=DIR], [set cups mime.types location [default=abs_mimedir]]),
|
|
mimedir=$withval, mimedir="$abs_mimedir")
|
|
@@ -469,12 +470,12 @@ AM_CONDITIONAL(POLICYKIT_INSTALL, test x
|
|
|
|
# Determine where the PolicyKit policy file goes
|
|
if test "$policykit" = "yes"; then
|
|
- if test -d /usr/share/polkit-1; then
|
|
- policykit_dir=/usr/share/polkit-1/actions
|
|
- elif test -d /usr/share/PolicyKit; then
|
|
- policykit_dir=/usr/share/PolicyKit/policy
|
|
+ if test -d "$datadir/polkit-1"; then
|
|
+ policykit_dir="$datadir/polkit-1/actions"
|
|
+ elif test -d "$datadir/PolicyKit"; then
|
|
+ policykit_dir="$datadir/PolicyKit/policy"
|
|
else
|
|
- policykit_dir=/usr/share/PolicyKit/policy
|
|
+ policykit_dir="$datadir/PolicyKit/policy"
|
|
fi
|
|
else
|
|
policykit_dir=
|
|
@@ -579,6 +580,7 @@ AC_DEFINE_DIR([abs_datadir], [datadir])
|
|
AC_DEFINE_DIR([abs_sbindir], [sbindir])
|
|
AC_DEFINE_DIR([abs_hpppddir], [hpppddir])
|
|
AC_DEFINE_DIR([abs_docdir], [hpdocdir])
|
|
+AC_DEFINE_DIR([abs_icondir], [icondir])
|
|
abs_ppddir=${abs_hpppddir%/*}
|
|
AC_DEFINE_DIR([abs_drvdir], [drvdir])
|
|
|
|
@@ -586,6 +588,7 @@ AC_SUBST(abs_datadir)
|
|
AC_SUBST(abs_sbindir)
|
|
AC_SUBST(abs_hpppddir)
|
|
AC_SUBST(abs_docdir)
|
|
+AC_SUBST(abs_icondir)
|
|
AC_SUBST(abs_ppddir)
|
|
AC_SUBST(abs_drvdir)
|
|
AC_SUBST(abs_mimedir)
|