← Back to branch summary

~ubuntu-branches/ubuntu/dapper/file-roller/dapper-updates

« back to all changes in this revision

Viewing changes to configure.in

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2005-12-13 00:19:53 UTC
  • mfrom: (1.2.2 upstream)
  • Revision ID: james.westby@ubuntu.com-20051213001953-0klipgnhk6vikhrt
Tags: 2.13.2-0ubuntu1
* New upstream version:
  - Fixed bug #323713: "Save as" should default to current archive filename
    (Ubuntu: #20132)
  - Fixed bug #315069: file-roller: drag 'n drop doesn't work for more
    than 1 file.
  - Fixed bug #323534: Passwords improperly escaped for zip files
  - Do not open a progress dialog when dragging files, use a progressbar
    in the statusbar instead.
  - Fixed bug #316364: Nautilus dependency should be optional
  - Fixed bug #311821: ascending and descending indicators are opposite
    from expected.
  - Fixed bug #317423: Conflicting mnemonic in "Extract" dialog.
  - Fixed bug #323068: file-roller fails in chosing extract-to directory
  - Fixed bug #322197: Improve Naming Filename when create new Archive file
  - Fixed bug #316564: needs unzip AND zip
    (Ubuntu: #15595)
  - Simplified the add dialog populating the file type combobox with the
    extensions instead of the descriptions.
  - Set progress dialog display delay to 1 second.
  - More HIG compliant progress dialog.
  - Use a single command execution to add many files and folders to an
    archive to speed up the operation.
  - Allow to stop creation of a new archive.
  - Correctly associate fr to 7zip files.
* debian/patches/03_lp-autoconf.patch:
  - updated

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.in
2
2
 
3
3
AC_PREREQ(2.52)
4
4
 
5
 
AC_INIT(file-roller, 2.12.1)
 
5
AC_INIT(file-roller, 2.13.2)
6
6
AC_CONFIG_SRCDIR(src/main.c)
7
7
AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
8
8
AM_CONFIG_HEADER(config.h)
24
24
LIBGNOMEUI_REQUIRED=2.6.0
25
25
GNOME_VFS_REQUIRED=2.9.0
26
26
LIBGLADE_REQUIRED=2.4.0
27
 
BONOBO_ACTIVATION_REQUIRED=1.0.0
28
 
LIBBONOBO_REQUIRED=2.6.0
29
 
LIBBONOBOUI_REQUIRED=2.6.0
30
27
NAUTILUS_REQUIRED=2.9.0
31
28
 
32
29
AC_SUBST(GLIB_REQUIRED)
35
32
AC_SUBST(LIBGNOMEUI_REQUIRED)
36
33
AC_SUBST(GNOME_VFS_REQUIRED)
37
34
AC_SUBST(LIBGLADE_REQUIRED)
38
 
AC_SUBST(BONOBO_ACTIVATION_REQUIRED)
39
 
AC_SUBST(LIBBONOBO_REQUIRED)
40
 
AC_SUBST(LIBBONOBOUI_REQUIRED)
41
35
AC_SUBST(NAUTILUS_REQUIRED)
42
36
 
43
37
dnl ===========================================================================
50
44
        libgnomeui-2.0 >= $LIBGNOMEUI_REQUIRED          \
51
45
        gnome-vfs-2.0 >= $GNOME_VFS_REQUIRED            \
52
46
        gnome-vfs-module-2.0                            \
53
 
        libglade-2.0 >= $LIBGLADE_REQUIRED              \
54
 
        bonobo-activation-2.0 >= $BONOBO_ACTIVATION_REQUIRED)
 
47
        libglade-2.0 >= $LIBGLADE_REQUIRED)
55
48
AC_SUBST(FR_CFLAGS)
56
49
AC_SUBST(FR_LIBS)
57
50
 
58
 
PKG_CHECK_MODULES(NAUTILUS,                             \
59
 
        libnautilus-extension >= $NAUTILUS_REQUIRED     \
60
 
        glib-2.0 >= $GLIB_REQUIRED)
 
51
 
 
52
NAUTILUS_CFLAGS=""
 
53
NAUTILUS_LIBS=""
 
54
build_nautilus_actions=no
 
55
AC_ARG_ENABLE(nautilus_actions, AC_HELP_STRING([--disable-nautilus-actions],[dont't build the nautilus context menu actions]))
 
56
 
 
57
if test x"$enable_nautilus_actions" != xno; then
 
58
        if pkg-config --atleast-version=$NAUTILUS_REQUIRED libnautilus-extension; then
 
59
                NAUTILUS_CFLAGS=`pkg-config --cflags libnautilus-extension glib-2.0`
 
60
                NAUTILUS_LIBS=`pkg-config --libs libnautilus-extension glib-2.0`
 
61
                build_nautilus_actions=yes
 
62
        fi
 
63
fi
 
64
AM_CONDITIONAL(ENABLE_NAUTILUS_ACTIONS, test "x$build_nautilus_actions" = xyes)
61
65
AC_SUBST(NAUTILUS_CFLAGS)
62
66
AC_SUBST(NAUTILUS_LIBS)
63
67
 
97
101
 
98
102
dnl ******************************
99
103
 
100
 
AC_ARG_ENABLE(schemas-install,AC_HELP_STRING([--disable-schemas-install],
101
 
                                             [Disable installation of the gconf schemas]))
102
 
 
103
 
AM_CONDITIONAL(SCHEMAS_INSTALL, test x$enable_schemas_install != xno)
104
 
 
105
104
AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
106
105
if test x"$GCONFTOOL" = xno; then
107
106
        AC_MSG_ERROR([gconftool-2 executable not found in your path - should be installed with GConf])
118
117
src/Makefile
119
118
src/icons/Makefile
120
119
src/recent-files/Makefile
121
 
component/Makefile
122
120
nautilus/Makefile
123
121
help/Makefile
124
122
po/Makefile.in
131
129
        Source code location:   ${srcdir}
132
130
        Compiler:               ${CC}
133
131
        Internal mkdtemp:       ${mkdtemp_missing}
134
 
 
 
132
        Nautilus support:       ${build_nautilus_actions}
135
133
"