← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/hplip/gutsy-security

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Till Kamppeter
  • Date: 2006-09-15 18:00:07 UTC
  • mfrom: (1.2.5 upstream)
  • Revision ID: james.westby@ubuntu.com-20060915180007-96mez3nck3oy5wij
Tags: 1.6.7-2ubuntu1
* Merge from debian unstable.
* Removed patches 50_ui-supportform-cleanups.dpatch and
  55_ui-supportform-debian.dpatch, there is no support window in the HP
  toolbox any more.
* HPLIP (file io/hpiod/usbext.h) includes linux/compiler.h which is not
  part of Ubuntu Linux and not needed. Removed the include with patch
  80_no-compiler.h.dpatch.
* debian/control: Let the "Conflicts:" of hpijs-ppds be only a "Breaks:"
  to facilitate an update from the previous version when both hpijs and
  hpijs-ppds are installed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
17
17
 
18
18
AC_PREREQ([2.59])
19
19
AC_INIT([HP Linux Imaging and Printing],
20
 
        [0.9.11],
 
20
        [1.6.7],
21
21
        [hplip@packages.debian.org],
22
22
        [hplip])
23
23
 
135
135
   [AC_MSG_RESULT([no])]
136
136
)
137
137
 
 
138
AC_MSG_CHECKING([whether to support fax functionality])
 
139
AC_ARG_ENABLE(fax_build,
 
140
        AS_HELP_STRING([--enable-fax-build],
 
141
                [enable fax build (default=yes)]),
 
142
        [fax_build="$enableval"], [fax_build=yes])
 
143
AS_IF([test "$fax_build" = "yes"],
 
144
        [AC_MSG_RESULT(yes)],
 
145
        [AC_MSG_RESULT(no)]
 
146
)
 
147
 
138
148
CUPSSEARCHPATH="/usr/share /usr/local/share /usr/lib /usr/local/lib /usr/libexec /usr/lib64 /opt"
139
149
 
140
150
AC_ARG_VAR([CUPS_BACKEND_PATH], [CUPS backend directory])
220
230
fi
221
231
 
222
232
dnl This is non-standard, and may break
223
 
ac_configure_args="$ac_configure_args --enable-hplip-build"
 
233
if test "$fax_build" = "yes"; then
 
234
   ac_configure_args="$ac_configure_args --enable-hplip-build"
 
235
fi
224
236
 
225
237
AC_SUBST(RPM_INSTALL)
226
238
AC_SUBST(network_build)
227
239
AC_SUBST(pp_build)
 
240
AC_SUBST(fax_build)
228
241
AC_SUBST(ICON_PATH)
229
242
AC_SUBST(ICON_FILE)
230
243