← Back to branch summary

~dobey/ubuntuone-client-gnome/kill-share-contacts

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Rodney Dawes
  • Date: 2012-11-27 21:41:55 UTC
  • Revision ID: rodney.dawes@canonical.com-20121127214155-6ly3sqacwj41v24c
Need to special case newer versions of gnome-settings-daemon
Remove a removed file from POTFILES.in

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
109
109
fi
110
110
AM_CONDITIONAL([HAVE_GSD_30], [test "x$have_gsd_30" = "xyes"])
111
111
 
 
112
# gnome-settings-daemon 3.5.91 changes REGISTER macro behavior again
 
113
# To compensate, we need an additional define to avoid defining the
 
114
# class_finalize method for the plug-in
 
115
PKG_CHECK_EXISTS([gnome-settings-daemon >= 3.5.91],
 
116
    [have_gsd_36=yes],
 
117
    [have_gsd_36=no])
 
118
if test "x$have_gsd_36" = "xyes"; then
 
119
    AC_DEFINE_UNQUOTED([HAVE_GSD_36], [1],
 
120
                       [If using gnome-settings-daemon 3.5.91 or newer])
 
121
fi
 
122
 
112
123
PKG_CHECK_MODULES(SETTINGS_PLUGIN,
113
124
        gnome-settings-daemon
114
125
        gio-2.0