← Back to branch summary

~noskcaj/ubuntu/vivid/gdm/3.14.1

« back to all changes in this revision

Viewing changes to .pc/07_libexec-paths.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/07_libexec-paths.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
283
283
            AS_HELP_STRING([--with-systemdsystemunitdir=DIR],
284
284
                           [Directory for systemd service files]),
285
285
                [with_systemdsystemunitdir=$withval], [with_systemdsystemunitdir=$($PKG_CONFIG --variable=systemdsystemunitdir systemd)])
 
286
AC_ARG_ENABLE(systemd-journal,
 
287
            AS_HELP_STRING([--enable-systemd-journal],
 
288
                           [Add journald support @<:@default=auto@:>@]),
 
289
            [enable_systemd_journal=$enableval], [enable_systemd_journal=auto])
286
290
AC_ARG_WITH(plymouth,
287
291
            AS_HELP_STRING([--with-plymouth],
288
292
                           [Add plymouth support @<:@default=auto@:>@]),
289
293
            [with_plymouth=$withval], [with_plymouth=auto])
 
294
AC_ARG_ENABLE(fallback-greeter,
 
295
              AS_HELP_STRING([--enable-fallback-greeter],
 
296
                             [Enable fallback greeter @<:@default=no@:>@]),,
 
297
              enable_fallback_greeter=no)
 
298
AM_CONDITIONAL(ENABLE_FALLBACK_GREETER, test x$enable_fallback_greeter = xyes)
290
299
 
291
300
AC_ARG_WITH(at-spi-registryd-directory,
292
301
            AS_HELP_STRING([--with-at-spi-registryd-directory],
327
336
if test x$withval != x; then
328
337
        LANG_CONFIG_FILE="$withval"
329
338
else
330
 
        LANG_CONFIG_FILE='$(sysconfdir)/sysconfig/i18n'
 
339
        LANG_CONFIG_FILE='$(sysconfdir)/locale.conf'
331
340
fi
332
341
AC_SUBST(LANG_CONFIG_FILE)
333
342
 
945
954
AC_SUBST(SYSTEMD_CFLAGS)
946
955
AC_SUBST(SYSTEMD_LIBS)
947
956
 
 
957
PKG_CHECK_MODULES(JOURNALD,
 
958
                  [libsystemd-journal],
 
959
                  [have_journald=yes], [have_journald=no])
 
960
 
 
961
if test "x$enable_systemd_journal" = "xauto" ; then
 
962
        if test x$use_systemd = xyes ; then
 
963
                if test x$have_journald = xno ; then
 
964
                        use_journald=no
 
965
                else
 
966
                        use_journald=yes
 
967
                fi
 
968
        else
 
969
                use_journald=no
 
970
        fi
 
971
 
 
972
else
 
973
        use_journald="$enable_systemd_journal"
 
974
fi
 
975
 
 
976
if test "x$use_journald" != "xno" ; then
 
977
        if test "x$have_journald" = "xno"; then
 
978
                AC_MSG_ERROR([journald support explicitly required, but journald not found])
 
979
        fi
 
980
 
 
981
        AC_DEFINE(ENABLE_SYSTEMD_JOURNAL, 1, [Define to enable systemd journal support])
 
982
fi
 
983
AC_SUBST(JOURNALD_CFLAGS)
 
984
AC_SUBST(JOURNALD_LIBS)
 
985
 
948
986
AC_PATH_PROG(SYSTEMD_X_SERVER, systemd-multi-seat-x, [/lib/systemd/systemd-multi-seat-x], [/lib/systemd:/usr/lib/systemd:$PATH])
949
987
AC_SUBST(SYSTEMD_X_SERVER)
950
988
AC_DEFINE_UNQUOTED(SYSTEMD_X_SERVER,"$SYSTEMD_X_SERVER",[Path to systemd X server wrapper])
1316
1354
AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
1317
1355
 
1318
1356
dnl ---------------------------------------------------------------------------
 
1357
dnl - runtime directory
 
1358
dnl ---------------------------------------------------------------------------
 
1359
 
 
1360
AC_ARG_WITH([run-dir],
 
1361
            AS_HELP_STRING([--with-run-dir=<file>],
 
1362
                           [runtime directory]))
 
1363
 
 
1364
if ! test -z "$with_run_dir"; then
 
1365
   GDM_RUN_DIR=$with_run_dir
 
1366
else
 
1367
   GDM_RUN_DIR=${localstatedir}/run/gdm
 
1368
fi
 
1369
 
 
1370
AC_SUBST([GDM_RUN_DIR])
 
1371
 
 
1372
dnl ---------------------------------------------------------------------------
1319
1373
dnl - PID file
1320
1374
dnl ---------------------------------------------------------------------------
1321
1375
 
1326
1380
if ! test -z "$with_pid_file"; then
1327
1381
   GDM_PID_FILE=$with_pid_file
1328
1382
else
1329
 
   GDM_PID_FILE=/var/run/gdm.pid
 
1383
   GDM_PID_FILE=$GDM_RUN_DIR/gdm.pid
1330
1384
fi
1331
1385
 
1332
1386
AC_SUBST(GDM_PID_FILE)
1333
1387
AC_DEFINE_UNQUOTED(GDM_PID_FILE, "$GDM_PID_FILE", [pid file])
1334
1388
 
1335
1389
dnl ---------------------------------------------------------------------------
 
1390
dnl - ran once marker
 
1391
dnl ---------------------------------------------------------------------------
 
1392
 
 
1393
AC_ARG_WITH(ran-once-marker-directory,
 
1394
            AS_HELP_STRING([--with-ran-once-marker-directory=<dir>],
 
1395
                           [ran once marker directory]))
 
1396
 
 
1397
if ! test -z "$with_ran_once_marker_directory"; then
 
1398
   GDM_RAN_ONCE_MARKER_DIR=$with_ran_once_marker_directory
 
1399
else
 
1400
   GDM_RAN_ONCE_MARKER_DIR=$GDM_RUN_DIR
 
1401
fi
 
1402
AC_SUBST(GDM_RAN_ONCE_MARKER_DIR)
 
1403
AS_AC_EXPAND(GDM_RAN_ONCE_MARKER_DIR_EXPANDED, $GDM_RAN_ONCE_MARKER_DIR)
 
1404
AC_DEFINE_UNQUOTED(GDM_RAN_ONCE_MARKER_DIR, "$GDM_RAN_ONCE_MARKER_DIR_EXPANDED", [ran once marker dir])
 
1405
 
 
1406
GDM_RAN_ONCE_MARKER_FILE="$GDM_RAN_ONCE_MARKER_DIR/ran-once-marker"
 
1407
AC_SUBST(GDM_RAN_ONCE_MARKER_FILE)
 
1408
AS_AC_EXPAND(GDM_RAN_ONCE_MARKER_FILE_EXPANDED, $GDM_RAN_ONCE_MARKER_FILE)
 
1409
AC_DEFINE_UNQUOTED(GDM_RAN_ONCE_MARKER_FILE, "$GDM_RAN_ONCE_MARKER_FILE_EXPANDED", [ran once marker file])
 
1410
 
 
1411
dnl ---------------------------------------------------------------------------
1336
1412
dnl - GREETER WORKING DIRECTORY
1337
1413
dnl ---------------------------------------------------------------------------
1338
1414
 
1359
1435
if ! test -z "$with_xauth_dir"; then
1360
1436
   GDM_XAUTH_DIR=$with_xauth_dir
1361
1437
else
1362
 
   GDM_XAUTH_DIR=${localstatedir}/run/gdm
 
1438
   GDM_XAUTH_DIR=$GDM_RUN_DIR
1363
1439
fi
1364
1440
 
1365
1441
AC_SUBST(GDM_XAUTH_DIR)
1375
1451
if ! test -z "$with_screenshot_dir"; then
1376
1452
   GDM_SCREENSHOT_DIR=$with_screenshot_dir
1377
1453
else
1378
 
   GDM_SCREENSHOT_DIR=${localstatedir}/run/gdm/greeter
 
1454
   GDM_SCREENSHOT_DIR=$GDM_RUN_DIR/greeter
1379
1455
fi
1380
1456
 
1381
1457
AC_SUBST(GDM_SCREENSHOT_DIR)
1413
1489
        -Wall \
1414
1490
        -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
1415
1491
        -Wnested-externs -Wpointer-arith \
1416
 
        -Wcast-align -Wsign-compare -Wp,-D_FORTIFY_SOURCE=2 \
 
1492
        -Wcast-align -Wsign-compare \
1417
1493
        $CFLAGS"
1418
1494
 
1419
1495
        for option in -Wno-strict-aliasing -Wno-sign-compare; do