← Back to branch summary

~ubuntu-branches/ubuntu/oneiric/mousetweaks/oneiric

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Luke Yelavich
  • Date: 2010-11-10 11:40:46 UTC
  • mfrom: (1.1.47 upstream)
  • Revision ID: james.westby@ubuntu.com-20101110114046-gd7qvdqsvnj3zcfb
Tags: 2.91.2-0ubuntu1
* New upstream release
  - Misc changes, improvements and fixes:
    + Add gsettings convert data
    + Add "geometry" option to set size and position of the click-type window
    + Add new "orientation" option to the click-type window
    + Remove "animate-cursor" option
    + Update git.mk
    + Sync with changes in gsettings-desktop-schemas
    + Fix mem leak and reduce nr. of cursor image copies
    + Don't emit cursor_changed signals if we have set the cursor
    + Bump gsettings-desktop-schemas dependency to 0.1.0
    + Remove mt-main header file
    + Disable panel applets by default for GNOME 3
    + Use gdk_display_get_default instead of GDK_DISPLAY (Javier Jardón)
    + Remove GdkGc based drawing code
    + Use a common X Display accessor
    + Remove mouse orientation checks
    + Only install man pages if the applets are built
    + Sync with GSettings changes in gnome-settings-daemon
    + Launch UA panel instead of the mouse capplet
  - Bug fixes:
    + #633844: L10N: Fix a typo
    + #633932: L10N: Add translation comments for button orientation
    + #631533: Adapt to GtkObject removal in GTK3 (Javier Jardón)
    + #620171: Migrate to GSettings
  - New and updated translations:
    + [ca] Carles Ferrando
    + [es] Jorge González
    + [gl] Fran Diéguez
    + [he] Yaron Shahrabani
    + [ja] Takayuki KUSANO
    + [sk] Pavol Šimo
    + [sl] Matej Urbančič
    + [el] Simos Xenitellis
    + [et] Ivar Smolin
    + [ko] Changwoo Ryu
    + [lt] Žygimantas Beručka
* debian/control:
  - Drop libatspi-dev from Build-Depends
  - Add gsettings-desktop-schemas-dev >= 0.1.0 to Build-Depends
  - Build depend on GTK 3.0 >= 2.91.0

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
 
AC_PREREQ(2.57)
 
1
AC_PREREQ(2.63)
2
2
AC_INIT([mousetweaks],
3
 
        [2.32.0],
 
3
        [2.91.2],
4
4
        [http://bugzilla.gnome.org/enter_bug.cgi?product=mousetweaks])
5
5
 
6
6
AC_CONFIG_SRCDIR([src])
8
8
AC_CONFIG_MACRO_DIR([m4])
9
9
AC_PREFIX_DEFAULT([/usr])
10
10
 
11
 
AM_INIT_AUTOMAKE([1.9])
12
 
AM_MAINTAINER_MODE
13
 
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
 
11
AM_INIT_AUTOMAKE([1.11 -Wno-portability])
 
12
AM_SILENT_RULES([yes])
 
13
AM_MAINTAINER_MODE([enable])
14
14
 
15
15
AC_PROG_CC
16
16
AC_PROG_INSTALL
33
33
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext Package])
34
34
AM_GLIB_GNU_GETTEXT
35
35
 
 
36
dnl *** gsettings ***
 
37
 
 
38
GLIB_GSETTINGS
 
39
 
36
40
dnl *** documentation ***
37
41
 
38
42
GNOME_DOC_INIT
39
43
 
40
44
dnl *** dependencies ***
41
45
 
 
46
GLIB_REQUIRED=2.25.3
42
47
GIO_REQUIRED=2.25.9
 
48
GTK_REQUIRED=2.91.0
 
49
GDS_REQUIRED=0.1.0
43
50
 
44
51
PKG_CHECK_MODULES(DEPENDENCIES,
 
52
    glib-2.0 >= $GLIB_REQUIRED
45
53
    gio-2.0 >= $GIO_REQUIRED
46
 
        gtk+-2.0 >= 2.18
47
 
        gconf-2.0 >= 2.16.0
48
 
        x11
49
 
        xcursor
50
 
        xfixes
51
 
        xtst)
52
 
 
53
 
AC_SUBST(DEPENDENCIES_CFLAGS)
54
 
AC_SUBST(DEPENDENCIES_LIBS)
 
54
    gtk+-3.0 >= $GTK_REQUIRED
 
55
    gsettings-desktop-schemas >= $GDS_REQUIRED
 
56
    x11
 
57
    xcursor
 
58
    xfixes
 
59
    xtst)
55
60
 
56
61
dnl *** arguments ***
57
62
 
58
63
AC_ARG_ENABLE(pointer-capture,
59
 
  [  --disable-pointer-capture     Disable pointer-capture applet],
60
 
  [build_pca=$enableval], [build_pca=yes])
 
64
  [  --enable-pointer-capture     Enable pointer-capture applet],
 
65
  [build_pca=$enableval], [build_pca=no])
61
66
 
62
67
AM_CONDITIONAL(BUILD_PCA, test "x$build_pca" = "xyes")
63
68
if test "$build_pca" = yes; then
65
70
fi
66
71
 
67
72
AC_ARG_ENABLE(dwell-click,
68
 
  [  --disable-dwell-click         Disable dwell-click applet],
69
 
  [build_dca=$enableval], [build_dca=yes])
 
73
  [  --enable-dwell-click         Enable dwell-click applet],
 
74
  [build_dca=$enableval], [build_dca=no])
70
75
 
71
76
AM_CONDITIONAL(BUILD_DCA, test "x$build_dca" = "xyes")
72
77
if test "$build_dca" = yes; then
73
78
  AC_DEFINE(BUILD_DCA, 1, [Build dwell-click applet])
74
79
fi
75
80
 
76
 
dnl *** libpanelapplet ***
 
81
dnl *** libpanelapplet (OPTIONAL) ***
77
82
 
78
83
if test "$build_dca" = yes -o "$build_pca" = yes; then
79
84
        PKG_CHECK_MODULES(PANELAPPLET, libpanelapplet-2.0)
80
 
        AC_SUBST(PANELAPPLET_CFLAGS)
81
 
        AC_SUBST(PANELAPPLET_LIBS)
82
 
fi
83
 
 
84
 
dnl *** gconf ***
85
 
 
86
 
AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
87
 
if test x"$GCONFTOOL" = xno; then
88
 
        AC_MSG_ERROR([gconftool-2 executable not found in your path])
89
 
fi
90
 
 
91
 
AM_GCONF_SOURCE_2
 
85
fi
 
86
 
 
87
dnl *** GLib tools ***
 
88
 
 
89
GLIB_MKENUMS="$($PKG_CONFIG --variable=glib_mkenums glib-2.0)"
 
90
AC_SUBST([GLIB_MKENUMS])
92
91
 
93
92
dnl *** output ***
94
93
 
95
 
AC_OUTPUT([Makefile
96
 
           src/Makefile
97
 
           data/Makefile
98
 
           pixmaps/Makefile
99
 
           po/Makefile.in
100
 
           help/Makefile
101
 
           man/Makefile])
102
 
 
103
 
echo ""
104
 
echo "Building panel applets:"
105
 
echo "-----------------------"
106
 
echo "  pointer-capture: $build_pca"
107
 
echo "  dwell-click:     $build_dca"
108
 
echo ""
 
94
AC_CONFIG_FILES([
 
95
    Makefile
 
96
    src/Makefile
 
97
    data/Makefile
 
98
    pixmaps/Makefile
 
99
    po/Makefile.in
 
100
    help/Makefile
 
101
    man/Makefile
 
102
])
 
103
 
 
104
AC_OUTPUT
 
105
 
 
106
AC_MSG_RESULT([
 
107
Building panel applets:
 
108
-----------------------
 
109
  pointer-capture: $build_pca
 
110
  dwell-click:     $build_dca
 
111
])