← Back to branch summary

~ubuntu-branches/ubuntu/karmic/kid3/karmic

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Gabriele Postorino
  • Date: 2008-05-09 03:18:56 UTC
  • mfrom: (1.1.7 upstream) (2.1.3 lenny)
  • Revision ID: james.westby@ubuntu.com-20080509031856-857a3p6l3fv4ir5m
Tags: 1.0-1ubuntu1
https://launchpad.net/bugs/229050
* Merge from debian unstable, (LP: #229050) remaining changes:
  - debian/rules:
    + Added dh_icons
  - debian/control:
    + Update maintainer field.

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
40
40
AC_ARG_PROGRAM
41
41
 
42
42
dnl Automake doc recommends to do this only here. (Janos)
43
 
AM_INIT_AUTOMAKE(kid3, 0.10) dnl searches for some needed programs
 
43
AM_INIT_AUTOMAKE(kid3, 1.0) dnl searches for some needed programs
44
44
 
45
45
AM_MAINTAINER_MODE
46
46
 
102
102
fi
103
103
AC_SUBST(TAGLIB_INCLUDES)
104
104
AC_SUBST(LIB_TAGLIB)
 
105
AC_SUBST(TAGLIB_VERSION)
105
106
AM_CONDITIONAL(HAVE_TAGLIB, test "$have_taglib" = "yes")
 
107
AM_CONDITIONAL(TAGLIB_VERSION_14, test "$TAGLIB_VERSION" = "1.4")
106
108
 
107
109
# mp4 support with mp4v2
108
110
AC_ARG_WITH(mp4v2, [  --with-mp4v2            build with mp4v2, default=yes],
385
387
  ])
386
388
  FLAC_CHECK_STREAMMETADATA_OPERATOR
387
389
fi
 
390
 
 
391
# Check if FLAC++ has FLAC::Metadata::Picture
 
392
if test "$build_flac" = "yes"; then
 
393
  AC_DEFUN([FLAC_CHECK_METADATA_TYPE_PICTURE],
 
394
  [
 
395
    AC_MSG_CHECKING([for FLAC::Metadata::Picture])
 
396
    AC_LANG_SAVE
 
397
    AC_LANG_CPLUSPLUS
 
398
  cat > conftest.$ac_ext <<EOF
 
399
#include <FLAC++/metadata.h>
 
400
int main() {
 
401
  FLAC::Metadata::Picture pic;
 
402
  return 0;
 
403
}
 
404
EOF
 
405
 
 
406
    ac_save_CPPFLAGS=$CPPFLAGS
 
407
    CPPFLAGS="$all_includes $CPPFLAGS"
 
408
    if AC_TRY_EVAL(ac_compile); then
 
409
      AC_MSG_RESULT(yes)
 
410
      AC_DEFINE(HAVE_FLAC_PICTURE,1,[Define to build with FLAC::Metadata::Picture])
 
411
    else
 
412
      AC_MSG_RESULT(no)
 
413
    fi
 
414
    CPPFLAGS=$ac_save_CPPFLAGS
 
415
  
 
416
    AC_LANG_RESTORE
 
417
  ])
 
418
  FLAC_CHECK_METADATA_TYPE_PICTURE
 
419
fi
388
420
KDE_CREATE_SUBDIRSLIST
389
421
AM_CONDITIONAL(admin_SUBDIR_included, test "x$admin_SUBDIR_included" = xyes)
390
422
AM_CONDITIONAL(doc_SUBDIR_included, test "x$doc_SUBDIR_included" = xyes)