~thad-fisch-deactivatedaccount/lightdm-gtk-greeter/preselection-fix

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Sean Davis
  • Date: 2014-02-09 20:03:35 UTC
  • Revision ID: smd.seandavis@gmail.com-20140209200335-qxjsdzibxw7efcyt
Fix loading of indicators, document indicator changes in conf template file

Show diffs side-by-side

added added

removed removed

Lines of Context:
61
61
            AC_SUBST(UNITY_INDICATORDIR)
62
62
            AC_DEFINE([HAVE_LIBINDICATOR], [1], [Define if "$INDICATOR_PKG" is present])
63
63
 
64
 
            CFLAGS_OLD="$CPPFLAGS"
65
 
            CFLAGS="$GTK_CFLAGS $LIBIDO_CFLAGS $CFLAGS"
 
64
            CPPFLAGS_OLD="$CPPFLAGS"
 
65
            CPPFLAGS=`$PKG_CONFIG --cflags ${INDICATOR_PKG}`
66
66
            AC_CHECK_HEADER([libindicator/indicator-ng.h],
67
67
                [AC_DEFINE([HAVE_LIBINDICATOR_NG], [], [Define if "libindicator/indicator-ng.h" is present])],
68
68
                [], [-])
69
 
            CFLAGS="$CFLAGS_OLD"
 
69
            CPPFLAGS="$CPPFLAGS_OLD"
70
70
        ])
71
71
    ], [
72
72
        AC_MSG_CHECKING([for optional package $INDICATOR_PKG])