← Back to branch summary

~noskcaj/ubuntu/wily/lightdm-gtk-greeter/merge

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Sean Davis
  • Date: 2014-08-20 19:39:03 UTC
  • mto: (1.3.7 experimental)
  • mto: This revision was merged to the branch mainline in revision 23.
  • Revision ID: package-import@ubuntu.com-20140820193903-mvnpq7n5jipeh3la
Tags: upstream-1.9.0
Import upstream version 1.9.0

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
 
3
 
AC_INIT(lightdm-gtk-greeter, 1.8.5)
 
3
AC_INIT(lightdm-gtk-greeter, 1.9.0)
4
4
AC_CONFIG_MACRO_DIR(m4)
5
5
AC_CONFIG_HEADER(config.h)
6
6
AM_INIT_AUTOMAKE
23
23
dnl Dependencies
24
24
dnl ###########################################################################
25
25
 
26
 
AC_ARG_WITH([gtk2], AS_HELP_STRING([--with-gtk2], [Use gtk+-2.0 instead of gtk+-3.0]))
27
 
 
28
 
AS_IF([test "x$with_gtk2" = "xyes"],
29
 
      [PKG_CHECK_MODULES([GTK], [gtk+-2.0], [have_gtk2=yes])],
30
 
      [PKG_CHECK_MODULES([GTK], [gtk+-3.0])])
31
 
 
 
26
PKG_CHECK_MODULES([GTK], [gtk+-3.0])
32
27
PKG_CHECK_MODULES([GMODULE], [gmodule-export-2.0])
33
28
PKG_CHECK_MODULES([LIGHTDMGOBJECT], [liblightdm-gobject-1 >= 1.3.5])
34
29
PKG_CHECK_MODULES([LIBX11], [x11])
38
33
dnl ###########################################################################
39
34
 
40
35
INDICATOR_REQUIRED_VERSION=0.3.92
41
 
 
42
 
AS_IF([test "x$have_gtk2" = "xyes"],
43
 
      [INDICATOR_PKG=indicator-0.4],
44
 
      [
45
 
       INDICATOR_PKG=indicator3-0.4
46
 
       IDO_PKG=libido3-0.1
47
 
      ])
 
36
INDICATOR_PKG=indicator3-0.4
 
37
IDO_PKG=libido3-0.1
48
38
 
49
39
AC_ARG_ENABLE([libindicator],
50
40
    AC_HELP_STRING([--enable-libindicator], [Enable libindicator support])
84
74
 
85
75
AS_IF([test "x$enable_libido" = "xyes" && test "x$have_libindicator" = "xyes"], [
86
76
    AS_IF([$PKG_CONFIG --exists "$IDO_PKG" >/dev/null 2>&1], [
87
 
        PKG_CHECK_MODULES([LIBIDO], [$IDO_PKG], [
 
77
        PKG_CHECK_MODULES([LIBIDO], [$IDO_PKG >= 13.10], [
88
78
            AC_DEFINE([HAVE_LIBIDO], [1], [Define if "$IDO_PKG" is present])
89
79
        ])
90
80
    ], [
105
95
    AC_DEFINE([START_INDICATOR_SERVICES], [], [Try to start indicator-services])
106
96
])
107
97
 
 
98
AC_ARG_WITH([libxklavier], AS_HELP_STRING([--with-libxklavier], [Use libxklavier to manage layouts (instead of LightDM API)]))
 
99
 
 
100
AS_IF([test "x$with_libxklavier" = "xyes"],
 
101
      [
 
102
       PKG_CHECK_MODULES([LIBXKLAVIER], [libxklavier], [have_xklavier=yes])
 
103
       AC_DEFINE([HAVE_LIBXKLAVIER], [1], [Define if "libxklavier" is present])
 
104
      ],
 
105
      [])
 
106
 
108
107
dnl ###########################################################################
109
108
dnl Internationalization
110
109
dnl ###########################################################################