← Back to branch summary

~ubuntu-branches/ubuntu/raring/gnome-panel/raring

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Jeremy Bicha
  • Date: 2011-08-17 21:57:14 UTC
  • mfrom: (1.13.11 upstream)
  • Revision ID: james.westby@ubuntu.com-20110817215714-mr18pl4hqedmprd7
Tags: 1:3.1.5-0ubuntu1
* New upstream release.
* debian/control: Bump gnome-menus dependencies
* debian/libpanel-applet-4-dev.install: No longer any *.a files to install
* debian/patches/09_default_icons.patch: Disabled until it can be ported
* debian/patches/90_build_fixes.patch: Dropped, applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
 
AC_INIT([gnome-panel], [3.0.2],
 
1
AC_INIT([gnome-panel], [3.1.5],
2
2
        [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-panel])
3
3
AM_CONFIG_HEADER(config.h)
4
4
AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 tar-ustar -Wno-portability])
5
5
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
6
6
 
7
7
AC_CONFIG_MACRO_DIR([m4])
8
 
GNOME_COMMON_INIT
9
8
 
10
9
# Before making a release, the LT_VERSION string should be modified.
11
10
# The string is of the form C:R:A.
18
17
LIBPANEL_APPLET_API_VERSION=4.0
19
18
AC_SUBST([LIBPANEL_APPLET_API_VERSION],[$LIBPANEL_APPLET_API_VERSION])
20
19
 
21
 
LIB_PANEL_APPLET_LT_VERSION=0:1:0
 
20
LIB_PANEL_APPLET_LT_VERSION=0:2:0
22
21
AC_SUBST(LIB_PANEL_APPLET_LT_VERSION)
23
22
 
24
 
AM_MAINTAINER_MODE
25
23
GNOME_MAINTAINER_MODE_DEFINES
26
24
 
27
 
IT_PROG_INTLTOOL([0.40.0])
28
 
 
29
 
AC_ISC_POSIX
 
25
LT_PREREQ([2.2.6])
 
26
LT_INIT([dlopen disable-static])
 
27
 
 
28
IT_PROG_INTLTOOL([0.40.6])
 
29
 
30
30
AC_PROG_CC
31
 
AC_STDC_HEADERS
32
 
AC_LIBTOOL_WIN32_DLL
33
 
AC_PROG_LIBTOOL
34
 
#AC_PROG_SED available in 2.59b
35
 
AM_PROG_CC_C_O
36
31
 
37
32
AM_PATH_PYTHON
38
33
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
39
34
AC_PATH_PROG(GCONFTOOL, gconftool-2)
40
35
 
41
 
GNOME_COMPILE_WARNINGS(maximum)
 
36
GNOME_COMPILE_WARNINGS([maximum])
42
37
 
43
38
# Check for introspection
44
39
GOBJECT_INTROSPECTION_CHECK([0.9.5])
69
64
GTK_REQUIRED=3.0
70
65
LIBWNCK_REQUIRED=2.91.0
71
66
GCONF_REQUIRED=2.6.1
72
 
LIBGNOME_MENU_REQUIRED=2.27.92
 
67
LIBGNOME_MENU_REQUIRED=3.1.4
73
68
TELEPATHY_GLIB_REQUIRED=0.14.0
74
69
LIBECAL_REQUIRED=2.91.2
75
70
LIBEDATASERVER_REQUIRED=2.91.2
82
77
 
83
78
PKG_CHECK_MODULES(EGG_SMCLIENT, ice sm gtk+-3.0)
84
79
 
85
 
PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu >= $LIBGNOME_MENU_REQUIRED dconf)
 
80
PKG_CHECK_MODULES(PANEL, gdk-pixbuf-2.0 >= $GDK_PIXBUF_REQUIRED pango >= $PANGO_REQUIRED gtk+-3.0 >= $GTK_REQUIRED cairo-xlib glib-2.0 >= $GLIB_REQUIRED gio-2.0 >= $GLIB_REQUIRED gio-unix-2.0 >= $GLIB_REQUIRED gnome-desktop-3.0 >= $LIBGNOME_DESKTOP_REQUIRED gconf-2.0 >= $GCONF_REQUIRED libgnome-menu-3.0 >= $LIBGNOME_MENU_REQUIRED dconf)
86
81
AC_SUBST(PANEL_CFLAGS)
87
82
AC_SUBST(PANEL_LIBS)
88
83
 
293
288
        ;;
294
289
esac
295
290
 
296
 
dnl Don't use AC_PROG_AWK since we need the full pathname.
297
 
AC_PATH_PROGS(AWK, mawk gawk nawk awk, )
298
 
AC_PATH_PROGS(PERL, perl5 perl)
299
 
 
300
 
dnl define a MAINT-like variable REBUILD which is set if Perl
301
 
dnl and awk are found, so autogenerated sources can be rebuilt
302
 
AC_ARG_ENABLE(rebuilds, [  --disable-rebuilds      disable all source autogeneration rules],,enable_rebuilds=yes)
303
 
REBUILD=\#
304
 
if test "x$enable_rebuilds" = "xyes" && \
305
 
     test -n "$PERL" && \
306
 
     $PERL -e 'exit !($] >= 5.002)' > /dev/null 2>&1 && \
307
 
     test -n "$AWK" ; then
308
 
  REBUILD=
309
 
fi
310
 
AC_SUBST(REBUILD)
311
 
 
312
291
AC_CONFIG_FILES([
313
292
Makefile
314
293
data/Makefile