← Back to branch summary

~ubuntu-branches/ubuntu/raring/libdvdread/raring-proposed

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Vibhav Pant
  • Date: 2012-12-15 17:06:42 UTC
  • mfrom: (1.3.2) (3.2.15 sid)
  • Revision ID: package-import@ubuntu.com-20121215170642-q0h4cc4r2mchkgcl
Tags: 4.2.0+20121016-1ubuntu1
https://launchpad.net/bugs/1090692
* Merge from Debian unstable (LP: #1090692).  Remaining changes:
  - Re-add missing install-css.sh.
  - debian/control: add Suggests for install-css.sh on debhelper,
    fakeroot, and build-essential.
  - debian/rules: install install-css.sh, leave perms executable.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
139
139
dnl ---------------------------------------------
140
140
AC_ARG_ENABLE([libdvdcss], [  --enable-libdvdcss    force linking against libdvdcss])
141
141
 
 
142
AC_ARG_ENABLE([dlfcn],
 
143
  [AS_HELP_STRING([--enable-dlfcn],
 
144
  [use builtin dlfcn for mingw (default is auto)])],
 
145
  [use_builtin_dlfcn=$enableval],
 
146
  [use_builtin_dlfcn=no])
 
147
 
 
148
if [[ $use_builtin_dlfcn = "yes" ]]; then
 
149
        AC_DEFINE([USING_BUILTIN_DLFCN], [1], ["Define to 1 to use builtin dlfcn"])
 
150
fi
 
151
 
142
152
CSS_LIBS=""
143
153
if test x"$enable_libdvdcss" != xyes; then
144
154
dnl dlopen libdvdcss
145
155
case $host in
146
156
  *mingw32*)
147
 
    AC_CHECK_LIB(c, dlopen,
148
 
                 DYNAMIC_LD_LIBS="",
149
 
                 AC_CHECK_LIB(dl, dlopen,
150
 
                              DYNAMIC_LD_LIBS="-ldl",
151
 
                              AC_MSG_ERROR(dynamic linker needed)))
152
 
    AC_SUBST(DYNAMIC_LD_LIBS)
 
157
    if [[ $use_builtin_dlfcn = "no" ]]; then
 
158
        AC_CHECK_LIB(c, dlopen,
 
159
                     DYNAMIC_LD_LIBS="",
 
160
                     AC_CHECK_LIB(dl, dlopen,
 
161
                                  DYNAMIC_LD_LIBS="-ldl",
 
162
                                  AC_MSG_WARN(Using builtin dlopen)))
 
163
        AC_SUBST(DYNAMIC_LD_LIBS)
 
164
    fi
153
165
    LDFLAGS="-no-undefined $LDFLAGS"
154
166
    ;;
155
167
  *cygwin*)
180
192
 
181
193
AC_SUBST(CSS_LIBS)
182
194
 
 
195
 
183
196
dnl ---------------------------------------------
184
197
dnl cflags
185
198
dnl ---------------------------------------------