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

« back to all changes in this revision

Viewing changes to vbox/acinclude.m4

  • 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:
3
3
dnl # the configure script if one is missing!                                #
4
4
dnl #------------------------------------------------------------------------#
5
5
 
6
 
AC_DEFUN(GND_PACKAGE_TCL,
 
6
AC_LANG([C])
 
7
 
 
8
 
 
9
AC_DEFUN([GND_PACKAGE_TCL],
7
10
   [
8
11
      HAVE_TCL_LIBS="n"
9
12
      HAVE_TCL_INCL="n"
36
39
 
37
40
      if (test "${gnd_use_tcl_lib}" = "")
38
41
      then
39
 
         gnd_1st_tcl_lib_test="tcl8.4"
40
 
         gnd_2nd_tcl_lib_test="tcl8.3"
41
 
         gnd_3rd_tcl_lib_test="tcl8.0"
 
42
         gnd_1st_tcl_lib_test="tcl"
 
43
         gnd_2nd_tcl_lib_test="tcl8.6"
 
44
         gnd_3rd_tcl_lib_test="tcl8.5"
42
45
      else
43
46
         gnd_1st_tcl_lib_test="${gnd_use_tcl_lib}"
44
 
         gnd_2nd_tcl_lib_test="tcl8.4"
45
 
         gnd_3rd_tcl_lib_test="tcl8.3"
 
47
         gnd_2nd_tcl_lib_test="tcl"
 
48
         gnd_3rd_tcl_lib_test="tcl8.6"
46
49
      fi
47
50
 
48
51
      AC_CHECK_LIB(m,
49
52
         cos,
50
 
         AC_CHECK_LIB(dl,
 
53
         [AC_CHECK_LIB(dl,
51
54
            dlerror,
52
55
            [AC_CHECK_LIB(${gnd_1st_tcl_lib_test},
53
56
               Tcl_CreateInterp,
54
 
               LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_1st_tcl_lib_test} -lm -ldl",
 
57
               LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_1st_tcl_lib_test}",
55
58
               [AC_CHECK_LIB(${gnd_2nd_tcl_lib_test},
56
59
                  Tcl_CreateInterp,
57
 
                  LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_2nd_tcl_lib_test} -lm -ldl",
 
60
                  LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_2nd_tcl_lib_test}",
58
61
                  [AC_CHECK_LIB(${gnd_3rd_tcl_lib_test},
59
62
                     Tcl_CreateInterp,
60
 
                     LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_3rd_tcl_lib_test} -lm -ldl",
 
63
                     LINK_TCL_LIBS="${gnd_tcl_lib_dir} -l${gnd_3rd_tcl_lib_test}",
61
64
                     ,
62
 
                     ${gnd_tcl_lib_dir} -lm -ldl
 
65
                     ${gnd_tcl_lib_dir}
63
66
                  )],
64
 
                  ${gnd_tcl_lib_dir} -lm -ldl
 
67
                  ${gnd_tcl_lib_dir}
65
68
               )],
66
 
               ${gnd_tcl_lib_dir} -lm -ldl
 
69
               ${gnd_tcl_lib_dir}
67
70
            )],
68
71
         )],
69
72
      )
91
94
 
92
95
               HAVE_TCL_INCL="y"
93
96
               LINK_TCL_INCL="${gnd_tcl_inc_dir}"
94
 
      else
 
97
            else
95
98
               AC_MSG_RESULT("no")
96
99
            fi
 
100
         else
 
101
            AC_CHECK_HEADER(${gnd_1st_tcl_lib_test}/tcl.h, LINK_TCL_INCL="-I/usr/include/${gnd_1st_tcl_lib_test}";HAVE_TCL_INCL="y",
 
102
                [ AC_CHECK_HEADER(${gnd_2nd_tcl_lib_test}/tcl.h, LINK_TCL_INCL="-I/usr/include/${gnd_2nd_tcl_lib_test}";HAVE_TCL_INCL="y",
 
103
                    [ AC_CHECK_HEADER(${gnd_3rd_tcl_lib_test}/tcl.h, LINK_TCL_INCL="-I/usr/include/${gnd_3rd_tcl_lib_test}";HAVE_TCL_INCL="y")
 
104
                    ])
 
105
                ])
97
106
         fi
98
107
      fi
99
108
 
 
109
         # gnd_1st_tcl_lib_test="tcl8.4"
 
110
         # gnd_2nd_tcl_lib_test="tcl8.3"
 
111
         # gnd_3rd_tcl_lib_test="tcl8.0"
 
112
 
100
113
      if (test "${HAVE_TCL_LIBS}" = "y")
101
114
      then
102
115
         if (test "${HAVE_TCL_INCL}" = "y")
124
137
dnl # Checks if the ncurses package is installed:                            #
125
138
dnl #------------------------------------------------------------------------#
126
139
 
127
 
AC_DEFUN(GND_PACKAGE_NCURSES,
 
140
AC_DEFUN([GND_PACKAGE_NCURSES],
128
141
   [
129
142
      LINK_NCURSES_LIBS=""
130
143
      LINK_NCURSES_INCL=""
154
167
 
155
168
         AC_CHECK_LIB(ncurses,
156
169
            resizeterm,
157
 
            AC_DEFINE(HAVE_RESIZETERM)
 
170
            AC_DEFINE(HAVE_RESIZETERM, [], [resizeterm() available in ncurses])
158
171
)
159
172
      fi
160
173