--- gtklp-1.2.7.orig/aclocal.m4 +++ gtklp-1.2.7/aclocal.m4 @@ -0,0 +1,1430 @@ +# generated automatically by aclocal 1.14.1 -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. + +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY, to the extent permitted by law; without +# even the implied warranty of MERCHANTABILITY or FITNESS FOR A +# PARTICULAR PURPOSE. + +m4_ifndef([AC_CONFIG_MACRO_DIRS], [m4_defun([_AM_CONFIG_MACRO_DIRS], [])m4_defun([AC_CONFIG_MACRO_DIRS], [_AM_CONFIG_MACRO_DIRS($@)])]) +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],, +[m4_warning([this file was generated for autoconf 2.69. +You have another version of autoconf. It may work, but is not guaranteed to. +If you have problems, you may need to regenerate the build system entirely. +To do so, use the procedure documented by the package, typically 'autoreconf'.])]) + +# pkg.m4 - Macros to locate and utilise pkg-config. -*- Autoconf -*- +# serial 1 (pkg-config-0.24) +# +# Copyright © 2004 Scott James Remnant . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, but +# WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. +# +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# PKG_PROG_PKG_CONFIG([MIN-VERSION]) +# ---------------------------------- +AC_DEFUN([PKG_PROG_PKG_CONFIG], +[m4_pattern_forbid([^_?PKG_[A-Z_]+$]) +m4_pattern_allow([^PKG_CONFIG(_(PATH|LIBDIR|SYSROOT_DIR|ALLOW_SYSTEM_(CFLAGS|LIBS)))?$]) +m4_pattern_allow([^PKG_CONFIG_(DISABLE_UNINSTALLED|TOP_BUILD_DIR|DEBUG_SPEW)$]) +AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility]) +AC_ARG_VAR([PKG_CONFIG_PATH], [directories to add to pkg-config's search path]) +AC_ARG_VAR([PKG_CONFIG_LIBDIR], [path overriding pkg-config's built-in search path]) + +if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then + AC_PATH_TOOL([PKG_CONFIG], [pkg-config]) +fi +if test -n "$PKG_CONFIG"; then + _pkg_min_version=m4_default([$1], [0.9.0]) + AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version]) + if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + PKG_CONFIG="" + fi +fi[]dnl +])# PKG_PROG_PKG_CONFIG + +# PKG_CHECK_EXISTS(MODULES, [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# +# Check to see whether a particular set of modules exists. Similar +# to PKG_CHECK_MODULES(), but does not set variables or print errors. +# +# Please remember that m4 expands AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +# only at the first occurence in configure.ac, so if the first place +# it's called might be skipped (such as if it is within an "if", you +# have to call PKG_CHECK_EXISTS manually +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_EXISTS], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +if test -n "$PKG_CONFIG" && \ + AC_RUN_LOG([$PKG_CONFIG --exists --print-errors "$1"]); then + m4_default([$2], [:]) +m4_ifvaln([$3], [else + $3])dnl +fi]) + +# _PKG_CONFIG([VARIABLE], [COMMAND], [MODULES]) +# --------------------------------------------- +m4_define([_PKG_CONFIG], +[if test -n "$$1"; then + pkg_cv_[]$1="$$1" + elif test -n "$PKG_CONFIG"; then + PKG_CHECK_EXISTS([$3], + [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes ], + [pkg_failed=yes]) + else + pkg_failed=untried +fi[]dnl +])# _PKG_CONFIG + +# _PKG_SHORT_ERRORS_SUPPORTED +# ----------------------------- +AC_DEFUN([_PKG_SHORT_ERRORS_SUPPORTED], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG]) +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi[]dnl +])# _PKG_SHORT_ERRORS_SUPPORTED + + +# PKG_CHECK_MODULES(VARIABLE-PREFIX, MODULES, [ACTION-IF-FOUND], +# [ACTION-IF-NOT-FOUND]) +# +# +# Note that if there is a possibility the first call to +# PKG_CHECK_MODULES might not happen, you should be sure to include an +# explicit call to PKG_PROG_PKG_CONFIG in your configure.ac +# +# +# -------------------------------------------------------------- +AC_DEFUN([PKG_CHECK_MODULES], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1][_CFLAGS], [C compiler flags for $1, overriding pkg-config])dnl +AC_ARG_VAR([$1][_LIBS], [linker flags for $1, overriding pkg-config])dnl + +pkg_failed=no +AC_MSG_CHECKING([for $1]) + +_PKG_CONFIG([$1][_CFLAGS], [cflags], [$2]) +_PKG_CONFIG([$1][_LIBS], [libs], [$2]) + +m4_define([_PKG_TEXT], [Alternatively, you may set the environment variables $1[]_CFLAGS +and $1[]_LIBS to avoid the need to call pkg-config. +See the pkg-config man page for more details.]) + +if test $pkg_failed = yes; then + AC_MSG_RESULT([no]) + _PKG_SHORT_ERRORS_SUPPORTED + if test $_pkg_short_errors_supported = yes; then + $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "$2" 2>&1` + else + $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "$2" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD + + m4_default([$4], [AC_MSG_ERROR( +[Package requirements ($2) were not met: + +$$1_PKG_ERRORS + +Consider adjusting the PKG_CONFIG_PATH environment variable if you +installed software in a non-standard prefix. + +_PKG_TEXT])[]dnl + ]) +elif test $pkg_failed = untried; then + AC_MSG_RESULT([no]) + m4_default([$4], [AC_MSG_FAILURE( +[The pkg-config script could not be found or is too old. Make sure it +is in your PATH or set the PKG_CONFIG environment variable to the full +path to pkg-config. + +_PKG_TEXT + +To get pkg-config, see .])[]dnl + ]) +else + $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS + $1[]_LIBS=$pkg_cv_[]$1[]_LIBS + AC_MSG_RESULT([yes]) + $3 +fi[]dnl +])# PKG_CHECK_MODULES + + +# PKG_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable pkgconfigdir as the location where a module +# should install pkg-config .pc files. By default the directory is +# $libdir/pkgconfig, but the default can be changed by passing +# DIRECTORY. The user can override through the --with-pkgconfigdir +# parameter. +AC_DEFUN([PKG_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${libdir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([pkgconfigdir], + [AS_HELP_STRING([--with-pkgconfigdir], pkg_description)],, + [with_pkgconfigdir=]pkg_default) +AC_SUBST([pkgconfigdir], [$with_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_INSTALLDIR + + +# PKG_NOARCH_INSTALLDIR(DIRECTORY) +# ------------------------- +# Substitutes the variable noarch_pkgconfigdir as the location where a +# module should install arch-independent pkg-config .pc files. By +# default the directory is $datadir/pkgconfig, but the default can be +# changed by passing DIRECTORY. The user can override through the +# --with-noarch-pkgconfigdir parameter. +AC_DEFUN([PKG_NOARCH_INSTALLDIR], +[m4_pushdef([pkg_default], [m4_default([$1], ['${datadir}/pkgconfig'])]) +m4_pushdef([pkg_description], + [pkg-config arch-independent installation directory @<:@]pkg_default[@:>@]) +AC_ARG_WITH([noarch-pkgconfigdir], + [AS_HELP_STRING([--with-noarch-pkgconfigdir], pkg_description)],, + [with_noarch_pkgconfigdir=]pkg_default) +AC_SUBST([noarch_pkgconfigdir], [$with_noarch_pkgconfigdir]) +m4_popdef([pkg_default]) +m4_popdef([pkg_description]) +]) dnl PKG_NOARCH_INSTALLDIR + + +# PKG_CHECK_VAR(VARIABLE, MODULE, CONFIG-VARIABLE, +# [ACTION-IF-FOUND], [ACTION-IF-NOT-FOUND]) +# ------------------------------------------- +# Retrieves the value of the pkg-config variable for the given module. +AC_DEFUN([PKG_CHECK_VAR], +[AC_REQUIRE([PKG_PROG_PKG_CONFIG])dnl +AC_ARG_VAR([$1], [value of $3 for $2, overriding pkg-config])dnl + +_PKG_CONFIG([$1], [variable="][$3]["], [$2]) +AS_VAR_COPY([$1], [pkg_cv_][$1]) + +AS_VAR_IF([$1], [""], [$5], [$4])dnl +])# PKG_CHECK_VAR + +# Copyright (C) 2002-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_AUTOMAKE_VERSION(VERSION) +# ---------------------------- +# Automake X.Y traces this macro to ensure aclocal.m4 has been +# generated from the m4 files accompanying Automake X.Y. +# (This private macro should not be called outside this file.) +AC_DEFUN([AM_AUTOMAKE_VERSION], +[am__api_version='1.14' +dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to +dnl require some minimum version. Point them to the right macro. +m4_if([$1], [1.14.1], [], + [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl +]) + +# _AM_AUTOCONF_VERSION(VERSION) +# ----------------------------- +# aclocal traces this macro to find the Autoconf version. +# This is a private macro too. Using m4_define simplifies +# the logic in aclocal, which can simply ignore this definition. +m4_define([_AM_AUTOCONF_VERSION], []) + +# AM_SET_CURRENT_AUTOMAKE_VERSION +# ------------------------------- +# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced. +# This function is AC_REQUIREd by AM_INIT_AUTOMAKE. +AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION], +[AM_AUTOMAKE_VERSION([1.14.1])dnl +m4_ifndef([AC_AUTOCONF_VERSION], + [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl +_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))]) + +# AM_AUX_DIR_EXPAND -*- Autoconf -*- + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets +# $ac_aux_dir to '$srcdir/foo'. In other projects, it is set to +# '$srcdir', '$srcdir/..', or '$srcdir/../..'. +# +# Of course, Automake must honor this variable whenever it calls a +# tool from the auxiliary directory. The problem is that $srcdir (and +# therefore $ac_aux_dir as well) can be either absolute or relative, +# depending on how configure is run. This is pretty annoying, since +# it makes $ac_aux_dir quite unusable in subdirectories: in the top +# source directory, any form will work fine, but in subdirectories a +# relative path needs to be adjusted first. +# +# $ac_aux_dir/missing +# fails when called from a subdirectory if $ac_aux_dir is relative +# $top_srcdir/$ac_aux_dir/missing +# fails if $ac_aux_dir is absolute, +# fails when called from a subdirectory in a VPATH build with +# a relative $ac_aux_dir +# +# The reason of the latter failure is that $top_srcdir and $ac_aux_dir +# are both prefixed by $srcdir. In an in-source build this is usually +# harmless because $srcdir is '.', but things will broke when you +# start a VPATH build or use an absolute $srcdir. +# +# So we could use something similar to $top_srcdir/$ac_aux_dir/missing, +# iff we strip the leading $srcdir from $ac_aux_dir. That would be: +# am_aux_dir='\$(top_srcdir)/'`expr "$ac_aux_dir" : "$srcdir//*\(.*\)"` +# and then we would define $MISSING as +# MISSING="\${SHELL} $am_aux_dir/missing" +# This will work as long as MISSING is not called from configure, because +# unfortunately $(top_srcdir) has no meaning in configure. +# However there are other variables, like CC, which are often used in +# configure, and could therefore not use this "fixed" $ac_aux_dir. +# +# Another solution, used here, is to always expand $ac_aux_dir to an +# absolute PATH. The drawback is that using absolute paths prevent a +# configured tree to be moved without reconfiguration. + +AC_DEFUN([AM_AUX_DIR_EXPAND], +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +# Expand $ac_aux_dir to an absolute path. +am_aux_dir=`cd "$ac_aux_dir" && pwd` +]) + +# AM_CONDITIONAL -*- Autoconf -*- + +# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_CONDITIONAL(NAME, SHELL-CONDITION) +# ------------------------------------- +# Define a conditional. +AC_DEFUN([AM_CONDITIONAL], +[AC_PREREQ([2.52])dnl + m4_if([$1], [TRUE], [AC_FATAL([$0: invalid condition: $1])], + [$1], [FALSE], [AC_FATAL([$0: invalid condition: $1])])dnl +AC_SUBST([$1_TRUE])dnl +AC_SUBST([$1_FALSE])dnl +_AM_SUBST_NOTMAKE([$1_TRUE])dnl +_AM_SUBST_NOTMAKE([$1_FALSE])dnl +m4_define([_AM_COND_VALUE_$1], [$2])dnl +if $2; then + $1_TRUE= + $1_FALSE='#' +else + $1_TRUE='#' + $1_FALSE= +fi +AC_CONFIG_COMMANDS_PRE( +[if test -z "${$1_TRUE}" && test -z "${$1_FALSE}"; then + AC_MSG_ERROR([[conditional "$1" was never defined. +Usually this means the macro was only invoked conditionally.]]) +fi])]) + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + + +# There are a few dirty hacks below to avoid letting 'AC_PROG_CC' be +# written in clear, in which case automake, when reading aclocal.m4, +# will think it sees a *use*, and therefore will trigger all it's +# C support machinery. Also note that it means that autoscan, seeing +# CC etc. in the Makefile, will ask for an AC_PROG_CC use... + + +# _AM_DEPENDENCIES(NAME) +# ---------------------- +# See how the compiler implements dependency checking. +# NAME is "CC", "CXX", "OBJC", "OBJCXX", "UPC", or "GJC". +# We try a few techniques and use that to set a single cache variable. +# +# We don't AC_REQUIRE the corresponding AC_PROG_CC since the latter was +# modified to invoke _AM_DEPENDENCIES(CC); we would have a circular +# dependency, and given that the user is not expected to run this macro, +# just rely on AC_PROG_CC. +AC_DEFUN([_AM_DEPENDENCIES], +[AC_REQUIRE([AM_SET_DEPDIR])dnl +AC_REQUIRE([AM_OUTPUT_DEPENDENCY_COMMANDS])dnl +AC_REQUIRE([AM_MAKE_INCLUDE])dnl +AC_REQUIRE([AM_DEP_TRACK])dnl + +m4_if([$1], [CC], [depcc="$CC" am_compiler_list=], + [$1], [CXX], [depcc="$CXX" am_compiler_list=], + [$1], [OBJC], [depcc="$OBJC" am_compiler_list='gcc3 gcc'], + [$1], [OBJCXX], [depcc="$OBJCXX" am_compiler_list='gcc3 gcc'], + [$1], [UPC], [depcc="$UPC" am_compiler_list=], + [$1], [GCJ], [depcc="$GCJ" am_compiler_list='gcc3 gcc'], + [depcc="$$1" am_compiler_list=]) + +AC_CACHE_CHECK([dependency style of $depcc], + [am_cv_$1_dependencies_compiler_type], +[if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then + # We make a subdir and do the tests there. Otherwise we can end up + # making bogus files that we don't know about and never remove. For + # instance it was reported that on HP-UX the gcc test will end up + # making a dummy file named 'D' -- because '-MD' means "put the output + # in D". + rm -rf conftest.dir + mkdir conftest.dir + # Copy depcomp to subdir because otherwise we won't find it if we're + # using a relative directory. + cp "$am_depcomp" conftest.dir + cd conftest.dir + # We will build objects and dependencies in a subdirectory because + # it helps to detect inapplicable dependency modes. For instance + # both Tru64's cc and ICC support -MD to output dependencies as a + # side effect of compilation, but ICC will put the dependencies in + # the current directory while Tru64 will put them in the object + # directory. + mkdir sub + + am_cv_$1_dependencies_compiler_type=none + if test "$am_compiler_list" = ""; then + am_compiler_list=`sed -n ['s/^#*\([a-zA-Z0-9]*\))$/\1/p'] < ./depcomp` + fi + am__universal=false + m4_case([$1], [CC], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac], + [CXX], + [case " $depcc " in #( + *\ -arch\ *\ -arch\ *) am__universal=true ;; + esac]) + + for depmode in $am_compiler_list; do + # Setup a source with many dependencies, because some compilers + # like to wrap large dependency lists on column 80 (with \), and + # we should not choose a depcomp mode which is confused by this. + # + # We need to recreate these files for each test, as the compiler may + # overwrite some of them when testing with obscure command lines. + # This happens at least with the AIX C compiler. + : > sub/conftest.c + for i in 1 2 3 4 5 6; do + echo '#include "conftst'$i'.h"' >> sub/conftest.c + # Using ": > sub/conftst$i.h" creates only sub/conftst1.h with + # Solaris 10 /bin/sh. + echo '/* dummy */' > sub/conftst$i.h + done + echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf + + # We check with '-c' and '-o' for the sake of the "dashmstdout" + # mode. It turns out that the SunPro C++ compiler does not properly + # handle '-M -o', and we need to detect this. Also, some Intel + # versions had trouble with output in subdirs. + am__obj=sub/conftest.${OBJEXT-o} + am__minus_obj="-o $am__obj" + case $depmode in + gcc) + # This depmode causes a compiler race in universal mode. + test "$am__universal" = false || continue + ;; + nosideeffect) + # After this tag, mechanisms are not by side-effect, so they'll + # only be used when explicitly requested. + if test "x$enable_dependency_tracking" = xyes; then + continue + else + break + fi + ;; + msvc7 | msvc7msys | msvisualcpp | msvcmsys) + # This compiler won't grok '-c -o', but also, the minuso test has + # not run yet. These depmodes are late enough in the game, and + # so weak that their functioning should not be impacted. + am__obj=conftest.${OBJEXT-o} + am__minus_obj= + ;; + none) break ;; + esac + if depmode=$depmode \ + source=sub/conftest.c object=$am__obj \ + depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \ + $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \ + >/dev/null 2>conftest.err && + grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 && + grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 && + grep $am__obj sub/conftest.Po > /dev/null 2>&1 && + ${MAKE-make} -s -f confmf > /dev/null 2>&1; then + # icc doesn't choke on unknown options, it will just issue warnings + # or remarks (even with -Werror). So we grep stderr for any message + # that says an option was ignored or not supported. + # When given -MP, icc 7.0 and 7.1 complain thusly: + # icc: Command line warning: ignoring option '-M'; no argument required + # The diagnosis changed in icc 8.0: + # icc: Command line remark: option '-MP' not supported + if (grep 'ignoring option' conftest.err || + grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else + am_cv_$1_dependencies_compiler_type=$depmode + break + fi + fi + done + + cd .. + rm -rf conftest.dir +else + am_cv_$1_dependencies_compiler_type=none +fi +]) +AC_SUBST([$1DEPMODE], [depmode=$am_cv_$1_dependencies_compiler_type]) +AM_CONDITIONAL([am__fastdep$1], [ + test "x$enable_dependency_tracking" != xno \ + && test "$am_cv_$1_dependencies_compiler_type" = gcc3]) +]) + + +# AM_SET_DEPDIR +# ------------- +# Choose a directory name for dependency files. +# This macro is AC_REQUIREd in _AM_DEPENDENCIES. +AC_DEFUN([AM_SET_DEPDIR], +[AC_REQUIRE([AM_SET_LEADING_DOT])dnl +AC_SUBST([DEPDIR], ["${am__leading_dot}deps"])dnl +]) + + +# AM_DEP_TRACK +# ------------ +AC_DEFUN([AM_DEP_TRACK], +[AC_ARG_ENABLE([dependency-tracking], [dnl +AS_HELP_STRING( + [--enable-dependency-tracking], + [do not reject slow dependency extractors]) +AS_HELP_STRING( + [--disable-dependency-tracking], + [speeds up one-time build])]) +if test "x$enable_dependency_tracking" != xno; then + am_depcomp="$ac_aux_dir/depcomp" + AMDEPBACKSLASH='\' + am__nodep='_no' +fi +AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno]) +AC_SUBST([AMDEPBACKSLASH])dnl +_AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl +AC_SUBST([am__nodep])dnl +_AM_SUBST_NOTMAKE([am__nodep])dnl +]) + +# Generate code to set up dependency tracking. -*- Autoconf -*- + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + + +# _AM_OUTPUT_DEPENDENCY_COMMANDS +# ------------------------------ +AC_DEFUN([_AM_OUTPUT_DEPENDENCY_COMMANDS], +[{ + # Older Autoconf quotes --file arguments for eval, but not when files + # are listed without --file. Let's play safe and only enable the eval + # if we detect the quoting. + case $CONFIG_FILES in + *\'*) eval set x "$CONFIG_FILES" ;; + *) set x $CONFIG_FILES ;; + esac + shift + for mf + do + # Strip MF so we end up with the name of the file. + mf=`echo "$mf" | sed -e 's/:.*$//'` + # Check whether this is an Automake generated Makefile or not. + # We used to match only the files named 'Makefile.in', but + # some people rename them; so instead we look at the file content. + # Grep'ing the first line is not enough: some people post-process + # each Makefile.in and add a new line on top of each file to say so. + # Grep'ing the whole file is not good either: AIX grep has a line + # limit of 2048, but all sed's we know have understand at least 4000. + if sed -n 's,^#.*generated by automake.*,X,p' "$mf" | grep X >/dev/null 2>&1; then + dirpart=`AS_DIRNAME("$mf")` + else + continue + fi + # Extract the definition of DEPDIR, am__include, and am__quote + # from the Makefile without running 'make'. + DEPDIR=`sed -n 's/^DEPDIR = //p' < "$mf"` + test -z "$DEPDIR" && continue + am__include=`sed -n 's/^am__include = //p' < "$mf"` + test -z "$am__include" && continue + am__quote=`sed -n 's/^am__quote = //p' < "$mf"` + # Find all dependency output files, they are included files with + # $(DEPDIR) in their names. We invoke sed twice because it is the + # simplest approach to changing $(DEPDIR) to its actual value in the + # expansion. + for file in `sed -n " + s/^$am__include $am__quote\(.*(DEPDIR).*\)$am__quote"'$/\1/p' <"$mf" | \ + sed -e 's/\$(DEPDIR)/'"$DEPDIR"'/g'`; do + # Make sure the directory exists. + test -f "$dirpart/$file" && continue + fdir=`AS_DIRNAME(["$file"])` + AS_MKDIR_P([$dirpart/$fdir]) + # echo "creating $dirpart/$file" + echo '# dummy' > "$dirpart/$file" + done + done +} +])# _AM_OUTPUT_DEPENDENCY_COMMANDS + + +# AM_OUTPUT_DEPENDENCY_COMMANDS +# ----------------------------- +# This macro should only be invoked once -- use via AC_REQUIRE. +# +# This code is only required when automatic dependency tracking +# is enabled. FIXME. This creates each '.P' file that we will +# need in order to bootstrap the dependency handling code. +AC_DEFUN([AM_OUTPUT_DEPENDENCY_COMMANDS], +[AC_CONFIG_COMMANDS([depfiles], + [test x"$AMDEP_TRUE" != x"" || _AM_OUTPUT_DEPENDENCY_COMMANDS], + [AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"]) +]) + +# Do all the work for Automake. -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# This macro actually does too much. Some checks are only needed if +# your package does certain things. But this isn't really a big deal. + +dnl Redefine AC_PROG_CC to automatically invoke _AM_PROG_CC_C_O. +m4_define([AC_PROG_CC], +m4_defn([AC_PROG_CC]) +[_AM_PROG_CC_C_O +]) + +# AM_INIT_AUTOMAKE(PACKAGE, VERSION, [NO-DEFINE]) +# AM_INIT_AUTOMAKE([OPTIONS]) +# ----------------------------------------------- +# The call with PACKAGE and VERSION arguments is the old style +# call (pre autoconf-2.50), which is being phased out. PACKAGE +# and VERSION should now be passed to AC_INIT and removed from +# the call to AM_INIT_AUTOMAKE. +# We support both call styles for the transition. After +# the next Automake release, Autoconf can make the AC_INIT +# arguments mandatory, and then we can depend on a new Autoconf +# release and drop the old call support. +AC_DEFUN([AM_INIT_AUTOMAKE], +[AC_PREREQ([2.65])dnl +dnl Autoconf wants to disallow AM_ names. We explicitly allow +dnl the ones we care about. +m4_pattern_allow([^AM_[A-Z]+FLAGS$])dnl +AC_REQUIRE([AM_SET_CURRENT_AUTOMAKE_VERSION])dnl +AC_REQUIRE([AC_PROG_INSTALL])dnl +if test "`cd $srcdir && pwd`" != "`pwd`"; then + # Use -I$(srcdir) only when $(srcdir) != ., so that make's output + # is not polluted with repeated "-I." + AC_SUBST([am__isrc], [' -I$(srcdir)'])_AM_SUBST_NOTMAKE([am__isrc])dnl + # test to see if srcdir already configured + if test -f $srcdir/config.status; then + AC_MSG_ERROR([source directory already configured; run "make distclean" there first]) + fi +fi + +# test whether we have cygpath +if test -z "$CYGPATH_W"; then + if (cygpath --version) >/dev/null 2>/dev/null; then + CYGPATH_W='cygpath -w' + else + CYGPATH_W=echo + fi +fi +AC_SUBST([CYGPATH_W]) + +# Define the identity of the package. +dnl Distinguish between old-style and new-style calls. +m4_ifval([$2], +[AC_DIAGNOSE([obsolete], + [$0: two- and three-arguments forms are deprecated.]) +m4_ifval([$3], [_AM_SET_OPTION([no-define])])dnl + AC_SUBST([PACKAGE], [$1])dnl + AC_SUBST([VERSION], [$2])], +[_AM_SET_OPTIONS([$1])dnl +dnl Diagnose old-style AC_INIT with new-style AM_AUTOMAKE_INIT. +m4_if( + m4_ifdef([AC_PACKAGE_NAME], [ok]):m4_ifdef([AC_PACKAGE_VERSION], [ok]), + [ok:ok],, + [m4_fatal([AC_INIT should be called with package and version arguments])])dnl + AC_SUBST([PACKAGE], ['AC_PACKAGE_TARNAME'])dnl + AC_SUBST([VERSION], ['AC_PACKAGE_VERSION'])])dnl + +_AM_IF_OPTION([no-define],, +[AC_DEFINE_UNQUOTED([PACKAGE], ["$PACKAGE"], [Name of package]) + AC_DEFINE_UNQUOTED([VERSION], ["$VERSION"], [Version number of package])])dnl + +# Some tools Automake needs. +AC_REQUIRE([AM_SANITY_CHECK])dnl +AC_REQUIRE([AC_ARG_PROGRAM])dnl +AM_MISSING_PROG([ACLOCAL], [aclocal-${am__api_version}]) +AM_MISSING_PROG([AUTOCONF], [autoconf]) +AM_MISSING_PROG([AUTOMAKE], [automake-${am__api_version}]) +AM_MISSING_PROG([AUTOHEADER], [autoheader]) +AM_MISSING_PROG([MAKEINFO], [makeinfo]) +AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +AC_REQUIRE([AM_PROG_INSTALL_STRIP])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +# For better backward compatibility. To be removed once Automake 1.9.x +# dies out for good. For more background, see: +# +# +AC_SUBST([mkdir_p], ['$(MKDIR_P)']) +# We need awk for the "check" target. The system "awk" is bad on +# some platforms. +AC_REQUIRE([AC_PROG_AWK])dnl +AC_REQUIRE([AC_PROG_MAKE_SET])dnl +AC_REQUIRE([AM_SET_LEADING_DOT])dnl +_AM_IF_OPTION([tar-ustar], [_AM_PROG_TAR([ustar])], + [_AM_IF_OPTION([tar-pax], [_AM_PROG_TAR([pax])], + [_AM_PROG_TAR([v7])])]) +_AM_IF_OPTION([no-dependencies],, +[AC_PROVIDE_IFELSE([AC_PROG_CC], + [_AM_DEPENDENCIES([CC])], + [m4_define([AC_PROG_CC], + m4_defn([AC_PROG_CC])[_AM_DEPENDENCIES([CC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_CXX], + [_AM_DEPENDENCIES([CXX])], + [m4_define([AC_PROG_CXX], + m4_defn([AC_PROG_CXX])[_AM_DEPENDENCIES([CXX])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJC], + [_AM_DEPENDENCIES([OBJC])], + [m4_define([AC_PROG_OBJC], + m4_defn([AC_PROG_OBJC])[_AM_DEPENDENCIES([OBJC])])])dnl +AC_PROVIDE_IFELSE([AC_PROG_OBJCXX], + [_AM_DEPENDENCIES([OBJCXX])], + [m4_define([AC_PROG_OBJCXX], + m4_defn([AC_PROG_OBJCXX])[_AM_DEPENDENCIES([OBJCXX])])])dnl +]) +AC_REQUIRE([AM_SILENT_RULES])dnl +dnl The testsuite driver may need to know about EXEEXT, so add the +dnl 'am__EXEEXT' conditional if _AM_COMPILER_EXEEXT was seen. This +dnl macro is hooked onto _AC_COMPILER_EXEEXT early, see below. +AC_CONFIG_COMMANDS_PRE(dnl +[m4_provide_if([_AM_COMPILER_EXEEXT], + [AM_CONDITIONAL([am__EXEEXT], [test -n "$EXEEXT"])])])dnl + +# POSIX will say in a future version that running "rm -f" with no argument +# is OK; and we want to be able to make that assumption in our Makefile +# recipes. So use an aggressive probe to check that the usage we want is +# actually supported "in the wild" to an acceptable degree. +# See automake bug#10828. +# To make any issue more visible, cause the running configure to be aborted +# by default if the 'rm' program in use doesn't match our expectations; the +# user can still override this though. +if rm -f && rm -fr && rm -rf; then : OK; else + cat >&2 <<'END' +Oops! + +Your 'rm' program seems unable to run without file operands specified +on the command line, even when the '-f' option is present. This is contrary +to the behaviour of most rm programs out there, and not conforming with +the upcoming POSIX standard: + +Please tell bug-automake@gnu.org about your system, including the value +of your $PATH and any error possibly output before this message. This +can help us improve future automake versions. + +END + if test x"$ACCEPT_INFERIOR_RM_PROGRAM" = x"yes"; then + echo 'Configuration will proceed anyway, since you have set the' >&2 + echo 'ACCEPT_INFERIOR_RM_PROGRAM variable to "yes"' >&2 + echo >&2 + else + cat >&2 <<'END' +Aborting the configuration process, to ensure you take notice of the issue. + +You can download and install GNU coreutils to get an 'rm' implementation +that behaves properly: . + +If you want to complete the configuration process using your problematic +'rm' anyway, export the environment variable ACCEPT_INFERIOR_RM_PROGRAM +to "yes", and re-run configure. + +END + AC_MSG_ERROR([Your 'rm' program is bad, sorry.]) + fi +fi +]) + +dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion. Do not +dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further +dnl mangled by Autoconf and run in a shell conditional statement. +m4_define([_AC_COMPILER_EXEEXT], +m4_defn([_AC_COMPILER_EXEEXT])[m4_provide([_AM_COMPILER_EXEEXT])]) + +# When config.status generates a header, we must update the stamp-h file. +# This file resides in the same directory as the config header +# that is generated. The stamp files are numbered to have different names. + +# Autoconf calls _AC_AM_CONFIG_HEADER_HOOK (when defined) in the +# loop where config.status creates the headers, so we can generate +# our stamp files there. +AC_DEFUN([_AC_AM_CONFIG_HEADER_HOOK], +[# Compute $1's index in $config_headers. +_am_arg=$1 +_am_stamp_count=1 +for _am_header in $config_headers :; do + case $_am_header in + $_am_arg | $_am_arg:* ) + break ;; + * ) + _am_stamp_count=`expr $_am_stamp_count + 1` ;; + esac +done +echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_SH +# ------------------ +# Define $install_sh. +AC_DEFUN([AM_PROG_INSTALL_SH], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +if test x"${install_sh}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;; + *) + install_sh="\${SHELL} $am_aux_dir/install-sh" + esac +fi +AC_SUBST([install_sh])]) + +# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# Check whether the underlying file-system supports filenames +# with a leading dot. For instance MS-DOS doesn't. +AC_DEFUN([AM_SET_LEADING_DOT], +[rm -rf .tst 2>/dev/null +mkdir .tst 2>/dev/null +if test -d .tst; then + am__leading_dot=. +else + am__leading_dot=_ +fi +rmdir .tst 2>/dev/null +AC_SUBST([am__leading_dot])]) + +# Check to see how 'make' treats includes. -*- Autoconf -*- + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MAKE_INCLUDE() +# ----------------- +# Check to see how make treats includes. +AC_DEFUN([AM_MAKE_INCLUDE], +[am_make=${MAKE-make} +cat > confinc << 'END' +am__doit: + @echo this is the am__doit target +.PHONY: am__doit +END +# If we don't find an include directive, just comment out the code. +AC_MSG_CHECKING([for style of include used by $am_make]) +am__include="#" +am__quote= +_am_result=none +# First try GNU make style include. +echo "include confinc" > confmf +# Ignore all kinds of additional output from 'make'. +case `$am_make -s -f confmf 2> /dev/null` in #( +*the\ am__doit\ target*) + am__include=include + am__quote= + _am_result=GNU + ;; +esac +# Now try BSD make style include. +if test "$am__include" = "#"; then + echo '.include "confinc"' > confmf + case `$am_make -s -f confmf 2> /dev/null` in #( + *the\ am__doit\ target*) + am__include=.include + am__quote="\"" + _am_result=BSD + ;; + esac +fi +AC_SUBST([am__include]) +AC_SUBST([am__quote]) +AC_MSG_RESULT([$_am_result]) +rm -f confinc confmf +]) + +# Fake the existence of programs that GNU maintainers use. -*- Autoconf -*- + +# Copyright (C) 1997-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_MISSING_PROG(NAME, PROGRAM) +# ------------------------------ +AC_DEFUN([AM_MISSING_PROG], +[AC_REQUIRE([AM_MISSING_HAS_RUN]) +$1=${$1-"${am_missing_run}$2"} +AC_SUBST($1)]) + +# AM_MISSING_HAS_RUN +# ------------------ +# Define MISSING if not defined so far and test if it is modern enough. +# If it is, set am_missing_run to use it, otherwise, to nothing. +AC_DEFUN([AM_MISSING_HAS_RUN], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([missing])dnl +if test x"${MISSING+set}" != xset; then + case $am_aux_dir in + *\ * | *\ *) + MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;; + *) + MISSING="\${SHELL} $am_aux_dir/missing" ;; + esac +fi +# Use eval to expand $SHELL +if eval "$MISSING --is-lightweight"; then + am_missing_run="$MISSING " +else + am_missing_run= + AC_MSG_WARN(['missing' script is too old or missing]) +fi +]) + +# Copyright (C) 2003-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_MKDIR_P +# --------------- +# Check for 'mkdir -p'. +AC_DEFUN([AM_PROG_MKDIR_P], +[AC_PREREQ([2.60])dnl +AC_REQUIRE([AC_PROG_MKDIR_P])dnl +dnl FIXME we are no longer going to remove this! adjust warning +dnl FIXME message accordingly. +AC_DIAGNOSE([obsolete], +[$0: this macro is deprecated, and will soon be removed. +You should use the Autoconf-provided 'AC][_PROG_MKDIR_P' macro instead, +and use '$(MKDIR_P)' instead of '$(mkdir_p)'in your Makefile.am files.]) +dnl Automake 1.8 to 1.9.6 used to define mkdir_p. We now use MKDIR_P, +dnl while keeping a definition of mkdir_p for backward compatibility. +dnl @MKDIR_P@ is magic: AC_OUTPUT adjusts its value for each Makefile. +dnl However we cannot define mkdir_p as $(MKDIR_P) for the sake of +dnl Makefile.ins that do not define MKDIR_P, so we do our own +dnl adjustment using top_builddir (which is defined more often than +dnl MKDIR_P). +AC_SUBST([mkdir_p], ["$MKDIR_P"])dnl +case $mkdir_p in + [[\\/$]]* | ?:[[\\/]]*) ;; + */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;; +esac +]) + +# Helper functions for option handling. -*- Autoconf -*- + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_MANGLE_OPTION(NAME) +# ----------------------- +AC_DEFUN([_AM_MANGLE_OPTION], +[[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])]) + +# _AM_SET_OPTION(NAME) +# -------------------- +# Set option NAME. Presently that only means defining a flag for this option. +AC_DEFUN([_AM_SET_OPTION], +[m4_define(_AM_MANGLE_OPTION([$1]), [1])]) + +# _AM_SET_OPTIONS(OPTIONS) +# ------------------------ +# OPTIONS is a space-separated list of Automake options. +AC_DEFUN([_AM_SET_OPTIONS], +[m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])]) + +# _AM_IF_OPTION(OPTION, IF-SET, [IF-NOT-SET]) +# ------------------------------------------- +# Execute IF-SET if OPTION is set, IF-NOT-SET otherwise. +AC_DEFUN([_AM_IF_OPTION], +[m4_ifset(_AM_MANGLE_OPTION([$1]), [$2], [$3])]) + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_CC_C_O +# --------------- +# Like AC_PROG_CC_C_O, but changed for automake. We rewrite AC_PROG_CC +# to automatically call this. +AC_DEFUN([_AM_PROG_CC_C_O], +[AC_REQUIRE([AM_AUX_DIR_EXPAND])dnl +AC_REQUIRE_AUX_FILE([compile])dnl +AC_LANG_PUSH([C])dnl +AC_CACHE_CHECK( + [whether $CC understands -c and -o together], + [am_cv_prog_cc_c_o], + [AC_LANG_CONFTEST([AC_LANG_PROGRAM([])]) + # Make sure it works both with $CC and with simple cc. + # Following AC_PROG_CC_C_O, we do the test twice because some + # compilers refuse to overwrite an existing .o file with -o, + # though they will create one. + am_cv_prog_cc_c_o=yes + for am_i in 1 2; do + if AM_RUN_LOG([$CC -c conftest.$ac_ext -o conftest2.$ac_objext]) \ + && test -f conftest2.$ac_objext; then + : OK + else + am_cv_prog_cc_c_o=no + break + fi + done + rm -f core conftest* + unset am_i]) +if test "$am_cv_prog_cc_c_o" != yes; then + # Losing compiler, so override with the script. + # FIXME: It is wrong to rewrite CC. + # But if we don't then we get into trouble of one sort or another. + # A longer-term fix would be to have automake use am__CC in this case, + # and then we could set am__CC="\$(top_srcdir)/compile \$(CC)" + CC="$am_aux_dir/compile $CC" +fi +AC_LANG_POP([C])]) + +# For backward compatibility. +AC_DEFUN_ONCE([AM_PROG_CC_C_O], [AC_REQUIRE([AC_PROG_CC])]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_RUN_LOG(COMMAND) +# ------------------- +# Run COMMAND, save the exit status in ac_status, and log it. +# (This has been adapted from Autoconf's _AC_RUN_LOG macro.) +AC_DEFUN([AM_RUN_LOG], +[{ echo "$as_me:$LINENO: $1" >&AS_MESSAGE_LOG_FD + ($1) >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD + (exit $ac_status); }]) + +# Check to make sure that the build environment is sane. -*- Autoconf -*- + +# Copyright (C) 1996-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SANITY_CHECK +# --------------- +AC_DEFUN([AM_SANITY_CHECK], +[AC_MSG_CHECKING([whether build environment is sane]) +# Reject unsafe characters in $srcdir or the absolute working directory +# name. Accept space and tab only in the latter. +am_lf=' +' +case `pwd` in + *[[\\\"\#\$\&\'\`$am_lf]]*) + AC_MSG_ERROR([unsafe absolute working directory name]);; +esac +case $srcdir in + *[[\\\"\#\$\&\'\`$am_lf\ \ ]]*) + AC_MSG_ERROR([unsafe srcdir value: '$srcdir']);; +esac + +# Do 'set' in a subshell so we don't clobber the current shell's +# arguments. Must try -L first in case configure is actually a +# symlink; some systems play weird games with the mod time of symlinks +# (eg FreeBSD returns the mod time of the symlink's containing +# directory). +if ( + am_has_slept=no + for am_try in 1 2; do + echo "timestamp, slept: $am_has_slept" > conftest.file + set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null` + if test "$[*]" = "X"; then + # -L didn't work. + set X `ls -t "$srcdir/configure" conftest.file` + fi + if test "$[*]" != "X $srcdir/configure conftest.file" \ + && test "$[*]" != "X conftest.file $srcdir/configure"; then + + # If neither matched, then we have a broken ls. This can happen + # if, for instance, CONFIG_SHELL is bash and it inherits a + # broken ls alias from the environment. This has actually + # happened. Such a system could not be considered "sane". + AC_MSG_ERROR([ls -t appears to fail. Make sure there is not a broken + alias in your environment]) + fi + if test "$[2]" = conftest.file || test $am_try -eq 2; then + break + fi + # Just in case. + sleep 1 + am_has_slept=yes + done + test "$[2]" = conftest.file + ) +then + # Ok. + : +else + AC_MSG_ERROR([newly created file is older than distributed files! +Check your system clock]) +fi +AC_MSG_RESULT([yes]) +# If we didn't sleep, we still need to ensure time stamps of config.status and +# generated files are strictly newer. +am_sleep_pid= +if grep 'slept: no' conftest.file >/dev/null 2>&1; then + ( sleep 1 ) & + am_sleep_pid=$! +fi +AC_CONFIG_COMMANDS_PRE( + [AC_MSG_CHECKING([that generated files are newer than configure]) + if test -n "$am_sleep_pid"; then + # Hide warnings about reused PIDs. + wait $am_sleep_pid 2>/dev/null + fi + AC_MSG_RESULT([done])]) +rm -f conftest.file +]) + +# Copyright (C) 2009-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_SILENT_RULES([DEFAULT]) +# -------------------------- +# Enable less verbose build rules; with the default set to DEFAULT +# ("yes" being less verbose, "no" or empty being verbose). +AC_DEFUN([AM_SILENT_RULES], +[AC_ARG_ENABLE([silent-rules], [dnl +AS_HELP_STRING( + [--enable-silent-rules], + [less verbose build output (undo: "make V=1")]) +AS_HELP_STRING( + [--disable-silent-rules], + [verbose build output (undo: "make V=0")])dnl +]) +case $enable_silent_rules in @%:@ ((( + yes) AM_DEFAULT_VERBOSITY=0;; + no) AM_DEFAULT_VERBOSITY=1;; + *) AM_DEFAULT_VERBOSITY=m4_if([$1], [yes], [0], [1]);; +esac +dnl +dnl A few 'make' implementations (e.g., NonStop OS and NextStep) +dnl do not support nested variable expansions. +dnl See automake bug#9928 and bug#10237. +am_make=${MAKE-make} +AC_CACHE_CHECK([whether $am_make supports nested variables], + [am_cv_make_support_nested_variables], + [if AS_ECHO([['TRUE=$(BAR$(V)) +BAR0=false +BAR1=true +V=1 +am__doit: + @$(TRUE) +.PHONY: am__doit']]) | $am_make -f - >/dev/null 2>&1; then + am_cv_make_support_nested_variables=yes +else + am_cv_make_support_nested_variables=no +fi]) +if test $am_cv_make_support_nested_variables = yes; then + dnl Using '$V' instead of '$(V)' breaks IRIX make. + AM_V='$(V)' + AM_DEFAULT_V='$(AM_DEFAULT_VERBOSITY)' +else + AM_V=$AM_DEFAULT_VERBOSITY + AM_DEFAULT_V=$AM_DEFAULT_VERBOSITY +fi +AC_SUBST([AM_V])dnl +AM_SUBST_NOTMAKE([AM_V])dnl +AC_SUBST([AM_DEFAULT_V])dnl +AM_SUBST_NOTMAKE([AM_DEFAULT_V])dnl +AC_SUBST([AM_DEFAULT_VERBOSITY])dnl +AM_BACKSLASH='\' +AC_SUBST([AM_BACKSLASH])dnl +_AM_SUBST_NOTMAKE([AM_BACKSLASH])dnl +]) + +# Copyright (C) 2001-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# AM_PROG_INSTALL_STRIP +# --------------------- +# One issue with vendor 'install' (even GNU) is that you can't +# specify the program used to strip binaries. This is especially +# annoying in cross-compiling environments, where the build's strip +# is unlikely to handle the host's binaries. +# Fortunately install-sh will honor a STRIPPROG variable, so we +# always use install-sh in "make install-strip", and initialize +# STRIPPROG with the value of the STRIP variable (set by the user). +AC_DEFUN([AM_PROG_INSTALL_STRIP], +[AC_REQUIRE([AM_PROG_INSTALL_SH])dnl +# Installed binaries are usually stripped using 'strip' when the user +# run "make install-strip". However 'strip' might not be the right +# tool to use in cross-compilation environments, therefore Automake +# will honor the 'STRIP' environment variable to overrule this program. +dnl Don't test for $cross_compiling = yes, because it might be 'maybe'. +if test "$cross_compiling" != no; then + AC_CHECK_TOOL([STRIP], [strip], :) +fi +INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s" +AC_SUBST([INSTALL_STRIP_PROGRAM])]) + +# Copyright (C) 2006-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_SUBST_NOTMAKE(VARIABLE) +# --------------------------- +# Prevent Automake from outputting VARIABLE = @VARIABLE@ in Makefile.in. +# This macro is traced by Automake. +AC_DEFUN([_AM_SUBST_NOTMAKE]) + +# AM_SUBST_NOTMAKE(VARIABLE) +# -------------------------- +# Public sister of _AM_SUBST_NOTMAKE. +AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)]) + +# Check how to create a tarball. -*- Autoconf -*- + +# Copyright (C) 2004-2013 Free Software Foundation, Inc. +# +# This file is free software; the Free Software Foundation +# gives unlimited permission to copy and/or distribute it, +# with or without modifications, as long as this notice is preserved. + +# _AM_PROG_TAR(FORMAT) +# -------------------- +# Check how to create a tarball in format FORMAT. +# FORMAT should be one of 'v7', 'ustar', or 'pax'. +# +# Substitute a variable $(am__tar) that is a command +# writing to stdout a FORMAT-tarball containing the directory +# $tardir. +# tardir=directory && $(am__tar) > result.tar +# +# Substitute a variable $(am__untar) that extract such +# a tarball read from stdin. +# $(am__untar) < result.tar +# +AC_DEFUN([_AM_PROG_TAR], +[# Always define AMTAR for backward compatibility. Yes, it's still used +# in the wild :-( We should find a proper way to deprecate it ... +AC_SUBST([AMTAR], ['$${TAR-tar}']) + +# We'll loop over all known methods to create a tar archive until one works. +_am_tools='gnutar m4_if([$1], [ustar], [plaintar]) pax cpio none' + +m4_if([$1], [v7], + [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'], + + [m4_case([$1], + [ustar], + [# The POSIX 1988 'ustar' format is defined with fixed-size fields. + # There is notably a 21 bits limit for the UID and the GID. In fact, + # the 'pax' utility can hang on bigger UID/GID (see automake bug#8343 + # and bug#13588). + am_max_uid=2097151 # 2^21 - 1 + am_max_gid=$am_max_uid + # The $UID and $GID variables are not portable, so we need to resort + # to the POSIX-mandated id(1) utility. Errors in the 'id' calls + # below are definitely unexpected, so allow the users to see them + # (that is, avoid stderr redirection). + am_uid=`id -u || echo unknown` + am_gid=`id -g || echo unknown` + AC_MSG_CHECKING([whether UID '$am_uid' is supported by ustar format]) + if test $am_uid -le $am_max_uid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi + AC_MSG_CHECKING([whether GID '$am_gid' is supported by ustar format]) + if test $am_gid -le $am_max_gid; then + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + _am_tools=none + fi], + + [pax], + [], + + [m4_fatal([Unknown tar format])]) + + AC_MSG_CHECKING([how to create a $1 tar archive]) + + # Go ahead even if we have the value already cached. We do so because we + # need to set the values for the 'am__tar' and 'am__untar' variables. + _am_tools=${am_cv_prog_tar_$1-$_am_tools} + + for _am_tool in $_am_tools; do + case $_am_tool in + gnutar) + for _am_tar in tar gnutar gtar; do + AM_RUN_LOG([$_am_tar --version]) && break + done + am__tar="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$$tardir"' + am__tar_="$_am_tar --format=m4_if([$1], [pax], [posix], [$1]) -chf - "'"$tardir"' + am__untar="$_am_tar -xf -" + ;; + plaintar) + # Must skip GNU tar: if it does not support --format= it doesn't create + # ustar tarball either. + (tar --version) >/dev/null 2>&1 && continue + am__tar='tar chf - "$$tardir"' + am__tar_='tar chf - "$tardir"' + am__untar='tar xf -' + ;; + pax) + am__tar='pax -L -x $1 -w "$$tardir"' + am__tar_='pax -L -x $1 -w "$tardir"' + am__untar='pax -r' + ;; + cpio) + am__tar='find "$$tardir" -print | cpio -o -H $1 -L' + am__tar_='find "$tardir" -print | cpio -o -H $1 -L' + am__untar='cpio -i -H $1 -d' + ;; + none) + am__tar=false + am__tar_=false + am__untar=false + ;; + esac + + # If the value was cached, stop now. We just wanted to have am__tar + # and am__untar set. + test -n "${am_cv_prog_tar_$1}" && break + + # tar/untar a dummy directory, and stop if the command works. + rm -rf conftest.dir + mkdir conftest.dir + echo GrepMe > conftest.dir/file + AM_RUN_LOG([tardir=conftest.dir && eval $am__tar_ >conftest.tar]) + rm -rf conftest.dir + if test -s conftest.tar; then + AM_RUN_LOG([$am__untar /dev/null 2>&1 && break + fi + done + rm -rf conftest.dir + + AC_CACHE_VAL([am_cv_prog_tar_$1], [am_cv_prog_tar_$1=$_am_tool]) + AC_MSG_RESULT([$am_cv_prog_tar_$1])]) + +AC_SUBST([am__tar]) +AC_SUBST([am__untar]) +]) # _AM_PROG_TAR + +m4_include([m4/codeset.m4]) +m4_include([m4/gettext.m4]) +m4_include([m4/glibc2.m4]) +m4_include([m4/glibc21.m4]) +m4_include([m4/iconv.m4]) +m4_include([m4/intdiv0.m4]) +m4_include([m4/intl.m4]) +m4_include([m4/intlmacosx.m4]) +m4_include([m4/intmax.m4]) +m4_include([m4/inttypes-pri.m4]) +m4_include([m4/inttypes_h.m4]) +m4_include([m4/lcmessage.m4]) +m4_include([m4/lib-ld.m4]) +m4_include([m4/lib-link.m4]) +m4_include([m4/lib-prefix.m4]) +m4_include([m4/libtool.m4]) +m4_include([m4/lock.m4]) +m4_include([m4/longlong.m4]) +m4_include([m4/ltoptions.m4]) +m4_include([m4/ltsugar.m4]) +m4_include([m4/ltversion.m4]) +m4_include([m4/lt~obsolete.m4]) +m4_include([m4/nls.m4]) +m4_include([m4/po.m4]) +m4_include([m4/printf-posix.m4]) +m4_include([m4/progtest.m4]) +m4_include([m4/size_max.m4]) +m4_include([m4/stdint_h.m4]) +m4_include([m4/uintmax_t.m4]) +m4_include([m4/ulonglong.m4]) +m4_include([m4/visibility.m4]) +m4_include([m4/wchar_t.m4]) +m4_include([m4/wint_t.m4]) +m4_include([m4/xsize.m4]) --- gtklp-1.2.7.orig/compile +++ gtklp-1.2.7/compile @@ -0,0 +1,347 @@ +#! /bin/sh +# Wrapper for compilers which do not understand '-c -o'. + +scriptversion=2012-10-14.11; # UTC + +# Copyright (C) 1999-2013 Free Software Foundation, Inc. +# Written by Tom Tromey . +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2, or (at your option) +# any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + +# As a special exception to the GNU General Public License, if you +# distribute this file as part of a program that contains a +# configuration script generated by Autoconf, you may include it under +# the same distribution terms that you use for the rest of that program. + +# This file is maintained in Automake, please report +# bugs to or send patches to +# . + +nl=' +' + +# We need space, tab and new line, in precisely that order. Quoting is +# there to prevent tools from complaining about whitespace usage. +IFS=" "" $nl" + +file_conv= + +# func_file_conv build_file lazy +# Convert a $build file to $host form and store it in $file +# Currently only supports Windows hosts. If the determined conversion +# type is listed in (the comma separated) LAZY, no conversion will +# take place. +func_file_conv () +{ + file=$1 + case $file in + / | /[!/]*) # absolute file, and not a UNC file + if test -z "$file_conv"; then + # lazily determine how to convert abs files + case `uname -s` in + MINGW*) + file_conv=mingw + ;; + CYGWIN*) + file_conv=cygwin + ;; + *) + file_conv=wine + ;; + esac + fi + case $file_conv/,$2, in + *,$file_conv,*) + ;; + mingw/*) + file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'` + ;; + cygwin/*) + file=`cygpath -m "$file" || echo "$file"` + ;; + wine/*) + file=`winepath -w "$file" || echo "$file"` + ;; + esac + ;; + esac +} + +# func_cl_dashL linkdir +# Make cl look for libraries in LINKDIR +func_cl_dashL () +{ + func_file_conv "$1" + if test -z "$lib_path"; then + lib_path=$file + else + lib_path="$lib_path;$file" + fi + linker_opts="$linker_opts -LIBPATH:$file" +} + +# func_cl_dashl library +# Do a library search-path lookup for cl +func_cl_dashl () +{ + lib=$1 + found=no + save_IFS=$IFS + IFS=';' + for dir in $lib_path $LIB + do + IFS=$save_IFS + if $shared && test -f "$dir/$lib.dll.lib"; then + found=yes + lib=$dir/$lib.dll.lib + break + fi + if test -f "$dir/$lib.lib"; then + found=yes + lib=$dir/$lib.lib + break + fi + if test -f "$dir/lib$lib.a"; then + found=yes + lib=$dir/lib$lib.a + break + fi + done + IFS=$save_IFS + + if test "$found" != yes; then + lib=$lib.lib + fi +} + +# func_cl_wrapper cl arg... +# Adjust compile command to suit cl +func_cl_wrapper () +{ + # Assume a capable shell + lib_path= + shared=: + linker_opts= + for arg + do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + eat=1 + case $2 in + *.o | *.[oO][bB][jJ]) + func_file_conv "$2" + set x "$@" -Fo"$file" + shift + ;; + *) + func_file_conv "$2" + set x "$@" -Fe"$file" + shift + ;; + esac + ;; + -I) + eat=1 + func_file_conv "$2" mingw + set x "$@" -I"$file" + shift + ;; + -I*) + func_file_conv "${1#-I}" mingw + set x "$@" -I"$file" + shift + ;; + -l) + eat=1 + func_cl_dashl "$2" + set x "$@" "$lib" + shift + ;; + -l*) + func_cl_dashl "${1#-l}" + set x "$@" "$lib" + shift + ;; + -L) + eat=1 + func_cl_dashL "$2" + ;; + -L*) + func_cl_dashL "${1#-L}" + ;; + -static) + shared=false + ;; + -Wl,*) + arg=${1#-Wl,} + save_ifs="$IFS"; IFS=',' + for flag in $arg; do + IFS="$save_ifs" + linker_opts="$linker_opts $flag" + done + IFS="$save_ifs" + ;; + -Xlinker) + eat=1 + linker_opts="$linker_opts $2" + ;; + -*) + set x "$@" "$1" + shift + ;; + *.cc | *.CC | *.cxx | *.CXX | *.[cC]++) + func_file_conv "$1" + set x "$@" -Tp"$file" + shift + ;; + *.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO]) + func_file_conv "$1" mingw + set x "$@" "$file" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift + done + if test -n "$linker_opts"; then + linker_opts="-link$linker_opts" + fi + exec "$@" $linker_opts + exit 1 +} + +eat= + +case $1 in + '') + echo "$0: No command. Try '$0 --help' for more information." 1>&2 + exit 1; + ;; + -h | --h*) + cat <<\EOF +Usage: compile [--help] [--version] PROGRAM [ARGS] + +Wrapper for compilers which do not understand '-c -o'. +Remove '-o dest.o' from ARGS, run PROGRAM with the remaining +arguments, and rename the output as expected. + +If you are trying to build a whole package this is not the +right script to run: please start by reading the file 'INSTALL'. + +Report bugs to . +EOF + exit $? + ;; + -v | --v*) + echo "compile $scriptversion" + exit $? + ;; + cl | *[/\\]cl | cl.exe | *[/\\]cl.exe ) + func_cl_wrapper "$@" # Doesn't return... + ;; +esac + +ofile= +cfile= + +for arg +do + if test -n "$eat"; then + eat= + else + case $1 in + -o) + # configure might choose to run compile as 'compile cc -o foo foo.c'. + # So we strip '-o arg' only if arg is an object. + eat=1 + case $2 in + *.o | *.obj) + ofile=$2 + ;; + *) + set x "$@" -o "$2" + shift + ;; + esac + ;; + *.c) + cfile=$1 + set x "$@" "$1" + shift + ;; + *) + set x "$@" "$1" + shift + ;; + esac + fi + shift +done + +if test -z "$ofile" || test -z "$cfile"; then + # If no '-o' option was seen then we might have been invoked from a + # pattern rule where we don't need one. That is ok -- this is a + # normal compilation that the losing compiler can handle. If no + # '.c' file was seen then we are probably linking. That is also + # ok. + exec "$@" +fi + +# Name of file we expect compiler to create. +cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'` + +# Create the lock directory. +# Note: use '[/\\:.-]' here to ensure that we don't use the same name +# that we are using for the .o file. Also, base the name on the expected +# object file name, since that is what matters with a parallel build. +lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d +while true; do + if mkdir "$lockdir" >/dev/null 2>&1; then + break + fi + sleep 1 +done +# FIXME: race condition here if user kills between mkdir and trap. +trap "rmdir '$lockdir'; exit 1" 1 2 15 + +# Run the compile. +"$@" +ret=$? + +if test -f "$cofile"; then + test "$cofile" = "$ofile" || mv "$cofile" "$ofile" +elif test -f "${cofile}bj"; then + test "${cofile}bj" = "$ofile" || mv "${cofile}bj" "$ofile" +fi + +rmdir "$lockdir" +exit $ret + +# Local Variables: +# mode: shell-script +# sh-indentation: 2 +# eval: (add-hook 'write-file-hooks 'time-stamp) +# time-stamp-start: "scriptversion=" +# time-stamp-format: "%:y-%02m-%02d.%02H" +# time-stamp-time-zone: "UTC" +# time-stamp-end: "; # UTC" +# End: --- gtklp-1.2.7.orig/debian/README.Debian +++ gtklp-1.2.7/debian/README.Debian @@ -0,0 +1,16 @@ +gtklp for Debian +---------------------- + +This release now uses GTK2. + +gtklp-1.0rel+1.0f-2 now has "/usr/bin/gtklpq" as the default "GtkLPQ +Command", so calls to GtkLPQ from GtkLP should now work correctly. +Also, `sensible-browser' (from debianutils) is used as the default +browser command instead of `netscape'. + +For those upgrading from older releases (0.9n), you should change the +"GtkLPQ Command" textbox under the GtkLP tab in gtklp from "1" to +"/usr/bin/gtklpq". + + -- Zak B. Elep , Sat Aug 27 09:04:08 2005 + --- gtklp-1.2.7.orig/debian/README.source +++ gtklp-1.2.7/debian/README.source @@ -0,0 +1,33 @@ +Building gtklp for Debian +------------------------- + +The gtklp source package uses quilt to apply and remove its +patches. Please refer to /usr/share/doc/quilt/README.source for +information about how to use quilt for source packages. + +The quilt series is generated from the Git repository, using TopGit +itself. This process is documented in +/usr/share/doc/topgit/HOWTO-tg2quilt.gz . + +The gtklp packages uses a branch layout similar to that described for +topgit(1) and git-buildpackage(1): + + bugs/*: fixes for Debian bugs, usually based upstream, but when a bugs + branch is based on the debian branch, it is not tracked by + topgit + + fixes/*: miscellaneous fixes, based upstream + + pristine-tar: delta files for pristine-tar(1) + + debian/*: Debian-specific changes not for upstrean, e.g., custom + links using Debian tools + +Package building is still done on the master branch: + + $ git checkout master + $ debian/rules tg-cleanexport + $ git buildpackage --git-ignore-new + $ git clean -df && git checkout -f + + -- Zak B. Elep , Fri, 28 Aug 2009 10:09:13 +0800 --- gtklp-1.2.7.orig/debian/changelog +++ gtklp-1.2.7/debian/changelog @@ -0,0 +1,426 @@ +gtklp (1.2.7-2.3+rpi1) jessie-staging; urgency=medium + + * Fix FTBFS with new cups. + + -- Peter Michael Green Sat, 15 Nov 2014 23:20:35 +0000 + +gtklp (1.2.7-2.3) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS with binutils-gold": add patch fix_FTBFS_binutils-gold.patch + from Hideki Yamane. + (Closes: #554752) + + -- gregor herrmann Mon, 13 Feb 2012 21:52:54 +0100 + +gtklp (1.2.7-2.2) unstable; urgency=low + + * Non-maintainer upload. + * Fix "FTBFS: gtklp.h:99:1: error: unknown type name 'ppd_file_t'": + add patch from Ubuntu / Colin Watson: + - bugs/639032.diff: Include for ppd_file_t + (closes: #639032, LP: #831283). + * Fix "FTBFS format not a string literal and no format arguments [- + Werror=format-security]": add patch from Ubuntu / Daniel T Chen: + - bugs/644113.diff: Fix format string literals and some unused variables. + Resolves FTBFS. (Closes: #644113) + + -- gregor herrmann Mon, 21 Nov 2011 17:13:35 +0100 + +gtklp (1.2.7-2.1) unstable; urgency=low + + * Non-maintainer upload. + * There is an autopoint package now so build-depending on + it and remove cvs (Closes: #572471). + + -- Nico Golde Sun, 25 Jul 2010 20:29:38 +0200 + +gtklp (1.2.7-2) unstable; urgency=low + + * Use TopGit and Quilt to manage patches + * Re-add debian/patches, autogenerated from git branches + * debian/rules: call autogen.sh after applying patches + + -- Zak B. Elep Fri, 28 Aug 2009 10:55:54 +0800 + +gtklp (1.2.7-1) unstable; urgency=low + + * New Upstream Version + + No longer dumps core when unconfigured (Closes: #170025) + + No errors displayed while running gtklpq (Closes: 370491) + * Package now maintained in git, see http://code.zakame.net/gtklp.git + * Remove debian/patches, now merged in git + * debian/rules: + + Remove simple-patchsys.mk + + Rebuild Autotools at every package build, as documented + in autotools-dev + * debian/control: update policy version, add Vcs fields and + necessary Build-Depends for Autotools rebuild + * autogen.sh: use autopoint instead of gettextize + * include/defaults.h: increase printer name maximum length + (Closes: #422266) + + -- Zak B. Elep Tue, 25 Aug 2009 14:41:02 +0800 + +gtklp (1.2.6-1) unstable; urgency=low + + * New upstream release (Closes: #519834). + * Acknowledge NMU by petere@, thanks + * debian/control: + + Update maintainer email + + Update Standards-Version + + Revert Section back to x11 + + Remove obsolete versioned dependency on libcupsys2-dev (now libcups2-dev) + + Add ${misc:Depends} + * debian/patches: + + 15_configure.in_update: restructure configure.in and remove stuff + we don't need (gtk+1.2, forte, old file-dialog build) + + 20_update_autotools: regenerate after above patching + * debian/menu: + + Update menu sections + + -- Zak B. Elep Thu, 11 Dec 2008 16:22:59 +0800 + +gtklp (1.2.3-1.1) unstable; urgency=low + + * Non-maintainer upload. + * Removed garbage files from 20_autotools_update.patch, to fix FTBFS if + built twice in a row. (Closes: #442589) + * Added Homepage control field. + + -- Peter Eisentraut Mon, 30 Jun 2008 10:57:38 +0200 + +gtklp (1.2.3-1) unstable; urgency=low + + * New upstream release + * debian/patches: + + Updated 20_autotools_update for automake1.10 + * debian/watch: + + Updated so uscan now works. + * debian/copyright: + + Separate copyright and license statements, thanks to + Nico Golde + + -- Zak B. Elep Tue, 12 Jun 2007 15:12:58 +0000 + +gtklp (1.2.2-1) unstable; urgency=low + + * New upstream version. + * debian/patches: + + Remove 15_autotools_freetypefix.patch and 19_po_updates.patch, + now merged in upstream. + + Update 20_autotools_update.patch, some of it has been merged + (notably ./intl) + * debian/copyright: + + Slightly touch, update source download location. + + -- Zak B. Elep Sat, 3 Jun 2006 20:36:46 +0800 + +gtklp (1.2.1-2) unstable; urgency=low + + * debian/control: + + Change Section to `gnome'. + + Bump Standards-Version. + + Slightly touch the synopsis and long description. + * debian/patches: + + Refresh patches and include annotations. + + Add 19_po_updates.patch , fixing Catalan (thanks to Lluis + Vilanova) and updating English and French translations. + (Closes: #367575) + + Update 20_autotools_update.patch to also update gettext. This + seems to break the touch-fu in debian/rules, so a `touch -r + m4/glibc2.m4 m4/gettext.m4` seems to be in order :/ + * debian/rules: + + Ensure that PO's get recompiled upon next build by removing + po/stamp-po on clean. + + Call `$(MAKE) distclean' earlier by appending to + `cleanbuilddir/gtklp' target so we can avoid rerunning + `configure' upon clean (which is due to the reversion of + 20_autotools_update.) + + Improve the touch-fu so we don't accidentally get autotools + rebuilt (or else we'll have a FTBFS.) See note on + 20_autotools_update.patch above. + * Remove Emacs local vars in this changelog. + + -- Zak B. Elep Mon, 22 May 2006 10:06:13 +0800 + +gtklp (1.2.1-1) unstable; urgency=low + + * New upstream release + * debian/patches: + - Rename and freshen patches. + + -- Zak B. Elep Sat, 4 Mar 2006 10:46:18 +0800 + +gtklp (1.2.0-1) unstable; urgency=low + + * New upstream release + * debian/patches: + - Added 15autotools_freetypefix.patch (sort out fixes) + - Updated 20autotools_update.patch + * debian/watch: + - Fix sourceforge watch. + * debian/rules: + - Use touch-fu instead of patching autotools with AM_MAINTAINER_MODE + to reduce diff size. + + -- Zak B. Elep Fri, 24 Feb 2006 10:21:48 +0800 + +gtklp (1.1.0-2) unstable; urgency=low + + * Move build system to CDBS + debhelper. + * debian/patches: + - Add 10debian_gtklpq_browser (fix from 1.0rel+1.0g-1). + - Add 20autotools_update fixing libtool to not include unneeded + freetype, et. al in build, see + http://wiki.debian.org/FreetypeTransition + * debian/control: + - Rewrite description as per + http://people.debian.org/~walters/descriptions.html, and push + homepage link a bit as per developers-reference best practices ;) + * debian/rules: + - Remove extra ch{s,t} locales after install. + + -- Zak B. Elep Sat, 28 Jan 2006 14:34:38 +0800 + +gtklp (1.1.0-1) unstable; urgency=low + + * New upstream release. + * debian/control: + - Added gettext to Build-Depends in response to possible missing B-D + warnings from the buildds. + * debian/changelog: + - Update FSF address. + + -- Zak B. Elep Tue, 13 Dec 2005 15:12:10 +0800 + +gtklp (1.0rel+1.0g-1) unstable; urgency=low + + * New upstream release + * Debian release now maintained in GNU Arch repository at + http://zakame.spunge.org/arch/debian-2005/ + * Updated autotools toolchain and config.{guess,sub} files in latest + autotools-dev (20050803.1) + * Add DEF_GTKLPQ_CMD in include/defaults.h and point GTKLPQCOM to it in + gtklp/gtklp_functions.c (Closes: #271640) + * Use `sensible-browser' instead of `netscape' in include/defaults.h + (Closes: #319347) + * Now using a completely new build system with Manoj Srivastava's + debian-dir and skeleton-make-rules instead of debhelper + + -- Zak B. Elep Wed, 31 Aug 2005 10:33:09 +0800 + +gtklp (1.0rel+1.0f-1) unstable; urgency=low + + * New upstream release + * Fixes number-of-copies being ignored because of input from keyboard + (Closes: #312755) + * Upstream includes patch from Jens Seidel containing German PO file + corrections (from gtklp-1.0e) (Closes: #314056) + + -- Zak B. Elep Sun, 19 Jun 2005 21:47:48 +0800 + +gtklp (1.0rel+1.0d-1) unstable; urgency=low + + * New upstream release + * Edited debian/rules to remove config.{guess,sub}.* cruft and use files + from /usr/share/misc/config.{guess,sub} (autotools-dev) + * Added autotools-dev in Build-Depends in debian/control + + -- Zak B. Elep Sat, 11 Jun 2005 17:05:05 +0800 + +gtklp (1.0rel-1) unstable; urgency=low + + * New upstream release + * Fixed debian/watch, now works + + -- Zak B. Elep Tue, 7 Dec 2004 15:23:27 +0800 + +gtklp (1.0pre3-2) unstable; urgency=low + + * Using the new GTK 2.4 file selector (thanks to patch by Jeramy Rutley ;) + + -- Zak B. Elep Tue, 7 Dec 2004 13:55:35 +0800 + +gtklp (1.0pre3-1) unstable; urgency=low + + * New upstream release + * Fixed debian/menu typo (s/Toos/Tools/) (Closes: #277689) + * Changed debian/rules to include dh_installmenu as per #277689 + * Fixed missing *.mo on gettext install (due to stale po/stamp-po) + * More dh_* comment-outs on debian/rules (link,installexamples) + + -- Zak B. Elep Sat, 23 Oct 2004 10:38:19 +0800 + +gtklp (1.0pre2-1) unstable; urgency=low + + * New upstream release + * Changed README.Debian to notify users upgrading from 0.9n of the "GtkLPQ + Command" in gtklp. + + -- Zak B. Elep Sun, 19 Sep 2004 11:47:14 +0800 + +gtklp (1.0pre1-1) unstable; urgency=low + + * New upstream release + * Finally got upstream to fix the copyright issues. Now the copyright file + can be properly filed :). Modified debian/copyright to reflect this + (Thanks Andreas! ;) + * Removed debian/watch as it doesn't work (Need to resolve this in the near + future, though :( learn uscan... + + -- Zak B. Elep Sun, 29 Aug 2004 22:14:31 +0800 + +gtklp (0.9u-1) unstable; urgency=low + + * New upstream release + + -- Zak B. Elep Tue, 24 Aug 2004 08:59:13 +0800 + +gtklp (0.9s-2) unstable; urgency=low + + * Removed ChangeLog as it doubled changelog.gz + * Changed debian/copyright to reflect change in package maintainer + + -- Zak B. Elep Mon, 14 Jun 2004 16:43:24 +0800 + +gtklp (0.9s-1) unstable; urgency=low + + * New upstream version, merged patches in 0.9p-1 to upstream source: + - "Look" check boxes now work properly (Closes: #153779) + - (Some) typos in the man page have been corrected (Closes: #170642) + - Spanish translation of "even" and "odd" are now correct (Closes: + #226839) + * GTK2 is now the default, fixed debian/control and description + * Fixed debian/rules to deal with leftover .gmo's + * Fixed debian/copyright, but source should also be changed to conform with + GPL licensing rules (i.e., putting the license declaration _inside_ the + source, it's not enough to just include the COPYING file ;) + * Rebuilt gtklp against libcupsys2-gnutls10 (Closes: #249494) + * Upstream says the following bugs have been fixed since 0.9p: + - Printer instances ought to be supported (Closes: #218608) + - Now doesn't dump core when no printers are available (Closes: #170025) + - Should now save page option on being told to do so (Closes: #174518) + - Printing on localhost should now recognize printer settings (Closes: + #177478) + + -- Zak B. Elep Thu, 27 May 2004 14:05:34 +0800 + +gtklp (0.9p-1) unstable; urgency=low + + * New maintainer (Closes: #244199, #245619) + * New upstream version (Closes: #209172, #194459) + * Fixed typo in man page (#170642), patch forwarded to upstream + * Fixed translation bug (#226839), patch forwarded to upstream + * Man page fixes (Closes: #100435) + * English is the default language (Closes: #85962) + * Rebuilt debian directory to reflect new Standards-Version (was 3.2.1) + * Build-Dependencies already complete (Closes: #84581, #89878, #90528, + #123676) + * Added Kalle Olavi Niemitalo's GTK+ signals patch (Closes: #153799) + * (Re)added Guido Guenther's patch for gtklpq button in gtklp (Closes: + #157399) + * Removed gnutls and debmake `artifact' dependencies upon suggestion + by Andreas Metzler (Closes: #219555) + + -- Zak B. Elep Sun, 25 Apr 2004 13:30:01 +0800 + +gtklp (0.9n-1) unstable; urgency=low + + * New upstream version closes: Bug#172417 + * closes: Bug#124709, Bug#136780, Bug#156795 + * closes: Bug#162312 + * moved man-page from /usr/man to /usr/share/man (closes: #164640) + * added libgnutls(5)-dev to build dependencies + * removed /usr/X11R6/bin from dirs as not used + + -- Matthias Kabel Fri, 20 Jun 2002 22:34:13 +0200 + +gtklp (0.9m-2) unstable; urgency=low + + * New upstream version closes: Bug#162312 + + -- Matthias Kabel Thu, 25 Sep 2002 21:11:28 +0200 + +gtklp (0.9m-1) unstable; urgency=low + + * New upstream version closes: Bug#162312 + + -- Matthias Kabel Thu, 25 Sep 2002 21:11:28 +0200 + +gtklp (0.9k-3) unstable; urgency=low + + * Additional Button to start gtklp Thanks to Guido Guenther closes Bug#157399 + + -- Matthias Kabel Thu, 26 Aug 2002 22:34:55 +0200 + +gtklp (0.9k-2) unstable; urgency=low + + * Corrected the menu, closes: Bug#156795 + + -- Matthias Kabel Thu, 15 Aug 2002 19:28:39 +0200 + +gtklp (0.9k-1) unstable; urgency=low + + * New upstream version + + -- Matthias Kabel Fri, 26 Jul 2002 21:55:18 +0200 + + +gtklp (0.9f-1) unstable; urgency=low + + * New upstream version + + -- Matthias Kabel Sun, 14 Apr 2002 19:36:44 +0200 + +gtklp (0.9-1) unstable; urgency=low + + * New upstream version + + -- Matthias Kabel Tue, 5 Mar 2002 22:55:23 +0200 + +gtklp (0.8h-2) unstable; urgency=low + + * Fixed a Bug in postinst closes: Bug##136910 + + -- Matthias Kabel Tue, 5 Mar 2002 22:28:12 +0200 + +gtklp (0.8h-1) unstable; urgency=low + + * New upstream version + Support for password-protected printers + + closes: Bug#123676 + + -- Matthias Kabel Wed, 12 Dec 2001 23:57:42 +0200 + + +gtklp (0.8-1) unstable; urgency=low + + * New upstream version + + * gtklpq new in upstream + + -- Matthias Kabel Sun, 16 Sep 2001 21:25:31 +0200 + +gtklp (0.6g-3) unstable; urgency=low + + + * added the documentation from the homepage + + * improved the man-page + + closes: Bug#100434 + + -- Matthias Kabel Wed, 17 Jul 2001 22:22:36 +0100 + +gtklp (0.6g-2) unstable; urgency=low + + + * fixed the man page. closes: Bug#100435 + added debstd to the build-dependencies. closes: Bug#90528 + + * new upstream version + + + -- Matthias Kabel Sat, 21 April 2001 10:52:41 +0100 --- gtklp-1.2.7.orig/debian/compat +++ gtklp-1.2.7/debian/compat @@ -0,0 +1 @@ +5 --- gtklp-1.2.7.orig/debian/control +++ gtklp-1.2.7/debian/control @@ -0,0 +1,23 @@ +Source: gtklp +Section: x11 +Priority: optional +Maintainer: Zak B. Elep +Build-Depends: autoconf, automake, autotools-dev, cdbs, autopoint, debhelper (>= 5.0.0), gettext, libcups2-dev, libglib2.0-dev, libgtk2.0-dev, libtool, quilt +Build-Conflicts: autoconf2.13, automake1.4 +Standards-Version: 3.8.3 +Homepage: http://gtklp.sourceforge.net/ +Vcs-Git: git://code.zakame.net/git/gtklp.git +Vcs-Browser: http://code.zakame.net/gtklp.git + +Package: gtklp +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Description: printing tool for CUPS on the GNOME Desktop + GtkLP lets you print files under the Common Unix Printing System + (CUPS). Written in GTK+ 2.0 and for the GNOME desktop environment, + it supports multiple option settings for each printer it knows, + with all the standard CUPS options available. + . + Other features include localized dialogs for several languages, as + well as multiple interfaces; with a little more effort, you can use + GtkLP as a drop-in replacement for `lp'. --- gtklp-1.2.7.orig/debian/copyright +++ gtklp-1.2.7/debian/copyright @@ -0,0 +1,35 @@ +This is the Debian package for GtkLP, and it is built from sources +obtained from http://gtklp.sourceforge.net/ + +This package was debianized by Matthias Kabel on +Sun, 12 Nov 2000 18:04:06 +0100. + +Zak B. Elep took over the maintenance of this +package on Sun, 25 Apr 2004 13:30:01 +0800. + +Upstream Author: Tobias Mueller + +Copyright: Copyright (C) 1998-2004 Tobias Mueller + +License: + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, + Boston, MA 02110-1301, USA + +On Debian systems, the complete text of the GNU General Public License, +version 2, can be found in the file `/usr/share/common-licenses/GPL-2'. + +Zak B. Elep + --- gtklp-1.2.7.orig/debian/menu +++ gtklp-1.2.7/debian/menu @@ -0,0 +1,4 @@ +?package(gtklp):needs="X11" section="Applications/System/Administration"\ + title="gtklp" command="/usr/bin/gtklp" +?package(gtklp):needs="X11" section="Applications/System/Administration"\ + title="gtklpq" command="/usr/bin/gtklpq" --- gtklp-1.2.7.orig/debian/patches/bugs/422266.diff +++ gtklp-1.2.7/debian/patches/bugs/422266.diff @@ -0,0 +1,28 @@ +From: Zak B. Elep +Subject: [PATCH] include/defaults.h: increase printer name maximum length + +Bump DEF_PRN_LEN to a bigger size than 50 characters. + +Debian Bug #422266 + +Signed-off-by: Zak B. Elep + +--- + include/defaults.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/include/defaults.h b/include/defaults.h +index be0f451..caf5c75 100644 +--- a/include/defaults.h ++++ b/include/defaults.h +@@ -69,7 +69,7 @@ + #define GTKLPRC_GLOBAL "gtklprc" + + /* Constants */ +-#define DEF_PRN_LEN 50 ++#define DEF_PRN_LEN 256 + #define MAX_BANNER 20 + #define MAXPATH 256 + #define MAXLINE 256 +-- +tg: (f201f96..) bugs/422266 (depends on: upstream) --- gtklp-1.2.7.orig/debian/patches/bugs/639032.diff +++ gtklp-1.2.7/debian/patches/bugs/639032.diff @@ -0,0 +1,19 @@ +Description: Include for ppd_file_t +Author: Colin Watson +Bug-Debian: http://bugs.debian.org/639032 +Bug-Ubuntu: https://bugs.launchpad.net/bugs/831283 +Forwarded: no +Last-Update: 2011-09-14 + +Index: b/gtklp/gtklp.h +=================================================================== +--- a/gtklp/gtklp.h ++++ b/gtklp/gtklp.h +@@ -27,6 +27,7 @@ + #include + #include + #include ++#include + + #include + --- gtklp-1.2.7.orig/debian/patches/bugs/644113.diff +++ gtklp-1.2.7/debian/patches/bugs/644113.diff @@ -0,0 +1,307 @@ +Index: gtklp-1.2.7/libgtklp/libgtklp.c +=================================================================== +--- gtklp-1.2.7.orig/libgtklp/libgtklp.c 2011-10-30 13:22:09.000000000 -0400 ++++ gtklp-1.2.7/libgtklp/libgtklp.c 2011-10-30 13:52:53.000000000 -0400 +@@ -489,7 +489,7 @@ + + const char *getPass (const char *prompt) + { +- GtkWidget *vbox, *hbox, *hbox1, *vbox1, *vbox2, *labell, *labelp, *yes, *no; ++ GtkWidget *vbox, *hbox, *vbox1, *vbox2, *labell, *labelp; + gint gi1; + #if GTK_MAJOR_VERSION == 1 + GtkWidget *sep,*passwin; +@@ -715,9 +715,6 @@ + GtkWidget *exitErrorDialog; + GtkWidget *hbox,*label,*pixmapwid; + char tmplabel[MAXLINE+1]; +- GtkStyle *style; +- GdkPixmap *pixmap; +- GdkBitmap *mask; + #if GTK_MAJOR_VERSION == 1 + GtkWidget *button,*vbox,*sep,*bbox; + #endif +@@ -761,9 +758,9 @@ + gtk_widget_show(pixmapwid); + + if(strlen(gerror2) == 0) +- snprintf(tmplabel,(size_t)MAXLINE,gerror1); ++ snprintf(tmplabel,(size_t)MAXLINE,"%s",gerror1); + else +- snprintf(tmplabel,(size_t)MAXLINE,gerror1,gerror2); ++ snprintf(tmplabel,(size_t)MAXLINE,"%s\n%s",gerror1,gerror2); + label=gtk_label_new(tmplabel); + gtk_box_pack_end(GTK_BOX(hbox),label,FALSE, FALSE,FRAME_SPACING_V); + gtk_widget_show(label); +@@ -791,7 +788,7 @@ + #endif + } else { + if(strlen(gerror2) == 0) +- g_warning(gerror1); ++ g_warning("%s",gerror1); + else + g_warning(gerror1,gerror2); + } +Index: gtklp-1.2.7/gtklp/gtklp.c +=================================================================== +--- gtklp-1.2.7.orig/gtklp/gtklp.c 2011-10-30 13:22:09.000000000 -0400 ++++ gtklp-1.2.7/gtklp/gtklp.c 2011-10-30 13:54:03.000000000 -0400 +@@ -136,7 +136,6 @@ + int calledLpr; + int calledLp; + int forceX; +- char Path[MAXPATH+1]; + char *z1; + char tmpenv[MAX_SERVER_NAME+13]; + +@@ -216,7 +215,6 @@ + confdir[0]=(uintptr_t)NULL; + ServerName[0]=(uintptr_t)NULL; + UserName[0]=(uintptr_t)NULL; +- Path[0]=(uintptr_t)NULL; + ReallyPrint=1; + needFileSelection = 1; + cmdNumCopies=-1; +@@ -302,7 +300,7 @@ + case '?': + if(calledGtkLP) + { +- g_print(str2str(_("Usage: gtklp [-P|-d printer] [-c configdir] [-S server] [-U user] [-p port] [-l] [-D] [-V] [-b] [-i] [-# n] [-C] [-H] [-E] [-J jobname] [-q priority] [-o option=value ...] [file(s)]\n"))); ++ g_print("%s",str2str(_("Usage: gtklp [-P|-d printer] [-c configdir] [-S server] [-U user] [-p port] [-l] [-D] [-V] [-b] [-i] [-# n] [-C] [-H] [-E] [-J jobname] [-q priority] [-o option=value ...] [file(s)]\n"))); + } + return(0); + break; +@@ -310,7 +308,7 @@ + if(calledGtkLP) + { + if(DEBUG) +- printf("Ignoring Data on stdin !\n"); ++ printf("%s","Ignoring Data on stdin !\n"); + ignore_stdin=1; + } + if(calledLp) +@@ -324,7 +322,7 @@ + break; + case 'b': + if(DEBUG) +- printf("Using builtin defaults !\n"); ++ printf("%s","Using builtin defaults !\n"); + builtin=1; + break; + case 'p': +@@ -342,7 +340,7 @@ + if(strlen(optarg) > MAX_PORT) + { + if(DEBUG) +- printf("Port too long !\n"); ++ printf("%s","Port too long !\n"); + exitOnError(str2str(_("Invalid Portnumber !")),"",-1); + } + else +@@ -368,7 +366,7 @@ + else + { + if(DEBUG) +- printf("PROG-ERROR: Printername too long !\n "); ++ printf("%s","PROG-ERROR: Printername too long !\n "); + exitOnError(str2str(_("Invalid Printername !")),"",-1); + } + break; +@@ -387,7 +385,7 @@ + else + { + if(DEBUG) +- printf("PROG-ERROR: Servername too long !\n "); ++ printf("%s","PROG-ERROR: Servername too long !\n "); + exitOnError(str2str(_("Invalid Servername !")),"",-1); + } + break; +@@ -399,7 +397,7 @@ + else + { + if(DEBUG) +- printf("PROG-ERROR: Username too long !\n "); ++ printf("%s","PROG-ERROR: Username too long !\n "); + exitOnError(str2str(_("Invalid Username !")),"",-1); + } + break; +@@ -474,7 +472,7 @@ + case 'r': + if(calledLpr) + { +- g_print("lp -t not supported !\n"); ++ g_print("%s","lp -t not supported !\n"); + } + if(calledLp) + break; +@@ -524,7 +522,7 @@ + else + { + if(DEBUG) +- printf("Prog-Error: MAXPRINTFILES to short !\n"); ++ printf("%s","Prog-Error: MAXPRINTFILES to short !\n"); + exitOnError(str2str(_("Too many files to print !")),"",-3); + } + } +@@ -538,7 +536,7 @@ + + if(DEBUG) + { +- printf("Files to print: \n"); ++ printf("%s","Files to print: \n"); + for(i1=0;i1= MAXPRINTFILES) { + gtk_widget_set_sensitive(fileAdd,FALSE); +Index: gtklp-1.2.7/gtklp/gtklp_functions.c +=================================================================== +--- gtklp-1.2.7.orig/gtklp/gtklp_functions.c 2011-10-30 13:52:53.000000000 -0400 ++++ gtklp-1.2.7/gtklp/gtklp_functions.c 2011-10-30 13:52:53.000000000 -0400 +@@ -216,7 +216,7 @@ + + void getOptions(char *printername,int which) + { +- int i1,hasrc,nohome,ppdOptAnz; ++ int i1,hasrc,nohome; + int needNew=0; + int whichfile=0; + char printpath[MAXPATH+1],globalpath[MAXPATH+1]; +@@ -264,7 +264,6 @@ + if(!builtin) + { + nohome=0; +- ppdOptAnz=-1; + printpath[0]=(uintptr_t)NULL; + globalpath[0]=(uintptr_t)NULL; + printpath_g[0]=(uintptr_t)NULL; +Index: gtklp-1.2.7/gtklp/image.c +=================================================================== +--- gtklp-1.2.7.orig/gtklp/image.c 2011-10-30 13:22:09.000000000 -0400 ++++ gtklp-1.2.7/gtklp/image.c 2011-10-30 13:52:53.000000000 -0400 +@@ -109,15 +109,12 @@ + + void imageScalingAllChanged(GtkWidget *widget,gpointer data) + { +- int strangeerrortrap; + char tmp[MAXLINE+1]; + + snprintf(tmp,(size_t)MAXLINE,"%s",gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(scaleTypeCombo)->entry))); + if(DEBUG) + printf("Scaling Combo changed: %s\n",tmp); + +- strangeerrortrap=1; +- + if(strlen(tmp)==0) { + if(DEBUG) + printf("Ignore empty PopUp-Result in imageScalingAllChanged\n"); +Index: gtklp-1.2.7/gtklpq/gtklpq.c +=================================================================== +--- gtklp-1.2.7.orig/gtklpq/gtklpq.c 2011-10-30 13:22:09.000000000 -0400 ++++ gtklp-1.2.7/gtklpq/gtklpq.c 2011-10-30 13:52:53.000000000 -0400 +@@ -100,7 +100,6 @@ + GdkBitmap *mgtklpq_exit,*mgtklpq_move,*mgtklpq_prio, *mgtklpq_stop_job, *mgtklpq_stop_jobs; + GtkWidget *image; + int i1; +- char Path[MAXPATH+1]; + char *z1; + int queryIntervall=0; + int xpos,ypos; +@@ -237,7 +236,6 @@ + DEF_PRN[0]=(uintptr_t)NULL; + ServerName[0]=(uintptr_t)NULL; + UserName[0]=(uintptr_t)NULL; +- Path[0]=(uintptr_t)NULL; + passWord[0]=(uintptr_t)NULL; + i1=getopt(argc,argv,GTKLPQ_ProgOpts); + while(i1 != -1) +Index: gtklp-1.2.7/gtklpq/printer.c +=================================================================== +--- gtklp-1.2.7.orig/gtklpq/printer.c 2011-10-30 13:22:09.000000000 -0400 ++++ gtklp-1.2.7/gtklpq/printer.c 2011-10-30 13:52:53.000000000 -0400 +@@ -1163,7 +1163,6 @@ + void cancelJob (GtkWidget * dialog) + { + int job_id; /* Job ID */ +- const char *dest; /* Destination printer */ + char uri[MAX_URI+1]; /* Printer or job URI */ + char touri[MAX_URI+1]; + ipp_t *request; /* IPP request */ +@@ -1228,7 +1227,6 @@ + return; + break; + } +- dest = NULL; + response = NULL; + + if(dialog != (GtkWidget *)NULL) --- gtklp-1.2.7.orig/debian/patches/debian/gtklpq-sensible-browser.diff +++ gtklp-1.2.7/debian/patches/debian/gtklpq-sensible-browser.diff @@ -0,0 +1,45 @@ +From: Zak B. Elep +Subject: [PATCH] Use gtklpq and sensible-browser for defaults + +Let GtkLP be able to invoke GtkLPQ and sensible-browser for its +components. + +Signed-off-by: Zak B. Elep + +--- + gtklp/gtklp_functions.c | 4 +++- + include/defaults.h | 3 ++- + 2 files changed, 5 insertions(+), 2 deletions(-) + +diff --git a/gtklp/gtklp_functions.c b/gtklp/gtklp_functions.c +index 0b05bba..a0b5001 100644 +--- a/gtklp/gtklp_functions.c ++++ b/gtklp/gtklp_functions.c +@@ -721,8 +721,10 @@ void getOptions(char *printername,int which) + jobidonexit=0; + strncpy(BROWSER,DEF_BROWSER_CMD,(size_t)MAXPATH); + strncpy(HELPURL,DEF_HELP_HOME,(size_t)MAXPATH); +- GTKLPQCOM[0]=(uintptr_t)NULL; ++ strncpy(GTKLPQCOM,DEF_GTKLPQ_CMD,(size_t)MAXPATH); + wantconst=0; ++ ++ + #if GTK_MAJOR_VERSION != 1 + mainWindowHeight=0; + mainWindowWidth=0; +diff --git a/include/defaults.h b/include/defaults.h +index be0f451..b8b6108 100644 +--- a/include/defaults.h ++++ b/include/defaults.h +@@ -63,7 +63,8 @@ + /* PATHS */ + #define DEF_GTKLPRC "/etc/gtklp" + #define DEF_HELP_HOME "http://localhost:631/sum.html#STANDARD_OPTIONS" +-#define DEF_BROWSER_CMD "netscape $0 2>/dev/null&" ++#define DEF_BROWSER_CMD "sensible-browser $0 2>/dev/null&" ++#define DEF_GTKLPQ_CMD "gtklpq" + + #define GTKLPRC_USER ".gtklp" + #define GTKLPRC_GLOBAL "gtklprc" +-- +tg: (f201f96..) debian/gtklpq-sensible-browser (depends on: upstream) --- gtklp-1.2.7.orig/debian/patches/fix-ftbfs-new-cups.patch +++ gtklp-1.2.7/debian/patches/fix-ftbfs-new-cups.patch @@ -0,0 +1,82 @@ +Index: gtklp-1.2.7.new/libgtklp/libgtklp.c +=================================================================== +--- gtklp-1.2.7.new.orig/libgtklp/libgtklp.c ++++ gtklp-1.2.7.new/libgtklp/libgtklp.c +@@ -21,6 +21,7 @@ + + */ + ++#define _IPP_PRIVATE_STRUCTURES 1 + + #include + #include +@@ -63,6 +64,8 @@ + #define GTKLPACCEPTDIR "accept" + #define GTKLPDENYDIR "deny" + ++#include ++ + int DEBUG; + int nox; + +@@ -359,9 +362,9 @@ void getPrinters(int loop) + if((attr=ippFindAttribute(response,"job-sheets-default",IPP_TAG_ZERO)) != NULL) + { + if(DEBUG) +- printf("Job-Sheets-Default for %s\n Start: %s\n Stop: %s\n",dests[i1].name,attr->values[0].string.text,attr->values[1].string.text); +- strncpy(PrinterBannerStart[i1-droppedPrinters],attr->values[0].string.text,(size_t)MAXLINE); +- strncpy(PrinterBannerEnd[i1-droppedPrinters],attr->values[1].string.text,(size_t)MAXLINE); ++ printf("Job-Sheets-Default for %s\n Start: %s\n Stop: %s\n",dests[i1].name,ippGetString(attr,0,NULL),ippGetString(attr,1,NULL)); ++ strncpy(PrinterBannerStart[i1-droppedPrinters],ippGetString(attr,0,NULL),(size_t)MAXLINE); ++ strncpy(PrinterBannerEnd[i1-droppedPrinters],ippGetString(attr,1,NULL),(size_t)MAXLINE); + } + else + { +@@ -373,8 +376,8 @@ void getPrinters(int loop) + if((attr=ippFindAttribute(response,"printer-location",IPP_TAG_ZERO)) != NULL) + { + if(DEBUG) +- printf("Location: %s\n",attr->values[0].string.text); +- strncpy(PrinterLocations[i1-droppedPrinters],attr->values[0].string.text,(size_t)MAXLINE); ++ printf("Location: %s\n",ippGetString(attr,0,NULL)); ++ strncpy(PrinterLocations[i1-droppedPrinters],ippGetString(attr,0,NULL),(size_t)MAXLINE); + } + else + { +@@ -384,8 +387,8 @@ void getPrinters(int loop) + if((attr=ippFindAttribute(response,"printer-info",IPP_TAG_ZERO)) != NULL) + { + if(DEBUG) +- printf("Info: %s\n",attr->values[0].string.text); +- strncpy(PrinterInfos[i1-droppedPrinters],attr->values[0].string.text,(size_t)MAXLINE); ++ printf("Info: %s\n",ippGetString(attr,0,NULL)); ++ strncpy(PrinterInfos[i1-droppedPrinters],ippGetString(attr,0,NULL),(size_t)MAXLINE); + } + else + { +Index: gtklp-1.2.7.new/gtklp/gtklp_functions.c +=================================================================== +--- gtklp-1.2.7.new.orig/gtklp/gtklp_functions.c ++++ gtklp-1.2.7.new/gtklp/gtklp_functions.c +@@ -21,6 +21,8 @@ + + */ + ++#define _IPP_PRIVATE_STRUCTURES 1 ++ + #include + + #include "gtklp_functions.h" +Index: gtklp-1.2.7.new/gtklpq/printer.c +=================================================================== +--- gtklp-1.2.7.new.orig/gtklpq/printer.c ++++ gtklp-1.2.7.new/gtklpq/printer.c +@@ -21,6 +21,8 @@ + + */ + ++#define _IPP_PRIVATE_STRUCTURES 1 ++ + #include + + #include --- gtklp-1.2.7.orig/debian/patches/fix_FTBFS_binutils-gold.patch +++ gtklp-1.2.7/debian/patches/fix_FTBFS_binutils-gold.patch @@ -0,0 +1,13 @@ +Index: gtklp-1.2.7/configure.in +=================================================================== +--- gtklp-1.2.7.orig/configure.in 2012-01-08 11:52:32.555601587 +0900 ++++ gtklp-1.2.7/configure.in 2012-01-08 11:55:37.015844545 +0900 +@@ -25,6 +25,8 @@ + dnl internationalization macros + AM_GNU_GETTEXT + ++LDFLAGS="-lX11" ++AC_SUBST(LDFLAGS) + + # Forte Compiler ############################################################ + FORTE_LDFLAGS="" --- gtklp-1.2.7.orig/debian/patches/fixes/autogen-sh.diff +++ gtklp-1.2.7/debian/patches/fixes/autogen-sh.diff @@ -0,0 +1,31 @@ +From: Zak B. Elep +Subject: [PATCH] autogen.sh: fix for non-interactive builds + +Update autogen.sh so it can be called non-interactively (e.g. use +autopoint instead of gettextize.) + +Signed-off-by: Zak B. Elep + +--- + autogen.sh | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/autogen.sh b/autogen.sh +index 3432ac0..92f9f81 100644 +--- a/autogen.sh ++++ b/autogen.sh +@@ -5,10 +5,10 @@ LC_ALL=C + #LC_ALL=UTF-8 + export LANG LC_ALL + ++echo Running autopoint... ++autopoint --force + echo Running libtoolize... + libtoolize --copy --force +-echo Running gettextize... +-gettextize --copy -f --intl + echo Running aclocal... + aclocal -I m4 + echo Running autoheader... +-- +tg: (f201f96..) fixes/autogen-sh (depends on: upstream) --- gtklp-1.2.7.orig/debian/patches/series +++ gtklp-1.2.7/debian/patches/series @@ -0,0 +1,7 @@ +fix_FTBFS_binutils-gold.patch +bugs/422266.diff -p1 +debian/gtklpq-sensible-browser.diff -p1 +fixes/autogen-sh.diff -p1 +bugs/639032.diff +bugs/644113.diff +fix-ftbfs-new-cups.patch --- gtklp-1.2.7.orig/debian/rules +++ gtklp-1.2.7/debian/rules @@ -0,0 +1,43 @@ +#!/usr/bin/make -f +# +# rules --- Debian packaging rules for gtklp +# Copyright (C) 2006 Zak B. Elep +# +# $Id: rules,v 1.2 2006-06-03 12:16:34 zakame Exp $ + +# Let's use CDBS! + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +-include /usr/share/topgit/tg2quilt.mk +include /usr/share/cdbs/1/class/autotools.mk + +# diffs are managed in git, which TopGit/Quilt generate patches from via +# debian/rules tg-cleanexport +QUILT_PATCH_DIR = debian/patches + +# Specify what source docs should go in /usr/share/doc/gtklp +DEB_INSTALL_DOCS_ALL := README AUTHORS TODO + +# Let CDBS rebuild the Autotools for us, using the source's own +# autogen.sh (NOTE: we could have set the DEB_AUTO_UPDATE_* variables +# here, but for some reason CDBS won't regenerate a missing aclocal.m4, +# as is currently the case in gtklp-1.2.7) +post-patches:: + test -e debian/stamp-autogen-sh || (sh -x autogen.sh && touch \ + debian/stamp-autogen-sh) + +# Remove extra ch{s,t} locales (we already have zh_{CN,TW} +install/gtklp:: + rm -rf debian/gtklp/usr/share/locale/chs + rm -rf debian/gtklp/usr/share/locale/cht + +# Remove generated .gmo files and Autotools stuff +clean:: + rm -f debian/stamp-autogen-sh + rm -f po/*.gmo po/stamp-po + rm -f Makefile.in config.h.in configure depcomp \ + gtklp/Makefile.in gtklpq/Makefile.in install-sh \ + libgtklp/Makefile.in m4/Makefile.in man/Makefile.in \ + missing mkinstalldirs config.guess config.sub ltmain.sh \ + m4/libtool.m4 --- gtklp-1.2.7.orig/debian/watch +++ gtklp-1.2.7/debian/watch @@ -0,0 +1,5 @@ +# Watch control file for package gtklp, used by uscan +# $Id: watch,v 1.2 2006-06-03 12:16:34 zakame Exp $ +version=3 +http://sf.net/gtklp/gtklp-(.+)\.src\.tar\.gz debian uupdate + --- gtklp-1.2.7.orig/m4/ltoptions.m4 +++ gtklp-1.2.7/m4/ltoptions.m4 @@ -1,13 +1,14 @@ # Helper functions for option handling. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation, +# Inc. # Written by Gary V. Vaughan, 2004 # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 6 ltoptions.m4 +# serial 7 ltoptions.m4 # This is to help aclocal find these macros, as it can't see m4_define. AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])]) @@ -125,7 +126,7 @@ [enable_win32_dll=yes case $host in -*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*) +*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*) AC_CHECK_TOOL(AS, as, false) AC_CHECK_TOOL(DLLTOOL, dlltool, false) AC_CHECK_TOOL(OBJDUMP, objdump, false) @@ -133,13 +134,13 @@ esac test -z "$AS" && AS=as -_LT_DECL([], [AS], [0], [Assembler program])dnl +_LT_DECL([], [AS], [1], [Assembler program])dnl test -z "$DLLTOOL" && DLLTOOL=dlltool -_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl +_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl test -z "$OBJDUMP" && OBJDUMP=objdump -_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl +_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl ])# win32-dll AU_DEFUN([AC_LIBTOOL_WIN32_DLL], @@ -325,9 +326,24 @@ # MODE is either `yes' or `no'. If omitted, it defaults to `both'. m4_define([_LT_WITH_PIC], [AC_ARG_WITH([pic], - [AS_HELP_STRING([--with-pic], + [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@], [try to use only PIC/non-PIC objects @<:@default=use both@:>@])], - [pic_mode="$withval"], + [lt_p=${PACKAGE-default} + case $withval in + yes|no) pic_mode=$withval ;; + *) + pic_mode=default + # Look at the argument we got. We use all the common list separators. + lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR," + for lt_pkg in $withval; do + IFS="$lt_save_ifs" + if test "X$lt_pkg" = "X$lt_p"; then + pic_mode=yes + fi + done + IFS="$lt_save_ifs" + ;; + esac], [pic_mode=default]) test -z "$pic_mode" && pic_mode=m4_default([$1], [default]) --- gtklp-1.2.7.orig/m4/ltversion.m4 +++ gtklp-1.2.7/m4/ltversion.m4 @@ -7,17 +7,17 @@ # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# Generated from ltversion.in. +# @configure_input@ -# serial 3012 ltversion.m4 +# serial 3337 ltversion.m4 # This file is part of GNU Libtool -m4_define([LT_PACKAGE_VERSION], [2.2.6]) -m4_define([LT_PACKAGE_REVISION], [1.3012]) +m4_define([LT_PACKAGE_VERSION], [2.4.2]) +m4_define([LT_PACKAGE_REVISION], [1.3337]) AC_DEFUN([LTVERSION_VERSION], -[macro_version='2.2.6' -macro_revision='1.3012' +[macro_version='2.4.2' +macro_revision='1.3337' _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?]) _LT_DECL(, macro_revision, 0) ]) --- gtklp-1.2.7.orig/m4/lt~obsolete.m4 +++ gtklp-1.2.7/m4/lt~obsolete.m4 @@ -1,13 +1,13 @@ # lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*- # -# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc. # Written by Scott James Remnant, 2004. # # This file is free software; the Free Software Foundation gives # unlimited permission to copy and/or distribute it, with or without # modifications, as long as this notice is preserved. -# serial 4 lt~obsolete.m4 +# serial 5 lt~obsolete.m4 # These exist entirely to fool aclocal when bootstrapping libtool. # @@ -77,7 +77,6 @@ m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])]) m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])]) m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])]) -m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])]) m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])]) m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])]) m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])]) @@ -90,3 +89,10 @@ m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])]) m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])]) m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])]) +m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])]) +m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])]) +m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])]) +m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])]) +m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])]) +m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])]) +m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])