~ubuntu-branches/ubuntu/trusty/isdnutils/trusty

« back to all changes in this revision

Viewing changes to eicon/configure.in

  • Committer: Package Import Robot
  • Author(s): Steve Langasek
  • Date: 2013-11-15 00:02:58 UTC
  • mfrom: (1.1.8) (31.1.1 trusty-proposed)
  • Revision ID: package-import@ubuntu.com-20131115000258-tt9v3gasgrdml07k
Tags: 1:3.25+dfsg1-3.3ubuntu1
* Merge from Debian unstable:
  - resolves licensing issues with package contents.  LP: #511988.
  - includes proper upstream fix for ipppd on ARM.  LP: #453159.
  - resolves isdnutils-base removal failures.  LP: #813771.
  - fixes capiutils init script to not try to mount obsolete capifs.
    LP: #1064347.
* Remaining changes:
  - Switch libreadline5-dev to libreadline-gplv2-dev since this package
    appears to be GPLv2
  - debian/patches/no-imake.patch: Don't build xisdnload/xmonisdn using
    xmkmf/imake.  This patch was dropped in Debian without explanation;
    it still applies and seems to still be a good idea for eventual
    upstreaming, since imake is quite obsolete.
  - capi.conf: Fix typo for fcdsl2 firmware. LP: #189132.
  - Remove dependencies on /etc/inittab.
    - Disable the installation code to modify /etc/inittab.
    - isdnutils-base: Add ttyI0 example script, which needs to be installed
      in /etc/event.d/ttyI0.
    - isdnvboxserver: Add ttyI1 example script, which needs to be installed
      in /etc/event.d/ttyI1.
    - The two upstart scripts need to be edited.
    - Further improvements and documentation welcome.
* Changes included in Debian:
  - replace calls to ./MAKEDEV with /sbin/MAKEDEV
  - Build-depend on ppp-dev.
  - Switch to newer tcl -dev.
  - update to newer automake
  - debian/rules: use autoreconf to update the autotools in the capi20
    directory
  - debian/{compat,rules,*.files,.dirs}: Convert to Multi-arch.
  - debian/libcapi20-dev.install: Remove .la files (no builds use them).
* Changes included upstream:
  - fix for ARM FTBFS.
  - fix bashisms in vboxplay.
  - debian/patches/{config_libdir,toplevel-make}.patch: add CONFIG_LIBDIR
    override to upstream build system to support Multi-arch.
* Dropped changes:
  - kick dpatch to the curb.
* Handle migrating the blacklist file from
  /etc/modprobe.d/blacklist-capiutils.conf to the path used in Debian,
  /etc/modprobe.d/capiutils.conf.
* Handle rename of /etc/ppp/ip-down.d/99-ipppd and /etc/ppp/ip-up.d/00-ipppd
  to /etc/ppp/ip-down.d/ipppd and /etc/ppp/ip-up.d/ipppd
* Handle rename of /etc/init.d/isdnutils to /etc/init.d/isdnutils-base
* Restore standard.tcl to /usr/share/isdnvboxserver/default; maintainer
  scripts must not depend on contents of /usr/share/doc.
* Apply patches that were preserved in the 3.0 (quilt) migration, but
  were inadvertently not applied:
  - debian/patches/capifax.additional_error_codes.patch
  - debian/patches/capifax.3_1kHz_audio.patch
* Drop debian/isdnutils-base.cron.d, which isn't a cronjob example at all
  but an inittab example gone astray.
* debian/dotconfig*: don't use embedded quotes for paths; this confuses
  vbox's Makefiles something fierce, and causes files to be missed from
  debian/tmp'/usr/share/man/' at install time.
* Fix isdnlog and ipppd to not ship files used in the postinst under
  /usr/share/doc.
* Modernize the upstart examples.

Show diffs side-by-side

added added

removed removed

Lines of Context:
36
36
AC_ARG_WITH(firmware,
37
37
        [  --with-firmware=DIR     Set dir where firmware istalled. [/usr/lib/isdn]],
38
38
        CONFIG_DATADIR="${withval}"
39
 
        AC_DEFINE(CONFIG_DATADIR,"${withval}"),
 
39
        AC_DEFINE(CONFIG_DATADIR,"${withval}", [eicon firmware directory]),
40
40
)
41
41
 
42
42
dnl Optional sbin directory
43
43
AC_ARG_WITH(sbin,
44
44
        [  --with-sbin=DIR         Set dir where binary is istalled. [/sbin]],
45
45
        CONFIG_SBINDIR="${withval}"
46
 
        AC_DEFINE(CONFIG_SBINDIR,"${withval}"),
 
46
        AC_DEFINE(CONFIG_SBINDIR,"${withval}", [eicon binary directory]),
47
47
)
48
48
 
49
49
dnl Optional man directory
50
50
AC_ARG_WITH(man,
51
51
        [  --with-man=DIR          Set manpage dir. [/usr/man]],
52
52
        CONFIG_MANDIR="${withval}"
53
 
        AC_DEFINE(CONFIG_MANDIR,"${withval}"),
 
53
        AC_DEFINE(CONFIG_MANDIR,"${withval}", [eicon manual directory]),
54
54
)
55
55
 
56
56
dnl Check, if user wants dump option for debugging
59
59
        CONFIG_EICONCTRL_DEBUG="y"
60
60
)
61
61
 
62
 
AC_DEFINE(HAVE_XLOG)
 
62
AC_DEFINE(HAVE_XLOG, [], [xlog supported])
63
63
AC_SUBST(HAVE_XLOG)
64
64
 
65
 
AC_DEFINE(HAVE_TRACE)
 
65
AC_DEFINE(HAVE_TRACE, [], [trace supported])
66
66
AC_SUBST(HAVE_TRACE)
67
67
 
68
68
AC_SUBST(HAVE_NPCI)
80
80
AC_SUBST(CONFIG_MANDIR)
81
81
AC_SUBST(I4LVERSION)
82
82
AC_CONFIG_HEADER(config.h)
83
 
AC_OUTPUT(Makefile eiconctrl.man)
 
83
AC_OUTPUT(Makefile eiconctrl.man divaload.man divalog.man divalogd.man)