← Back to branch summary

~noskcaj/ubuntu/vivid/gdm/3.14.1

« back to all changes in this revision

Viewing changes to .pc/10_no_gettext.patch/configure.ac

  • Committer: Package Import Robot
  • Author(s): Jeremy Bicha, Tim Lunn, Jeremy Bicha, Robert Ancell
  • Date: 2013-05-31 22:36:08 UTC
  • mfrom: (1.4.55)
  • Revision ID: package-import@ubuntu.com-20130531223608-33uo85niksee5460
Tags: 3.8.1.1-0ubuntu1
[ Tim Lunn ]
* New upstream release
* debian/patches/ubuntu_dont_catch_sigsegv.patch:
  - Dropped, obsolete
* debian/rules:
  - Don't rename gdm binary since that's already been
    done in the new version

[ Jeremy Bicha ]
* debian/control.in: Bump minimum glib
* debian/watch: Watch for unstable releases
* debian/patches/00git_logind_check.patch:
  - Dropped, applied in new release
* debian/patches/08_frequent-users_greeter.patch: Refreshed

[ Robert Ancell ]
* New upstream release
* debian/patches/ubuntu_daemon_autologin_tracking.patch:
* debian/patches/ubuntu_ensure_dirs.patch:
* debian/patches/ubuntu_slave-only-set-up-autologin.patch:
  - Applied upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
.pc/10_no_gettext.patch/configure.ac
1
1
 
2
2
AC_PREREQ([2.60])
3
3
AC_INIT([gdm],
4
 
        [3.6.1],
 
4
        [3.8.1.1],
5
5
        [http://bugzilla.gnome.org/enter_bug.cgi?product=gdm])
6
6
 
7
7
AC_CONFIG_SRCDIR([daemon/gdm-manager.c])
38
38
 
39
39
AC_SUBST(VERSION)
40
40
 
41
 
AM_CONFIG_HEADER(config.h)
 
41
AC_CONFIG_HEADERS(config.h)
42
42
AC_CONFIG_MACRO_DIR([m4])
43
43
 
44
44
# Documentation
64
64
dnl ---------------------------------------------------------------------------
65
65
 
66
66
DBUS_GLIB_REQUIRED_VERSION=0.74
67
 
GLIB_REQUIRED_VERSION=2.33.2
 
67
GLIB_REQUIRED_VERSION=2.35.0
68
68
GTK_REQUIRED_VERSION=2.91.1
69
69
PANGO_REQUIRED_VERSION=1.3.0
70
70
SCROLLKEEPER_REQUIRED_VERSION=0.1.4
294
294
            AS_HELP_STRING([--with-systemdsystemunitdir=DIR],
295
295
                           [Directory for systemd service files]),
296
296
                [with_systemdsystemunitdir=$withval], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
 
297
AC_ARG_ENABLE(systemd-journal,
 
298
            AS_HELP_STRING([--enable-systemd-journal],
 
299
                           [Add journald support @<:@default=auto@:>@]),
 
300
            [enable_systemd_journal=$enableval], [enable_systemd_journal=auto])
297
301
AC_ARG_WITH(plymouth,
298
302
            AS_HELP_STRING([--with-plymouth],
299
303
                           [Add plymouth support @<:@default=auto@:>@]),
300
304
            [with_plymouth=$withval], [with_plymouth=auto])
 
305
AC_ARG_ENABLE(fallback-greeter,
 
306
              AS_HELP_STRING([--enable-fallback-greeter],
 
307
                             [Enable fallback greeter @<:@default=no@:>@]),,
 
308
              enable_fallback_greeter=no)
 
309
AM_CONDITIONAL(ENABLE_FALLBACK_GREETER, test x$enable_fallback_greeter = xyes)
301
310
 
302
311
AC_ARG_WITH(at-spi-registryd-directory,
303
312
            AS_HELP_STRING([--with-at-spi-registryd-directory],
338
347
if test x$withval != x; then
339
348
        LANG_CONFIG_FILE="$withval"
340
349
else
341
 
        LANG_CONFIG_FILE='$(sysconfdir)/sysconfig/i18n'
 
350
        LANG_CONFIG_FILE='$(sysconfdir)/locale.conf'
342
351
fi
343
352
AC_SUBST(LANG_CONFIG_FILE)
344
353
 
956
965
AC_SUBST(SYSTEMD_CFLAGS)
957
966
AC_SUBST(SYSTEMD_LIBS)
958
967
 
 
968
PKG_CHECK_MODULES(JOURNALD,
 
969
                  [libsystemd-journal],
 
970
                  [have_journald=yes], [have_journald=no])
 
971
 
 
972
if test "x$enable_systemd_journal" = "xauto" ; then
 
973
        if test x$use_systemd = xyes ; then
 
974
                if test x$have_journald = xno ; then
 
975
                        use_journald=no
 
976
                else
 
977
                        use_journald=yes
 
978
                fi
 
979
        else
 
980
                use_journald=no
 
981
        fi
 
982
 
 
983
else
 
984
        use_journald="$enable_systemd_journal"
 
985
fi
 
986
 
 
987
if test "x$use_journald" != "xno" ; then
 
988
        if test "x$have_journald" = "xno"; then
 
989
                AC_MSG_ERROR([journald support explicitly required, but journald not found])
 
990
        fi
 
991
 
 
992
        AC_DEFINE(ENABLE_SYSTEMD_JOURNAL, 1, [Define to enable systemd journal support])
 
993
fi
 
994
AC_SUBST(JOURNALD_CFLAGS)
 
995
AC_SUBST(JOURNALD_LIBS)
 
996
 
959
997
AC_PATH_PROG(SYSTEMD_X_SERVER, systemd-multi-seat-x, [/lib/systemd/systemd-multi-seat-x], [/lib/systemd:/usr/lib/systemd:$PATH])
960
998
AC_SUBST(SYSTEMD_X_SERVER)
961
999
AC_DEFINE_UNQUOTED(SYSTEMD_X_SERVER,"$SYSTEMD_X_SERVER",[Path to systemd X server wrapper])
1327
1365
AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
1328
1366
 
1329
1367
dnl ---------------------------------------------------------------------------
 
1368
dnl - runtime directory
 
1369
dnl ---------------------------------------------------------------------------
 
1370
 
 
1371
AC_ARG_WITH([run-dir],
 
1372
            AS_HELP_STRING([--with-run-dir=<file>],
 
1373
                           [runtime directory]))
 
1374
 
 
1375
if ! test -z "$with_run_dir"; then
 
1376
   GDM_RUN_DIR=$with_run_dir
 
1377
else
 
1378
   GDM_RUN_DIR=${localstatedir}/run/gdm
 
1379
fi
 
1380
 
 
1381
AC_SUBST([GDM_RUN_DIR])
 
1382
 
 
1383
dnl ---------------------------------------------------------------------------
1330
1384
dnl - PID file
1331
1385
dnl ---------------------------------------------------------------------------
1332
1386
 
1337
1391
if ! test -z "$with_pid_file"; then
1338
1392
   GDM_PID_FILE=$with_pid_file
1339
1393
else
1340
 
   GDM_PID_FILE=/var/run/gdm.pid
 
1394
   GDM_PID_FILE=$GDM_RUN_DIR/gdm.pid
1341
1395
fi
1342
1396
 
1343
1397
AC_SUBST(GDM_PID_FILE)
1344
1398
AC_DEFINE_UNQUOTED(GDM_PID_FILE, "$GDM_PID_FILE", [pid file])
1345
1399
 
1346
1400
dnl ---------------------------------------------------------------------------
 
1401
dnl - ran once marker
 
1402
dnl ---------------------------------------------------------------------------
 
1403
 
 
1404
AC_ARG_WITH(ran-once-marker-directory,
 
1405
            AS_HELP_STRING([--with-ran-once-marker-directory=<dir>],
 
1406
                           [ran once marker directory]))
 
1407
 
 
1408
if ! test -z "$with_ran_once_marker_directory"; then
 
1409
   GDM_RAN_ONCE_MARKER_DIR=$with_ran_once_marker_directory
 
1410
else
 
1411
   GDM_RAN_ONCE_MARKER_DIR=$GDM_RUN_DIR
 
1412
fi
 
1413
AC_SUBST(GDM_RAN_ONCE_MARKER_DIR)
 
1414
AS_AC_EXPAND(GDM_RAN_ONCE_MARKER_DIR_EXPANDED, $GDM_RAN_ONCE_MARKER_DIR)
 
1415
AC_DEFINE_UNQUOTED(GDM_RAN_ONCE_MARKER_DIR, "$GDM_RAN_ONCE_MARKER_DIR_EXPANDED", [ran once marker dir])
 
1416
 
 
1417
GDM_RAN_ONCE_MARKER_FILE="$GDM_RAN_ONCE_MARKER_DIR/ran-once-marker"
 
1418
AC_SUBST(GDM_RAN_ONCE_MARKER_FILE)
 
1419
AS_AC_EXPAND(GDM_RAN_ONCE_MARKER_FILE_EXPANDED, $GDM_RAN_ONCE_MARKER_FILE)
 
1420
AC_DEFINE_UNQUOTED(GDM_RAN_ONCE_MARKER_FILE, "$GDM_RAN_ONCE_MARKER_FILE_EXPANDED", [ran once marker file])
 
1421
 
 
1422
dnl ---------------------------------------------------------------------------
1347
1423
dnl - GREETER WORKING DIRECTORY
1348
1424
dnl ---------------------------------------------------------------------------
1349
1425
 
1370
1446
if ! test -z "$with_xauth_dir"; then
1371
1447
   GDM_XAUTH_DIR=$with_xauth_dir
1372
1448
else
1373
 
   GDM_XAUTH_DIR=${localstatedir}/run/gdm
 
1449
   GDM_XAUTH_DIR=$GDM_RUN_DIR
1374
1450
fi
1375
1451
 
1376
1452
AC_SUBST(GDM_XAUTH_DIR)
1386
1462
if ! test -z "$with_screenshot_dir"; then
1387
1463
   GDM_SCREENSHOT_DIR=$with_screenshot_dir
1388
1464
else
1389
 
   GDM_SCREENSHOT_DIR=${localstatedir}/run/gdm/greeter
 
1465
   GDM_SCREENSHOT_DIR=$GDM_RUN_DIR/greeter
1390
1466
fi
1391
1467
 
1392
1468
AC_SUBST(GDM_SCREENSHOT_DIR)
1424
1500
        -Wall \
1425
1501
        -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
1426
1502
        -Wnested-externs -Wpointer-arith \
1427
 
        -Wcast-align -Wsign-compare -Wp,-D_FORTIFY_SOURCE=2 \
 
1503
        -Wcast-align -Wsign-compare \
1428
1504
        $CFLAGS"
1429
1505
 
1430
1506
        for option in -Wno-strict-aliasing -Wno-sign-compare; do