Skip to content

Commit

Permalink
Remove unused dependencies (#7)
Browse files Browse the repository at this point in the history
* configure.ac: Remove ZLIB dependency

ZLIB is now required only for libppd.

* configure.ac: Remove dependency on Avahi

Avahi is now used only in cups-browsed.

* README.md: We don't depend on GLib

* configure.ac: Remove freetype dependency

We don't use freetype API since dropping pdftoopvp, we don't have to
require it explicitly. Freetype is fontconfig's dependency, so
fontconfig should bring in Freetype (since Freetype is used for building
the fontconfig...)
  • Loading branch information
zdohnal authored Jan 31, 2023
1 parent 81f0e79 commit b2ab2b1
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 40 deletions.
4 changes: 2 additions & 2 deletions INSTALL
Original file line number Diff line number Diff line change
Expand Up @@ -26,15 +26,15 @@ BEFORE YOU BEGIN
programs shipped by Compaq, HP, SGI, and Sun. BSD users should
use GNU make (gmake) since BSD make does not support "include".

Poppler, freetype, fontconfig, liblcms (liblcms2 recommended), and
Poppler, fontconfig, liblcms (liblcms2 recommended), and
QPDF must be installed to be able to compile this package.

Note that Poppler has to be compiled with the
"--enable-poppler-cpp" configure option (or the
"libpoppler-cpp-dev(el)" package has to be installed if the
Poppler packages from a Linux distribution are used).

Besides these tools you'll want the JPEG, PNG, TIFF, ZLIB, and
Besides these tools you'll want the JPEG, PNG, TIFF and
EXIF libraries for image support. libcupsfilters will compile and
run without these, however you'll miss out on many of the features
provided by libcupsfilters.
Expand Down
9 changes: 4 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,10 @@ Applications, like image and raster graphics handling,
make/model/device ID matching, ...

For compiling and using this package CUPS (2.2.2 or newer),
libqpdf (10.3.2 or newer), libjpeg, libpng, libtiff, freetype,
fontconfig, liblcms (liblcms2 recommended), libavahi-common,
libavahi-client, libdbus, and glib are needed. It is highly
recommended, especially if non-PDF printers are used, to have at
least one of Ghostscript (preferred), Poppler, or MuPDF.
libqpdf (10.3.2 or newer), libjpeg, libpng, libtiff, fontconfig,
liblcms (liblcms2 recommended) and libdbus are needed.
It is highly recommended, especially if non-PDF printers are used,
to have at least one of Ghostscript (preferred), Poppler, or MuPDF.

It also needs gcc (C compiler), automake, autoconf, autopoint, and
libtool. On Debian, Ubuntu, and distributions derived from them
Expand Down
33 changes: 0 additions & 33 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,6 @@ AC_CHECK_HEADERS([stdlib.h])
AC_CHECK_HEADERS([sys/stat.h])
AC_CHECK_HEADERS([sys/types.h])
AC_CHECK_HEADERS([unistd.h])
AC_CHECK_HEADERS([zlib.h])
AC_CHECK_HEADERS([endian.h])
AC_CHECK_HEADERS([dirent.h])
AC_CHECK_HEADERS([sys/ioctl.h])
Expand Down Expand Up @@ -233,34 +232,6 @@ fi
AC_SUBST(EXIF_LIBS)
AC_SUBST(EXIF_CFLAGS)

# ======================
# Avahi (DNS-SD support)
# ======================
AVAHI_LIBS=""
AVAHI_CFLAGS=""

AC_ARG_ENABLE([avahi],
[AS_HELP_STRING([--disable-avahi], [Disable DNS Service Discovery support using Avahi.])],
[enable_avahi="$enableval"],
[enable_avahi=yes]
)
AM_CONDITIONAL([ENABLE_AVAHI], [test "x$enable_avahi" != "xno"])

AC_ARG_WITH(avahi-libs,
[AS_HELP_STRING([--with-avahi-libs], [Set directory for Avahi library.])],
AVAHI_LIBS="-L$withval $AVAHI_LIBS",)
AC_ARG_WITH(avahi-includes,
[AS_HELP_STRING([--with-avahi-includes], [Set directory for Avahi includes])],
AVAHI_CFLAGS="-I$withval $AVAHI_CFLAGS",)

if test "x$enable_avahi" != xno; then
PKG_CHECK_MODULES(AVAHI, avahi-client,
[AC_DEFINE(HAVE_AVAHI, [1], [Define if you have the avahi library])])
fi

AC_SUBST(AVAHI_LIBS)
AC_SUBST(AVAHI_CFLAGS)

# ==========================================
# Check for various required modules for PDF
# ==========================================
Expand All @@ -269,10 +240,7 @@ AS_IF([test x"$lcms2" = "xno"], [
PKG_CHECK_MODULES([LCMS], [lcms])
AC_DEFINE([USE_LCMS1], [1], [Defines if use lcms1])
])
PKG_CHECK_MODULES([FREETYPE], [freetype2], [AC_DEFINE([HAVE_FREETYPE_H], [1], [Have FreeType2 include files])])
PKG_CHECK_MODULES([FONTCONFIG], [fontconfig >= 2.0.0])
PKG_CHECK_MODULES([ZLIB], [zlib])
AC_DEFINE([HAVE_LIBZ], [1], [Define that we use zlib])
PKG_CHECK_MODULES([LIBQPDF], [libqpdf >= 10.3.2])

# =================
Expand Down Expand Up @@ -468,7 +436,6 @@ Build configuration:
exif: ${enable_exif}
png: ${with_png}
tiff: ${with_tiff}
avahi: ${enable_avahi}
dbus: ${enable_dbus}
werror: ${enable_werror}
test-font: ${with_test_font_path}
Expand Down

0 comments on commit b2ab2b1

Please sign in to comment.