diff options
| author | Allan LeSage <allan.lesage@canonical.com> | 2013-11-21 10:37:31 -0600 |
|---|---|---|
| committer | Allan LeSage <allan.lesage@canonical.com> | 2013-11-21 10:37:31 -0600 |
| commit | bf2aab363e93263b1615f1811524fb22b14bf34b (patch) | |
| tree | 406500af69bd6555eb4e4dc63e3711bd341bb6b4 /configure.ac | |
| parent | f10353bc4208a48339cdc1e0656361b16636a3e2 (diff) | |
| parent | f90c7c21d0e82779356eaa8ae471703cda45d7cc (diff) | |
| download | ayatana-indicator-keyboard-bf2aab363e93263b1615f1811524fb22b14bf34b.tar.gz ayatana-indicator-keyboard-bf2aab363e93263b1615f1811524fb22b14bf34b.tar.bz2 ayatana-indicator-keyboard-bf2aab363e93263b1615f1811524fb22b14bf34b.zip | |
Merge trunk, resolving Makefile conflict.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index d0816254..5a333009 100644 --- a/configure.ac +++ b/configure.ac @@ -7,7 +7,7 @@ AC_CONFIG_SRCDIR([configure.ac]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.11 foreign -Wall -Woverride -Wno-portability]) +AM_INIT_AUTOMAKE([1.11 foreign serial-tests -Wall -Woverride -Wno-portability]) AM_SILENT_RULES([yes]) LT_INIT @@ -70,6 +70,14 @@ PKG_CHECK_MODULES([IBUS], [ibus-1.0]) AC_SUBST([IBUS_CFLAGS]) AC_SUBST([IBUS_LIBS]) +PKG_CHECK_MODULES([ACCOUNTSSERVICE], [accountsservice]) +AC_SUBST([ACCOUNTSSERVICE_CFLAGS]) +AC_SUBST([ACCOUNTSSERVICE_LIBS]) + +PKG_CHECK_MODULES([LIGHTDM], [liblightdm-gobject-1]) +AC_SUBST([LIGHTDM_CFLAGS]) +AC_SUBST([LIGHTDM_LIBS]) + PKG_CHECK_MODULES([BAMF], [libbamf3]) AC_SUBST([BAMF_CFLAGS]) AC_SUBST([BAMF_LIBS]) |