← Back to branch summary

~ubuntu-branches/ubuntu/saucy/gnome-online-accounts/saucy

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha
  • Date: 2012-08-20 22:37:44 UTC
  • mfrom: (1.1.15)
  • Revision ID: package-import@ubuntu.com-20120820223744-ndi1s9124mef09ak
Tags: 3.5.90-0ubuntu1
* New upstream release.
* debian/control.in:
  - Build-depend on krb5-config, libgcr-3-dev, and libkrb5-dev
* debian/rules:
  - Enable Kerberos provider
* debian/libgoa-1.0-0.symbols: Added new symbols

Show diffs side-by-side

added added

removed removed

Lines of Context:
configure.ac
1
1
AC_INIT([GNOME Online Accounts],
2
 
        [3.5.5],
 
2
        [3.5.90],
3
3
        [https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-online-accounts],
4
4
        [gnome-online-accounts])
5
5
 
204
204
  AC_DEFINE(GOA_WINDOWS_LIVE_ENABLED, 1, [Enable Windows Live data provider])
205
205
fi
206
206
 
 
207
# Kerberos
 
208
AC_ARG_ENABLE([kerberos],
 
209
              [AS_HELP_STRING([--enable-kerberos],
 
210
              [Enable kerberos support])],
 
211
              [with_kerberos=$enableval],
 
212
              [enable_kerberos=no])
 
213
AC_PATH_PROG([KRB5_CONFIG], krb5-config, none, $PATH:/usr/kerberos/bin)
 
214
 
 
215
if test "x$KRB5_CONFIG" != "xnone"; then
 
216
    KRB5_LIBS="`${KRB5_CONFIG} --libs krb5`"
 
217
    KRB5_CFLAGS="`${KRB5_CONFIG} --cflags krb5`"
 
218
    have_kerberos=yes
 
219
else
 
220
    KRB5_LIBS=""
 
221
    KRB5_CFLAGS=""
 
222
    have_kerberos=no
 
223
fi
 
224
AC_SUBST(KRB5_CFLAGS)
 
225
AC_SUBST(KRB5_LIBS)
 
226
 
 
227
if test "$enable_kerberos" != "no"; then
 
228
  if test "$have_kerberos" = "no" ; then
 
229
      AC_MSG_ERROR([kerberos support requested, but not available])
 
230
  fi
 
231
 
 
232
  PKG_CHECK_MODULES(GCR, gcr-3)
 
233
  AC_DEFINE(GCR_API_SUBJECT_TO_CHANGE, 1, [Define to use the GCR API])
 
234
  AC_DEFINE(GOA_KERBEROS_ENABLED, 1, [Enable Enterprise Identity data provider])
 
235
fi
 
236
AM_CONDITIONAL(BUILD_KERBEROS, [test x$enable_kerberos != xno])
 
237
 
 
238
# Optional timerfd support
 
239
AC_MSG_CHECKING([for timerfd support])
 
240
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
 
241
#include <sys/timerfd.h>
 
242
#include <unistd.h>
 
243
],[
 
244
int
 
245
main (void)
 
246
{
 
247
  struct itimerspec timer_spec = { 0 };
 
248
  timerfd_settime (timerfd_create (CLOCK_MONOTONIC, TFD_CLOEXEC),
 
249
                   TFD_TIMER_ABSTIME,
 
250
                   &timer_spec,
 
251
                   NULL);
 
252
 
 
253
  return 0;
 
254
}
 
255
])],
 
256
[have_timerfd=yes],
 
257
[have_timerfd=no])
 
258
AC_MSG_RESULT($have_timerfd)
 
259
if test x"$have_timerfd" = x"yes"; then
 
260
    AC_DEFINE(HAVE_TIMERFD, 1, [have timerfd support])
 
261
 
 
262
    dnl libc headers tend to trail kernel support
 
263
    dnl so compensate if necessary
 
264
    AC_MSG_CHECKING([for timerfd cancel-on-set support])
 
265
    AC_COMPILE_IFELSE([AC_LANG_PROGRAM([
 
266
    #include <sys/timerfd.h>
 
267
    #include <unistd.h>
 
268
    ],[
 
269
    int
 
270
    main (void)
 
271
    {
 
272
      struct itimerspec timer_spec = { 0 };
 
273
      timerfd_settime (timerfd_create (CLOCK_MONOTONIC, TFD_CLOEXEC),
 
274
                       TFD_TIMER_ABSTIME | TFD_TIMER_CANCEL_ON_SET,
 
275
                       &timer_spec,
 
276
                       NULL);
 
277
 
 
278
      return 0;
 
279
    }
 
280
    ])],
 
281
    [have_tfd_timer_cancel_on_set=yes],
 
282
    [have_tfd_timer_cancel_on_set=no])
 
283
    AC_MSG_RESULT($have_tfd_timer_cancel_on_set)
 
284
    if test x"$have_tfd_timer_cancel_on_set" = x"no"; then
 
285
       AC_DEFINE(TFD_TIMER_CANCEL_ON_SET, [(1 << 1)], [have timerfd support])
 
286
    fi
 
287
fi
 
288
 
207
289
# Internationalization
208
290
#
209
291
 
231
313
src/goa/goa-1.0.pc
232
314
src/goabackend/Makefile
233
315
src/goabackend/goa-backend-1.0.pc
 
316
src/goaidentity/Makefile
234
317
src/daemon/Makefile
235
318
src/examples/Makefile
236
319
po/Makefile.in
259
342
 
260
343
        Google provider:                ${enable_google} (OAuth 1.0, key:${with_google_consumer_key} secret:${with_google_consumer_secret})
261
344
        Microsoft Exchange provider:    ${enable_exchange}
 
345
        Kerberos provider:              ${enable_kerberos}
262
346
        Twitter provider:               ${enable_twitter} (OAuth 1.0, key:${with_twitter_consumer_key} secret:${with_twitter_consumer_secret})
263
347
        Yahoo provider:                 ${enable_yahoo} (OAuth 1.0, key:${with_yahoo_consumer_key} secret:${with_yahoo_consumer_secret})
264
348
        Facebook provider:              ${enable_facebook} (OAuth 2.0, id:${with_facebook_client_id})