← Back to branch summary

~leighman/ubuntu/raring/workrave/fix-desktop-file-2

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Michael Terry
  • Date: 2013-01-24 11:04:41 UTC
  • mto: This revision was merged to the branch mainline in revision 16.
  • Revision ID: package-import@ubuntu.com-20130124110441-t06q3xlc7mp4406p
Tags: upstream-1.10
Import upstream version 1.10

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
1
dnl Process this file with autoconf to produce a configure script.
2
2
dnl
3
 
dnl Copyright (C) 2001 - 2012 Rob Caelers & Raymond Penners
 
3
dnl Copyright (C) 2001 - 2013 Rob Caelers & Raymond Penners
4
4
dnl
5
5
 
6
6
m4_define([workrave_major_version], [1])
7
 
m4_define([workrave_minor_version], [9])
8
 
m4_define([workrave_micro_version], [909])
 
7
m4_define([workrave_minor_version], [10])
 
8
m4_define([workrave_micro_version], [0])
9
9
m4_define([workrave_version_suffix], [0])
 
10
#m4_define([workrave_version],
 
11
#          [workrave_major_version.workrave_minor_version.workrave_micro_version])
10
12
m4_define([workrave_version],
11
 
          [workrave_major_version.workrave_minor_version.workrave_micro_version])
 
13
          [workrave_major_version.workrave_minor_version])
12
14
m4_define([workrave_resource_version],
13
15
          [workrave_major_version,workrave_minor_version,workrave_micro_version,workrave_version_suffix])
14
16
 
26
28
AM_INIT_AUTOMAKE([-Wall -Werror foreign silent-rules])
27
29
dnl AM_SILENT_RULES([yes])
28
30
 
29
 
GNOME_SHELL_VERSION=3.2.1
 
31
GNOME_SHELL_VERSION=3.6.2
30
32
AC_SUBST(GNOME_SHELL_VERSION)
31
33
 
32
34
if test -d $srcdir/.git && test "$TINDERBOX_BUILD" = yes; then
704
706
AC_ARG_ENABLE(localinstall, AS_HELP_STRING([--enable-localinstall], [install all of the files localy instead of system directories (for distcheck)]), with_localinstall=$enableval, with_localinstall=no)
705
707
 
706
708
AS_IF([test "x$with_localinstall" = "xyes"],
707
 
    INDICATORDIR="${libdir}/indicators3/6"
 
709
    INDICATORDIR="${libdir}/indicators3/7"
708
710
    INDICATORICONSDIR="${datadir}/libindicate/icons"
709
711
    ,
710
712
    INDICATORDIR=`$PKG_CONFIG --variable=indicatordir indicator3-0.4 | sed -e 's%/$%%'`
1065
1067
             po/Makefile.in
1066
1068
             contrib/Makefile
1067
1069
             contrib/plot/Makefile
1068
 
             build/Makefile
 
1070
             contrib/send_menu_command/Makefile
 
1071
             contrib/send_menu_command/win32/Makefile
 
1072
             contrib/send_dbus_command/Makefile
 
1073
             contrib/send_dbus_command/kde/Makefile
 
1074
             build/Makefile
1069
1075
             m4/Makefile
1070
1076
])
1071
1077