Commit 83a60dbf authored by Didier Raboud's avatar Didier Raboud

Imported Upstream version 4.0.7

parent 40c7948d
2011-02-18 Till Kamppeter <till.kamppeter@gmail.com>
* Tagged branch for release 4.0.7.
* README, USAGE, configure.ac: Updated for release 4.0.7.
2011-01-04 Till Kamppeter <till.kamppeter@gmail.com>
* lib/Foomatic/DB.pm: Improved code of the _get_xml_filelist()
function: This avoids repeated construction of the "names-$dir"
string and a crash of Perl if the directory does not contain any
XML file (bug #613). Thanks to Christopher Yeleighton (giecrilj at
stegny dot 2a dot pl) for the report.
* lib/Foomatic/DB.pm: Fixed wrong quotes in error message which
prevented a variable from being substituted by its value (bug
#612). Thanks to Christopher Yeleighton (giecrilj at stegny dot 2a
dot pl) for the report.
* README: Fixed typos (bug #608). Thanks to Christopher Yeleighton
(giecrilj at stegny dot 2a dot pl) for the report.
* Makefile.in: Silenced warning about datarootdir when running
"./configure".
* configure.ac: Replaced deprecated AC_OUTPUT with argumenmts by
the correct usage (bug #611). Thanks to Christopher Yeleighton
(giecrilj at stegny dot 2a dot pl) for the hint.
* configure.ac: Converted many "dnl" comments into "#" comments so
that they make it into the "./configure" script (bug #610). Thanks
to Christopher Yeleighton (giecrilj at stegny dot 2a dot pl) for
the hint.
* configure.ac: Make choosing the install directory for Perl libraries
really working. The code which was commented out was not working.
Now bug #605 is really fixed.
2011-01-03 Till Kamppeter <till.kamppeter@gmail.com>
* configure.ac, acinclude.m4: Avoid name space conflicts by letting
the names of our own macros start with "FM_" and not with "AC_"
(bug #609). Thanks to Christopher Yeleighton (giecrilj at stegny
dot 2a dot pl) for the report.
* configure.ac: Allow choosing the install directory for the
Perl library DB.pm (perl, site, vendor). Requires autoconf 2.52
or newer (checked with "AC_PREREQ([2.52])"). Bug #605. Thanks
to Christopher Yeleighton (giecrilj at stegny dot 2a dot pl) for
the report.
* foomatic-perl-data.c: Eliminated compiler warnings by consistent
use of "const" with xmlChar and char variables (bug #604). Thanks
to Christopher Yeleighton (giecrilj at stegny dot 2a dot pl) for
the patch.
* foomatic-combo-xml.c: Improved readability of the code by using
symbolic constants and additional comments. Also eliminated
warnings about value-less "return"s and unused variables (bug
#599, #600, #601). Thanks to Christopher Yeleighton (giecrilj at
stegny dot 2a dot pl) for the patch.
2010-12-15 Till Kamppeter <till.kamppeter@gmail.com>
* Tagged branch for release 4.0.6.
......
......@@ -24,6 +24,7 @@ libdir=@libdir@
bindir=@bindir@
sbindir=@sbindir@
mandir=@mandir@
datarootdir=@datarootdir@
datadir=@datadir@
sysconfdir=@sysconfdir@
......
Foomatic 4.0.6
Foomatic 4.0.7
==============
......@@ -1616,7 +1616,7 @@ things, but the two biggies are the prototype and the printers list
# <group>epson-inkjet</group>
# <locales>de en_UK en_IE fr_FR es_ES</locales>
# The codes in the locales taghs should be different for the group
# The codes in the locales tags should be different for the group
# members, to allow to automatically select the most suitable flavor
# if the detected printer is supported by more than one flavor.
......@@ -2380,7 +2380,7 @@ take care of the rest. It will
A composite option can also span only one (but not zero) member
option. This is for example done with the "PrintoutMode" option of the
HPIJS driver ("foomatic-db-hpijs" package). This driver has only one
option for setting resolution and quality, but this options has
option for setting resolution and quality, but this option has
sometimes many choices with rather cryptic names. The "PrintoutMode"
maps to the most important choices with the above-mentioned names, and
in addition, these names are the same as of the "PrintoutMode" options
......
Foomatic 4.0.6
Foomatic 4.0.7
==============
foomatic-db-engine
......
dnl AC_PATH_DIR(VARIABLE, DIR-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND [, PATH]])
AC_DEFUN([AC_PATH_DIR],
dnl FM_PATH_DIR(VARIABLE, DIR-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND [, PATH]])
AC_DEFUN([FM_PATH_DIR],
[# Extract the first word of "$2", so it can be a program name with args.
set dummy $2; ac_word=[$]2
AC_MSG_CHECKING([for $ac_word/])
......@@ -40,12 +40,12 @@ fi
AC_SUBST($1)dnl
])
dnl AC_PATH_DIRS(VARIABLE, DIRSS-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND
dnl FM_PATH_DIRS(VARIABLE, DIRSS-TO-CHECK-FOR [, VALUE-IF-NOT-FOUND
dnl [, PATH]])
AC_DEFUN([AC_PATH_DIRS],
AC_DEFUN([FM_PATH_DIRS],
[for ac_dir in $2
do
AC_PATH_DIR($1, [$]ac_dir, , $4)
FM_PATH_DIR($1, [$]ac_dir, , $4)
test -n "[$]$1" && break
done
ifelse([$3], , , [test -n "[$]$1" || $1="$3"
......
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for footmatic-db-engine 4.0.6.
# Generated by GNU Autoconf 2.61 for foomatic-db-engine 4.0.7.
#
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
# 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
......@@ -570,10 +570,10 @@ MAKEFLAGS=
SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='footmatic-db-engine'
PACKAGE_TARNAME='footmatic-db-engine'
PACKAGE_VERSION='4.0.6'
PACKAGE_STRING='footmatic-db-engine 4.0.6'
PACKAGE_NAME='foomatic-db-engine'
PACKAGE_TARNAME='foomatic-db-engine'
PACKAGE_VERSION='4.0.7'
PACKAGE_STRING='foomatic-db-engine 4.0.7'
PACKAGE_BUGREPORT=''
ac_unique_file="foomatic-perl-data.c"
......@@ -711,7 +711,8 @@ CFLAGS
LDFLAGS
LIBS
CPPFLAGS
CPP'
CPP
PERL_INSTALLDIRS'
# Initialize some variables set by options.
......@@ -1214,7 +1215,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 footmatic-db-engine 4.0.6 to adapt to many kinds of systems.
\`configure' configures foomatic-db-engine 4.0.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
......@@ -1262,7 +1263,7 @@ Fine tuning of the installation directories:
--infodir=DIR info documentation [DATAROOTDIR/info]
--localedir=DIR locale-dependent data [DATAROOTDIR/locale]
--mandir=DIR man documentation [DATAROOTDIR/man]
--docdir=DIR documentation root [DATAROOTDIR/doc/footmatic-db-engine]
--docdir=DIR documentation root [DATAROOTDIR/doc/foomatic-db-engine]
--htmldir=DIR html documentation [DOCDIR]
--dvidir=DIR dvi documentation [DOCDIR]
--pdfdir=DIR pdf documentation [DOCDIR]
......@@ -1275,7 +1276,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
short | recursive ) echo "Configuration of footmatic-db-engine 4.0.6:";;
short | recursive ) echo "Configuration of foomatic-db-engine 4.0.7:";;
esac
cat <<\_ACEOF
......@@ -1293,6 +1294,9 @@ Some influential environment variables:
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
PERL_INSTALLDIRS
Where should the Perl libraries be installed (Default: site,
Choices: perl, site, vendor)?
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
......@@ -1357,7 +1361,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
footmatic-db-engine configure 4.0.6
foomatic-db-engine configure 4.0.7
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
......@@ -1371,7 +1375,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 footmatic-db-engine $as_me 4.0.6, which was
It was created by foomatic-db-engine $as_me 4.0.7, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
......@@ -1726,10 +1730,13 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
# If the user didn't specify the $sysconfdir on the command line, let it
# be /etc, not /usr/local/etc or /usr/etc
if [ x$sysconfdir = 'x${prefix}/etc' ]; then
sysconfdir=/etc
fi
# Checks for programs.
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
......@@ -2803,6 +2810,9 @@ fi
#
# Test for libxml
#
xml_version=
# Extract the first word of "xml2-config", so it can be a program name with args.
set dummy xml2-config; ac_word=$2
......@@ -2899,6 +2909,7 @@ fi
# Checks for header files.
......@@ -3709,6 +3720,7 @@ _ACEOF
fi
# Checks for typedefs, structures, and compiler characteristics.
{ echo "$as_me:$LINENO: checking for an ANSI C-conforming const" >&5
echo $ECHO_N "checking for an ANSI C-conforming const... $ECHO_C" >&6; }
if test "${ac_cv_c_const+set}" = set; then
......@@ -3816,6 +3828,7 @@ _ACEOF
fi
# Checks for library functions.
......@@ -4023,6 +4036,7 @@ done
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
# Checks for programs/directories which are used by Foomtic
SPOOLSEARCHPATH=/var/spool:/usr/spool/:/usr/local/spool:/usr/local/var/spool:/var/local/spool:/var/local
LOGSEARCHPATH=/var/log:/usr/log:/usr/local/log:/usr/local/var/log:/var/local/log:/var/local
......@@ -4041,6 +4055,7 @@ BSB=$BINSEARCHPATH:$SBINSEARCHPATH
SBB=$SBINSEARCHPATH:$BINSEARCHPATH
SYS_LIB_PATH=$SYSCONFSEARCHPATH:$LIBSEARCHPATH
# Get the operating system and version number...
uname=`uname`
uversion=`uname -r | sed -e '1,$s/[^0-9]//g'`
if test x$uname = xIRIX64; then
......@@ -4362,6 +4377,7 @@ echo "${ECHO_T}no" >&6; }
fi
# disable ghostscript check
{ echo "$as_me:$LINENO: checking Ghostscript check" >&5
echo $ECHO_N "checking Ghostscript check... $ECHO_C" >&6; }
# Check whether --enable-gscheck was given.
......@@ -4444,6 +4460,7 @@ echo "${ECHO_T}using $DEVFD3" >&6; }
# Check for Perl
for ac_prog in perl
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
......@@ -4491,6 +4508,8 @@ done
test -n "$PERL" || PERL="/usr/bin/perl"
# Check whether Perl libraries will be found when installed with current
# $prefix, if not, try to fall back to /usr/local at first, then to /usr
if test x$prefix = xNONE; then
PREFIX=$ac_default_prefix
else
......@@ -4507,11 +4526,15 @@ else
fi
# Perl installation directories
PERL_INSTALLDIRS=site
if test -z "$PERL_INSTALLDIRS"; then
PERL_INSTALLDIRS=site
fi
# Check for bourne shell
for ac_prog in bash sh
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
......@@ -4559,6 +4582,7 @@ done
test -n "$SH" || SH="/bin/sh"
# Paths for LPD and LPRng (without magicfilter)
for ac_dir in lpd
do
# Extract the first word of "$ac_dir", so it can be a program name with args.
......@@ -5017,6 +5041,7 @@ done
test -n "$LPRNG_CHECKPC" || LPRNG_CHECKPC="/usr/sbin/checkpc"
# Paths and other settings for CUPS
for ac_dir in cups
do
# Extract the first word of "$ac_dir", so it can be a program name with args.
......@@ -5969,6 +5994,7 @@ done
test -n "$CUPS_LPINFO" || CUPS_LPINFO="/usr/sbin/lpinfo"
# Paths for PDQ
for ac_dir in pdq
do
# Extract the first word of "$ac_dir", so it can be a program name with args.
......@@ -6105,6 +6131,7 @@ done
test -n "$PDQ_PRINT" || PDQ_PRINT="/usr/bin/pdq"
# Paths for PPR
for ac_prog in ppr/bin/pprd
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
......@@ -6420,6 +6447,7 @@ test -n "$PPR_PPOP" || PPR_PPOP="/usr/bin/ppop"
# Other paths
for ac_prog in nc netcat
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
......@@ -6783,6 +6811,7 @@ done
test -n "$GZIP" || GZIP="/bin/gzip"
# Path for Foomatic XML database (foomatic-db)
for ac_dir in foomatic/db/source
do
# Extract the first word of "$ac_dir", so it can be a program name with args.
......@@ -6872,6 +6901,7 @@ test -n "$LOCAL_LIBDIR" || LOCAL_LIBDIR="../foomatic-db/db/source"
LOCAL_LIBDIR=`echo $LOCAL_LIBDIR | sed -e "s:/db/source$::"`
# Path for foomatic-rip (from foomatic-filters)
for ac_prog in foomatic-rip
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
......@@ -7394,7 +7424,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
This file was extended by footmatic-db-engine $as_me 4.0.6, which was
This file was extended by foomatic-db-engine $as_me 4.0.7, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
......@@ -7437,7 +7467,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
footmatic-db-engine config.status 4.0.6
foomatic-db-engine config.status 4.0.7
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
......@@ -8117,6 +8147,7 @@ if test "$no_create" != yes; then
fi
# Finished
echo "Finished configuring."
echo "Type 'make' to build the package"
echo "then 'make install' to install it."
dnl Process this file with autoconf to produce a configure script.
AC_INIT([footmatic-db-engine], 4.0.6)
AC_PREREQ([2.52])
AC_INIT([foomatic-db-engine], 4.0.7)
AC_CONFIG_SRCDIR(foomatic-perl-data.c)
dnl If the user didn't specify the $sysconfdir on the command line, let it
dnl be /etc, not /usr/local/etc or /usr/etc
# If the user didn't specify the $sysconfdir on the command line, let it
# be /etc, not /usr/local/etc or /usr/etc
if [[ x$sysconfdir = 'x${prefix}/etc' ]]; then
sysconfdir=/etc
fi
dnl Checks for programs.
# Checks for programs.
AC_PROG_CC
AC_PROG_INSTALL
AC_PROG_LN_S
AC_PROG_MAKE_SET
dnl Checks for libraries.
dnl # Checks for libraries.
dnl AC_PATH_XTRA
dnl LIBS="$LIBS"
dnl
dnl Test for libxml
dnl
#
# Test for libxml
#
xml_version=
AC_PATH_PROG(XML2_CONFIG, xml2-config)
if test ! -z "$XML2_CONFIG"; then
......@@ -39,15 +40,15 @@ fi
AC_SUBST(XML_CFLAGS)
AC_SUBST(XML_LIBS)
dnl Checks for header files.
# Checks for header files.
AC_HEADER_DIRENT
AC_HEADER_STDC
dnl AC_CHECK_HEADERS(libxml/xmlmemory.h libxml/parser.h)
dnl Checks for typedefs, structures, and compiler characteristics.
# Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
dnl Checks for library functions.
# Checks for library functions.
AC_CHECK_FUNCS(strdup strspn strstr)
#
......@@ -61,7 +62,7 @@ AC_CHECK_FUNCS(xmlParseFile xmlCreatePushParserCtxt xmlParseChunk xmlFreeParserC
CFLAGS="$save_CFLAGS"
LIBS="$save_LIBS"
dnl Checks for programs/directories which are used by Foomtic
# Checks for programs/directories which are used by Foomtic
SPOOLSEARCHPATH=/var/spool:/usr/spool/:/usr/local/spool:/usr/local/var/spool:/var/local/spool:/var/local
LOGSEARCHPATH=/var/log:/usr/log:/usr/local/log:/usr/local/var/log:/var/local/log:/var/local
......@@ -80,7 +81,7 @@ BSB=$BINSEARCHPATH:$SBINSEARCHPATH
SBB=$SBINSEARCHPATH:$BINSEARCHPATH
SYS_LIB_PATH=$SYSCONFSEARCHPATH:$LIBSEARCHPATH
dnl Get the operating system and version number...
# Get the operating system and version number...
uname=`uname`
uversion=`uname -r | sed -e '1,$s/[[^0-9]]//g'`
if test x$uname = xIRIX64; then
......@@ -122,7 +123,7 @@ if test -z "$CURL" -a -z "$CURL" ; then
fi
AC_PATH_PROG(PRINTF,printf,$BSB)dnl
dnl dislabel ghostscript check
# disable ghostscript check
AC_MSG_CHECKING(Ghostscript check)
AC_ARG_ENABLE( gscheck,
[ --disable-gscheck disable checking Ghostscript for security flaw],
......@@ -184,11 +185,11 @@ AC_MSG_RESULT(using $DEVFD3)
AC_SUBST(DEVFD3)
AC_SUBST(DEVFD0)
dnl Check for Perl
# Check for Perl
AC_PATH_PROGS(PERL,perl,/usr/bin/perl,$BINSEARCHPATH)
dnl Check whether Perl libraries will be found when installed with current
dnl $prefix, if not, try to fall back to /usr/local at first, then to /usr
# Check whether Perl libraries will be found when installed with current
# $prefix, if not, try to fall back to /usr/local at first, then to /usr
if test x$prefix = xNONE; then
PREFIX=$ac_default_prefix
else
......@@ -205,21 +206,23 @@ else
fi
AC_SUBST(PERLPREFIX)
dnl Perl installation directories
# Perl installation directories
dnl This works only with autoconf 2.52 or newer
dnl PERL_INSTALLDIRS=site
dnl AC_ARG_VAR(PERL_INSTALLDIRS, [Where should the Perl libraries be installed (Default: site, Choices: perl, site)?])
AC_ARG_VAR(PERL_INSTALLDIRS, [Where should the Perl libraries be installed (Default: site, Choices: perl, site, vendor)?])
if test -z "$PERL_INSTALLDIRS"; then
PERL_INSTALLDIRS=site
fi
dnl This works also with autoconf 2.13
PERL_INSTALLDIRS=site
AC_SUBST(PERL_INSTALLDIRS)
dnl PERL_INSTALLDIRS=site
dnl AC_SUBST(PERL_INSTALLDIRS)
dnl Check for bourne shell
# Check for bourne shell
AC_PATH_PROGS(SH,bash sh,/bin/sh,$BINSEARCHPATH)
dnl Paths for LPD and LPRng (without magicfilter)
AC_PATH_DIRS(LPD_SPOOL,lpd,/var/spool/lpd,$SPOOLSEARCHPATH)
# Paths for LPD and LPRng (without magicfilter)
FM_PATH_DIRS(LPD_SPOOL,lpd,/var/spool/lpd,$SPOOLSEARCHPATH)
AC_PATH_PROGS(LPD_LOG,lp-errs,/var/log/lp-errs,$LOGSEARCHPATH)
AC_PATH_PROGS(LPD_BIN,lpd,/usr/sbin/lpd,$SBINSEARCHPATH)
AC_PATH_PROGS(PRINTCAP,printcap,/etc/printcap,$SYSCONFSEARCHPATH)
......@@ -230,14 +233,14 @@ AC_PATH_PROGS(LPD_LPRM,lprm-lpd lprm-lprng lprm-lpr lprm,/usr/bin/lprm,$BINSEARC
AC_PATH_PROGS(LPD_LPC,lpc-lpd lpc-lprng lpc-lpr lpc,/usr/sbin/lpc,$SBB)
AC_PATH_PROGS(LPRNG_CHECKPC,checkpc,/usr/sbin/checkpc,$SBINSEARCHPATH)
dnl Paths and other settings for CUPS
AC_PATH_DIRS(CUPS_ETC,cups,/etc/cups,$SYSCONFSEARCHPATH)
# Paths and other settings for CUPS
FM_PATH_DIRS(CUPS_ETC,cups,/etc/cups,$SYSCONFSEARCHPATH)
AC_PATH_PROGS(CUPS_ADMIN,lpadmin,/usr/sbin/lpadmin,$SBINSEARCHPATH)
AC_PATH_PROGS(CUPS_LPSTAT,lpstat,/usr/bin/lpstat,$BINSEARCHPATH)
AC_PATH_DIRS(CUPS_PPDS,cups/model,/usr/share/cups/model,$DATASEARCHPATH)
AC_PATH_DIRS(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$DATASEARCHPATH)
AC_PATH_DIRS(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$DATASEARCHPATH)
AC_PATH_DIRS(LIB_CUPS,cups,/usr/lib/cups,$LIBSEARCHPATH)
FM_PATH_DIRS(CUPS_PPDS,cups/model,/usr/share/cups/model,$DATASEARCHPATH)
FM_PATH_DIRS(CUPS_FILTERS,cups/filter,/usr/lib/cups/filter,$DATASEARCHPATH)
FM_PATH_DIRS(CUPS_BACKENDS,cups/backend,/usr/lib/cups/backend,$DATASEARCHPATH)
FM_PATH_DIRS(LIB_CUPS,cups,/usr/lib/cups,$LIBSEARCHPATH)
AC_PATH_PROGS(CUPS_PCONF,cups/printers.conf,$CUPS_ETC/printers.conf,$SYSCONFSEARCHPATH)
AC_PATH_PROGS(CUPS_LPR,lpr-cups lpr,/usr/bin/lpr,$BINSEARCHPATH)
AC_PATH_PROGS(CUPS_LPQ,lpq-cups lpq,/usr/bin/lpq,$BINSEARCHPATH)
......@@ -253,48 +256,47 @@ AC_PATH_PROGS(CUPS_LPMOVE,lpmove,/usr/sbin/lpmove,$SBB)
AC_PATH_PROGS(CUPS_LPOPTIONS,lpoptions,/usr/bin/lpoptions,$BINSEARCHPATH)
AC_PATH_PROGS(CUPS_LPINFO,lpinfo,/usr/sbin/lpinfo,$SBINSEARCHPATH)
dnl Paths for PDQ
AC_PATH_DIRS(PDQ_CONF,pdq,/usr/lib/pdq,$SYS_LIB_PATH)
# Paths for PDQ
FM_PATH_DIRS(PDQ_CONF,pdq,/usr/lib/pdq,$SYS_LIB_PATH)
AC_PATH_PROGS(PDQ_PRINTRC,pdq/printrc,$PDQ_CONF/printrc,$SYS_LIB_PATH)
dnl PDQ_FOOMATIC=$PDQ_CONF/drivers/foomatic
AC_PATH_PROGS(PDQ_PRINT,pdq lpr-pdq,/usr/bin/pdq,$BINSEARCHPATH)
dnl PDQ_JOBDIR=~/.printjobs
dnl Paths for PPR
# Paths for PPR
AC_PATH_PROGS(PPR_PPRD,ppr/bin/pprd,/usr/lib/ppr/bin/pprd,$LIBSEARCHPATH)
AC_PATH_DIRS(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH)
AC_PATH_DIRS(PPR_PPDFILES,ppr/PPDFiles,/usr/share/ppr/PPDFiles,$DATASEARCHPATH)
AC_PATH_DIRS(PPR_ETC,ppr,/etc/ppr,$SYSCONFSEARCHPATH)
FM_PATH_DIRS(PPR_INTERFACES,ppr/interfaces,/usr/lib/ppr/interfaces,$LIBSEARCHPATH)
FM_PATH_DIRS(PPR_PPDFILES,ppr/PPDFiles,/usr/share/ppr/PPDFiles,$DATASEARCHPATH)
FM_PATH_DIRS(PPR_ETC,ppr,/etc/ppr,$SYSCONFSEARCHPATH)
AC_PATH_PROGS(PPR_PPR,ppr lpr-ppr,/usr/bin/ppr,$BINSEARCHPATH)
AC_PATH_PROGS(PPR_PPAD,ppad,/usr/bin/ppad,$BSB)
AC_PATH_PROGS(PPR_PPOP,ppop,/usr/bin/ppop,$BSB)
dnl Paths for direct, spoolerless printing
dnl # Paths for direct, spoolerless printing
dnl DIRECT_ETC=/etc/foomatic/direct
dnl DIRECT_CONFIG=$(DIRECT_ETC)/.config
dnl Other paths
# Other paths
AC_PATH_PROGS(NC,nc netcat,/usr/bin/nc,$BSB)
AC_PATH_PROGS(RLPR,rlpr,/usr/bin/rlpr,$BSB)
AC_PATH_PROGS(SMBCLIENT,smbclient,/usr/bin/smbclient,$BSB)
AC_PATH_PROGS(NPRINT,nprint,/usr/bin/nprint,$BSB)
AC_PATH_PROGS(PTAL_CONNECT,ptal-connect,/usr/bin/ptal-connect,$BSB)
AC_PATH_DIRS(PTAL_PIPES,ptal-printd,/var/run/ptal-printd,$PTALPIPESSEARCHPATH)
AC_PATH_DIRS(MTINK_PIPES,mtink,/var/mtink,$MTINKPIPESSEARCHPATH)
FM_PATH_DIRS(PTAL_PIPES,ptal-printd,/var/run/ptal-printd,$PTALPIPESSEARCHPATH)
FM_PATH_DIRS(MTINK_PIPES,mtink,/var/mtink,$MTINKPIPESSEARCHPATH)
AC_PATH_PROGS(GZIP,gzip,/bin/gzip,$BSB)
dnl Path for Foomatic XML database (foomatic-db)
AC_PATH_DIRS(LIBDIR,foomatic/db/source,/usr/share/foomatic/db/source,$DATASEARCHPATH)
# Path for Foomatic XML database (foomatic-db)
FM_PATH_DIRS(LIBDIR,foomatic/db/source,/usr/share/foomatic/db/source,$DATASEARCHPATH)
LIBDIR=`echo $LIBDIR | sed -e "s:/db/source$::"`
AC_PATH_DIRS(LOCAL_LIBDIR,db/source,../foomatic-db/db/source,.:./foomatic-db:./foomatic-db*:../foomatic-db:../foomatic-db*)
FM_PATH_DIRS(LOCAL_LIBDIR,db/source,../foomatic-db/db/source,.:./foomatic-db:./foomatic-db*:../foomatic-db:../foomatic-db*)
LOCAL_LIBDIR=`echo $LOCAL_LIBDIR | sed -e "s:/db/source$::"`
dnl Path for foomatic-rip (from foomatic-filters)
# Path for foomatic-rip (from foomatic-filters)
AC_PATH_PROGS(FOOMATIC_RIP,foomatic-rip,/usr/bin/foomatic-rip,$BSB)
AC_PATH_PROGS(LOCAL_FOOMATIC_RIP,foomatic-rip,../foomatic-filters/foomatic-rip,.:./foomatic-filters:./foomatic-filters*:../foomatic-filters:../foomatic-filters*)
dnl AC_OUTPUT(Makefile src/Makefile)
AC_OUTPUT(Makefile makeDefaults makeMan
AC_CONFIG_FILES(Makefile makeDefaults makeMan
foomatic-configure foomatic-printjob foomatic-kitload
foomatic-ppdfile foomatic-preferred-driver foomatic-cleanupdrivers
foomatic-getpjloptions foomatic-addpjloptions
......@@ -303,8 +305,9 @@ foomatic-nonumericalids foomatic-replaceoldprinterids
foomatic-ppd-options foomatic-printermap-to-gutenprint-xml
foomatic-extract-text foomatic-searchprinter foomatic-ppd-to-xml
)
AC_OUTPUT
dnl Finished
# Finished
echo "Finished configuring."
echo "Type 'make' to build the package"
echo "then 'make install' to install it."
This diff is collapsed.
This diff is collapsed.
......@@ -6153,19 +6153,17 @@ sub _set_object_xml {
# read with _get_object_xml.
sub _get_xml_filelist {
my ($this, $dir) = @_;
my $dir_name = "names-$dir";
if (!defined($this->{"names-$dir"})) {
if (!defined ($this->{$dir_name})) {
opendir DRV, "$libdir/db/$dir"
or die 'Cannot find source db for $dir\n';
my $driverfile;
while($driverfile = readdir(DRV)) {
next if ($driverfile !~ m!^(.+)\.xml$!);
push(@{$this->{"names-$dir"}}, $1);
}
closedir(DRV);
or die "Cannot find source db for $dir\n";
my @names_dir = map { m!^(.+)\.xml$!? $1: () } readdir (DRV);
closedir (DRV);
$this->{$dir_name} = \@names_dir;
}
return @{$this->{"names-$dir"}};
return @{$this->{$dir_name}};
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment