← Back to branch summary

~swem/totem/assignment

« back to all changes in this revision

Viewing changes to aclocal.m4

  • Committer: Bazaar Package Importer
  • Author(s): Sebastian Dröge
  • Date: 2010-01-27 09:40:18 UTC
  • mfrom: (1.4.2 upstream) (5.1.13 sid)
  • Revision ID: james.westby@ubuntu.com-20100127094018-q6rzt7va0y8ketwt
Tags: 2.29.4-1
* New upstream development release:
  + debian/patches/90_autotools.patch:
    - Refreshed for the new version.
  + debian/control.in:
    - Update build dependencies and dependencies.
    - Drop tracker plugin, it needs tracker 0.7.
  + debian/totem-mozilla.links:
    - Drop the complex plugin, it doesn't exist anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
aclocal.m4
1
 
# generated automatically by aclocal 1.11 -*- Autoconf -*-
 
1
# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
2
2
 
3
3
# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
4
4
# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
537
537
[
538
538
        AC_REQUIRE([AM_MAINTAINER_MODE])
539
539
 
 
540
        DISABLE_DEPRECATED=""
540
541
        if test $USE_MAINTAINER_MODE = yes; then
541
 
                DISABLE_DEPRECATED="-DG_DISABLE_DEPRECATED -DGDK_DISABLE_DEPRECATED -DGDK_PIXBUF_DISABLE_DEPRECATED -DPANGO_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED -DGCONF_DISABLE_DEPRECATED -DBONOBO_DISABLE_DEPRECATED -DBONOBO_UI_DISABLE_DEPRECATED -DGNOME_VFS_DISABLE_DEPRECATED -DGNOME_DISABLE_DEPRECATED -DLIBGLADE_DISABLE_DEPRECATED -DWNCK_DISABLE_DEPRECATED -DLIBSOUP_DISABLE_DEPRECATED"
542
 
        else
543
 
                DISABLE_DEPRECATED=""
 
542
                DOMAINS="G ATK PANGO GDK GDK_PIXBUF GTK GCONF BONOBO BONOBO_UI GNOME LIBGLADE VTE GNOME_VFS WNCK LIBSOUP"
 
543
                for DOMAIN in $DOMAINS; do
 
544
                       DISABLE_DEPRECATED="$DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_DEPRECATED -D${DOMAIN}_DISABLE_SINGLE_INCLUDES"
 
545
                done
544
546
        fi
 
547
 
545
548
        AC_SUBST(DISABLE_DEPRECATED)
546
549
])
547
550
 
729
732
 
730
733
ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
731
734
 
 
735
AC_MSG_CHECKING([gnome-doc-utils >= $gdu_cv_version_required])
732
736
PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
733
737
        [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
734
738
 
735
739
if test "$gdu_cv_have_gdu" = "yes"; then
 
740
        AC_MSG_RESULT([yes])
736
741
        ifelse([$2],,[:],[$2])
737
742
else
 
743
        AC_MSG_RESULT([no])
738
744
        ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
739
745
fi
740
746
 
8818
8824
 
8819
8825
# Generated from ltversion.in.
8820
8826
 
8821
 
# serial 3012 ltversion.m4
 
8827
# serial 3017 ltversion.m4
8822
8828
# This file is part of GNU Libtool
8823
8829
 
8824
 
m4_define([LT_PACKAGE_VERSION], [2.2.6])
8825
 
m4_define([LT_PACKAGE_REVISION], [1.3012])
 
8830
m4_define([LT_PACKAGE_VERSION], [2.2.6b])
 
8831
m4_define([LT_PACKAGE_REVISION], [1.3017])
8826
8832
 
8827
8833
AC_DEFUN([LTVERSION_VERSION],
8828
 
[macro_version='2.2.6'
8829
 
macro_revision='1.3012'
 
8834
[macro_version='2.2.6b'
 
8835
macro_revision='1.3017'
8830
8836
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
8831
8837
_LT_DECL(, macro_revision, 0)
8832
8838
])
9127
9133
[am__api_version='1.11'
9128
9134
dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
9129
9135
dnl require some minimum version.  Point them to the right macro.
9130
 
m4_if([$1], [1.11], [],
 
9136
m4_if([$1], [1.11.1], [],
9131
9137
      [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
9132
9138
])
9133
9139
 
9143
9149
# Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
9144
9150
# This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
9145
9151
AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
9146
 
[AM_AUTOMAKE_VERSION([1.11])dnl
 
9152
[AM_AUTOMAKE_VERSION([1.11.1])dnl
9147
9153
m4_ifndef([AC_AUTOCONF_VERSION],
9148
9154
  [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
9149
9155
_AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
10034
10040
       am__strip_prefix=`echo "$am_py_prefix" | sed 's|.|.|g'`
10035
10041
       am_cv_python_pythondir=`echo "$am_cv_python_pythondir" | sed "s,^$am__strip_prefix,$PYTHON_PREFIX,"`
10036
10042
       ;;
 
10043
     *)
 
10044
       case $am_py_prefix in
 
10045
         /usr|/System*) ;;
 
10046
         *)
 
10047
          am_cv_python_pythondir=$PYTHON_PREFIX/lib/python$PYTHON_VERSION/site-packages
 
10048
          ;;
 
10049
       esac
 
10050
       ;;
10037
10051
     esac
10038
10052
    ])
10039
10053
  AC_SUBST([pythondir], [$am_cv_python_pythondir])
10064
10078
       am__strip_prefix=`echo "$am_py_exec_prefix" | sed 's|.|.|g'`
10065
10079
       am_cv_python_pyexecdir=`echo "$am_cv_python_pyexecdir" | sed "s,^$am__strip_prefix,$PYTHON_EXEC_PREFIX,"`
10066
10080
       ;;
 
10081
     *)
 
10082
       case $am_py_exec_prefix in
 
10083
         /usr|/System*) ;;
 
10084
         *)
 
10085
           am_cv_python_pyexecdir=$PYTHON_EXEC_PREFIX/lib/python$PYTHON_VERSION/site-packages
 
10086
           ;;
 
10087
       esac
 
10088
       ;;
10067
10089
     esac
10068
10090
    ])
10069
10091
  AC_SUBST([pyexecdir], [$am_cv_python_pyexecdir])