~darkxst/ubuntu/saucy/gdm/lp1212408

« back to all changes in this revision

Viewing changes to configure.ac

  • Committer: Bazaar Package Importer
  • Author(s): Josselin Mouette
  • Date: 2008-09-02 10:37:20 UTC
  • mfrom: (1.4.27 upstream)
  • mto: This revision was merged to the branch mainline in revision 261.
  • Revision ID: james.westby@ubuntu.com-20080902103720-p810vv530hqj45wg
Tags: 2.20.7-3
* Install the debian-moreblue-orbit theme, thanks Andre Luiz Rodrigues 
  Ferreira. Closes: #497440.
* 35_gdm.conf.patch: make it the default.
* copyright: fix encoding.

Show diffs side-by-side

added added

removed removed

Lines of Context:
2
2
AC_INIT(daemon/gdm.h)
3
3
 
4
4
AM_CONFIG_HEADER(config.h)
5
 
AM_INIT_AUTOMAKE(gdm,2.16.4)
 
5
AM_INIT_AUTOMAKE(gdm,2.20.7)
6
6
AC_CONFIG_MACRO_DIR([m4])
7
7
AM_MAINTAINER_MODE
 
8
AC_GNU_SOURCE
8
9
 
9
10
IT_PROG_INTLTOOL([0.35.0])
10
11
 
11
12
GNOME_DOC_INIT
12
13
 
13
 
GLIB_REQUIRED=2.8.0
 
14
DBUS_REQUIRED=0.30
 
15
GLIB_REQUIRED=2.12.0
14
16
GTK_REQUIRED=2.6.0
15
17
PANGO_REQUIRED=1.3.0
16
18
LIBGLADE_REQUIRED=1.99.2
71
73
 
72
74
AC_ARG_WITH(selinux, [  --with-selinux  Add SELinux support])
73
75
 
74
 
# On Solaris, Xnest is only shipped in /usr/openwin/, but your
75
 
# should use "--with-post-path=/usr/openwin/bin" for full
76
 
# Xserver support (such as access to Xnest and other X executables
77
 
# that are only in /usr/openwin/bin and not yet in /usr/X11/bin).
78
 
# Someday the Xserver team at Sun may fix this, then you don't
79
 
# have to do this anymore.
 
76
AC_ARG_WITH(console-kit,
 
77
  [  --with-console-kit=[auto/yes/no]  Add ConsoleKit support [default=auto]],,
 
78
  with_console_kit=auto)
 
79
 
 
80
# Some distros may want to add directories to the end of the default path.
 
81
# The --with-post-path can be used to add these at configure time.
80
82
#
81
 
# For other platforms it may be useful to add stuff you want to the
82
 
# end of the default path, if your distribution provider has
83
 
# specific directories for branded applications or whatever or
84
 
# clever directories like /usr/sfw/bin or whatever that OpenView
85
 
# binary directory is for those OpenView users forced to use GDM.
86
 
# OpenView users like to recompile code anyway.
 
83
# On Solaris, you should use "--with-post-path=/usr/openwin/bin" for
 
84
# full Xserver support since some X programs are still in the older
 
85
# location (such as sessreg).  Someday the Sun Xserver team will fix this,
 
86
# and then you will not have to do this anymore.
87
87
#
88
88
withval=""
89
89
AC_ARG_WITH(post-path,
111
111
fi
112
112
AC_SUBST(PAM_PREFIX)
113
113
 
 
114
dnl
 
115
dnl file that sets LANG
 
116
dnl
 
117
withval=""
 
118
AC_ARG_WITH(lang-file,
 
119
    [  --with-lang-file=<filename>   file containing default language setting],[
 
120
if test x$withval != x; then
 
121
AC_MSG_RESULT("System locale will be looked for in file ${withval}.")
 
122
fi])
 
123
if test x$withval != x; then
 
124
        LANG_CONFIG_FILE="$withval"
 
125
else
 
126
        LANG_CONFIG_FILE='${sysconfdir}/sysconfig/i18n'
 
127
fi
 
128
AC_SUBST(LANG_CONFIG_FILE)
114
129
    
115
130
AC_PATH_PROG(CONSOLE_HELPER,consolehelper,no)
116
131
if test "x$CONSOLE_HELPER" = "xno" ; then
143
158
#endif
144
159
)
145
160
 
146
 
AC_CHECK_FUNCS([setresuid setenv unsetenv clearenv])
 
161
AC_CHECK_FUNCS([setresuid setenv unsetenv clearenv getutxent updwtmpx logwtmp login logout])
147
162
 
148
163
dnl checks needed for Darwin compatibility to linux **environ.
149
164
AC_CHECK_HEADERS(crt_externs.h)
152
167
GNOME_COMPILE_WARNINGS
153
168
CFLAGS="$CFLAGS $WARN_CFLAGS"
154
169
 
155
 
PKG_CHECK_MODULES(VICIOUS, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED)
156
 
AC_SUBST(VICIOUS_CFLAGS)
157
 
AC_SUBST(VICIOUS_LIBS)
 
170
PKG_CHECK_MODULES(COMMON, gtk+-2.0 >= $GTK_REQUIRED libglade-2.0 >= $LIBGLADE_REQUIRED)
 
171
AC_SUBST(COMMON_CFLAGS)
 
172
AC_SUBST(COMMON_LIBS)
158
173
 
159
174
PKG_CHECK_MODULES(DAEMON, gtk+-2.0 >= $GTK_REQUIRED)
160
175
AC_SUBST(DAEMON_CFLAGS)
221
236
 
222
237
EXTRA_DAEMON_LIBS=""
223
238
EXTRA_CHOOSER_LIBS=""
224
 
EXTRA_XNEST_LIBS=""
225
 
EXTRA_FLEXI_LIBS=""
226
 
EXTRA_DYNAMIC_LIBS=""
227
 
EXTRA_SETUP_LIBS=""
 
239
EXTRA_GREETER_LIBS=""
 
240
EXTRA_SOCKET_LIB=""
 
241
EXTRA_NSL_LIB=""
228
242
 
229
243
AC_CHECK_FUNC(socket,,[
230
244
              AC_CHECK_LIB(socket,socket, [
231
245
                           EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lsocket"
232
246
                           EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lsocket"
233
 
                           EXTRA_XNEST_LIBS="$EXTRA_XNEST_LIBS -lsocket"
234
 
                           EXTRA_FLEXI_LIBS="$EXTRA_FLEXI_LIBS -lsocket"
235
 
                           EXTRA_DYNAMIC_LIBS="$EXTRA_DYNAMIC_LIBS -lsocket"
236
 
                           EXTRA_SETUP_LIBS="$EXTRA_SETUP_LIBS -lsocket"])])
 
247
                           EXTRA_SOCKET_LIB="-lsocket"])])
237
248
AC_CHECK_FUNC(gethostbyname,,[
238
249
              AC_CHECK_LIB(nsl,gethostbyname, [
239
250
                           EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lnsl"
240
 
                           EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lnsl"])])
 
251
                           EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lnsl"
 
252
                           EXTRA_NSL_LIB="-lnsl"])])
241
253
AC_CHECK_FUNC(sched_yield,[
242
254
              AC_DEFINE(HAVE_SCHED_YIELD)],[
243
255
              AC_CHECK_LIB(rt,sched_yield, [
248
260
              AC_CHECK_LIB(resolv,inet_aton, [
249
261
                           EXTRA_CHOOSER_LIBS="$EXTRA_CHOOSER_LIBS -lresolv"])])
250
262
 
251
 
VICIOUS_GNOME_LIBS="libviciousui.a  libviciousui-minimal.a "
252
 
AC_SUBST(VICIOUS_GNOME_LIBS)
 
263
AC_MSG_CHECKING(if utmpx structure has ut_syslen field)
 
264
AC_TRY_COMPILE([
 
265
  #include <utmpx.h>],[
 
266
  struct utmpx record;
 
267
  record.ut_syslen = sizeof (record.ut_host);
 
268
  ],
 
269
  have_ut_syslen=yes,
 
270
  have_ut_syslen=no
 
271
  )
 
272
if test x$have_ut_syslen = xyes; then
 
273
  AC_DEFINE(HAVE_UT_SYSLEN)
 
274
fi
 
275
AC_MSG_RESULT($have_ut_syslen)
 
276
 
 
277
COMMON_GNOME_LIBS="libgdmcommon-ui.a"
 
278
AC_SUBST(COMMON_GNOME_LIBS)
253
279
 
254
280
dnl *****************************
255
281
dnl     IPv6 specific checks
301
327
dnl borrowed from gnu findutils
302
328
dnl and relicensed as LGPL by the FSF
303
329
 
 
330
AC_ARG_WITH(prefetch,
 
331
  [  --with-prefetch=[yes/no]  Install GDM library prefetch utility [default=no]],,
 
332
  with_prefetch=no)
 
333
 
 
334
if test x$with_prefetch != xno ; then
 
335
        GDMPREFETCH="gdmprefetch"
 
336
        GDMPREFETCHLIST="gdmprefetchlist"
 
337
        GDMPREFETCHCMD='${libdir}/gdmprefetch \@${gdmconfdir}/gdmprefetchlist'
 
338
fi
 
339
 
304
340
AC_ARG_WITH(afs,
305
341
[  --with-afs              support -fstype afs],
306
342
[  AC_DEFINE(AFS, [], [Define if you have the Andrew File System])
345
381
dnl ## gdmopen building
346
382
dnl There are perhaps others where this works
347
383
GDMOPEN=
348
 
AC_CHECK_HEADERS(linux/vt.h, [
 
384
AC_CHECK_HEADERS(sys/vt.h, [
 
385
                 AC_DEFINE(HAVE_SYS_VT_H)])
 
386
AC_CHECK_HEADERS(sys/vt.h, [
349
387
                 GDMOPEN=gdmopen])
350
388
AC_SUBST(GDMOPEN)
351
389
 
479
517
AC_CHECK_HEADERS(libgen.h, [
480
518
                 AC_DEFINE(HAVE_LIBGEN_H)])
481
519
 
 
520
#
 
521
# Check for utmp stuff
 
522
#
 
523
AC_CHECK_HEADERS(utmp.h utmpx.h libutil.h sys/param.h)
 
524
AC_CHECK_FUNC(getutmpx updwtmpx)
 
525
AC_CHECK_LIB(util,login)
 
526
AC_CHECK_LIB(util,logout)
 
527
GDM_CHECK_UTMP
 
528
 
482
529
 
483
530
#
484
531
# Xdmcp checking
777
824
fi
778
825
 
779
826
#
780
 
# Subst the extra libs
 
827
# ConsoleKit support
781
828
#
782
 
AC_SUBST(EXTRA_DAEMON_LIBS)
783
 
AC_SUBST(EXTRA_CHOOSER_LIBS)
784
 
AC_SUBST(EXTRA_XNEST_LIBS)
785
 
AC_SUBST(EXTRA_FLEXI_LIBS)
786
 
AC_SUBST(EXTRA_DYNAMIC_LIBS)
787
 
AC_SUBST(EXTRA_SETUP_LIBS)
 
829
use_console_kit=no
 
830
if test "x$with_console_kit" != "xno" ; then
 
831
        use_console_kit=yes
 
832
        PKG_CHECK_MODULES(DBUS, dbus-glib-1 >= $DBUS_REQUIRED)
 
833
        AC_DEFINE(WITH_CONSOLE_KIT, 1, [Define to enable ConsoleKit support])
 
834
fi
 
835
AM_CONDITIONAL(WITH_CONSOLE_KIT, test x$use_console_kit = xyes)
 
836
AC_SUBST(WITH_CONSOLE_KIT)
 
837
AC_SUBST(DBUS_CFLAGS)
 
838
AC_SUBST(DBUS_LIBS)
788
839
 
789
840
#
790
841
# Define some variables to represent the directories we use.
791
842
#
792
843
AC_SUBST(authdir, ${localstatedir}/gdm)
793
844
AC_SUBST(gdmlocaledir, ${gdmconfdir})
794
 
AC_SUBST(logdir, ${localstatedir}/log/gdm)
795
845
AC_SUBST(pixmapdir, ${datadir}/pixmaps)
796
846
 
 
847
AC_ARG_WITH(log-dir,    [  --with-log-dir=<file>     log dir])
 
848
 
 
849
if ! test -z "$with_log_dir"; then
 
850
   GDM_LOG_DIR=$with_log_dir
 
851
else
 
852
   GDM_LOG_DIR=/var/log/gdm
 
853
fi
 
854
AC_SUBST(logdir, $GDM_LOG_DIR)
 
855
 
 
856
AC_ARG_WITH(libaudit,
 
857
  [  --with-libaudit=[auto/yes/no]  Add Linux audit support [default=auto]],,
 
858
  with_libaudit=auto)
 
859
 
797
860
withval=""
798
861
AC_ARG_WITH(at-bindir,
799
862
[  --with-at-bindir=<PATH>   PATH to Accessible Technology programs [default=BINDIR]],)
870
933
fi
871
934
 
872
935
if test ${libexecdir} = "\${exec_prefix}/libexec"; then
873
 
   ssh_libexec="$real_gdm_prefix/libexec"
874
 
else
875
 
   ssh_libexec="${libexecdir}"
876
 
fi
 
936
   gdm_libexec="$real_gdm_prefix/libexec"
 
937
else
 
938
   gdm_libexec="${libexecdir}"
 
939
fi
 
940
 
 
941
AC_ARG_WITH(atspi-dir,
 
942
  [  --with-atspi-dir=<PATH>   PATH to at-spi-registryd [default=LIBEXECDIR]])
 
943
 
 
944
if ! test -z "$with_atspi_dir"; then
 
945
  ATSPI_DIR="$with_atspi_dir"
 
946
else
 
947
  ATSPI_DIR="$gdm_libexec"
 
948
fi
 
949
AC_SUBST(atspidir, $ATSPI_DIR)
877
950
 
878
951
if test x$enable_secureremote != xno ; then
879
952
       SSHDESKTOP="ssh.desktop"
880
953
        GDMSSHSESSION="gdm-ssh-session"
881
 
        GDMSSHSESSIONCMD="${ssh_libexec}/gdm-ssh-session"
 
954
        GDMSSHSESSIONCMD="${gdm_libexec}/gdm-ssh-session"
882
955
fi
883
956
AC_SUBST(SSHDESKTOP)
884
957
AC_SUBST(GDMSSHSESSION)
905
978
   AC_MSG_RESULT(no)
906
979
fi
907
980
 
 
981
# Check for Linux auditing API
 
982
#
 
983
# libaudit detection
 
984
if test x$with_libaudit = xno ; then
 
985
    have_libaudit=no;
 
986
else
 
987
    # See if we have audit daemon library
 
988
    AC_CHECK_LIB(audit, audit_log_user_message,
 
989
                 have_libaudit=yes, have_libaudit=no)
 
990
fi
 
991
 
 
992
AM_CONDITIONAL(HAVE_LIBAUDIT, test x$have_libaudit = xyes)
 
993
 
 
994
if test x$have_libaudit = xyes ; then
 
995
    EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -laudit"
 
996
    AC_DEFINE(HAVE_LIBAUDIT,1,[linux audit support])
 
997
fi
 
998
 
908
999
# Check for Solaris auditing API
909
1000
# Note, Solaris auditing not supported for Solaris 9 or earlier and
910
1001
# should not be used on these versions of Solaris if auditing is
933
1024
                        AC_DEFINE(HAVE_LOGINDEVPERM)
934
1025
                            EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -ldevinfo" ])
935
1026
 
 
1027
# Check for RBAC support (chkauthattr
 
1028
#
 
1029
AC_MSG_CHECKING(for RBAC support - chkauthattr)
 
1030
AC_CHECK_LIB(secdb, chkauthattr, [
 
1031
                        AC_DEFINE(HAVE_CHKAUTHATTR)
 
1032
                            EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lsecdb"
 
1033
                            EXTRA_GREETER_LIBS="$EXTRA_GREETER_LIBS -lsecdb"])
 
1034
 
 
1035
# ctrun support for Solaris
 
1036
#
 
1037
AC_ARG_WITH(ctrun,
 
1038
  [  --with-ctrun=[yes/no]  Define to yes if GDM is started as a svcadm(1M) service,  [default=no]],,
 
1039
  with_ctrun=no)
 
1040
 
 
1041
if test x$with_ctrun != xno ; then
 
1042
   AC_PATH_PROG(HAVE_CTRUN,ctrun,no,/usr/bin)
 
1043
   if test "x$HAVE_CTRUN" != "xno" ; then
 
1044
      AC_DEFINE(HAVE_CTRUN)
 
1045
   fi
 
1046
fi
 
1047
 
 
1048
# check for the nologin location
 
1049
AC_PATH_PROG(NOLOGIN, nologin, /sbin/nologin)
 
1050
AC_DEFINE_UNQUOTED(NOLOGIN, "$NOLOGIN", [Path to the nologin binary])
 
1051
 
 
1052
#
 
1053
# Subst the extra libs
 
1054
#
 
1055
AC_SUBST(EXTRA_DAEMON_LIBS)
 
1056
AC_SUBST(EXTRA_CHOOSER_LIBS)
 
1057
AC_SUBST(EXTRA_GREETER_LIBS)
 
1058
AC_SUBST(EXTRA_SOCKET_LIB)
 
1059
AC_SUBST(EXTRA_NSL_LIB)
 
1060
 
936
1061
# Define different Halt, and Reboot commands differently for Solaris.
937
1062
#
938
1063
# On Solaris/bin is a symlink to /usr/bin, so don't include it in
939
1064
# GDM_USER_PATH.
940
1065
#
 
1066
GDM_USER_PATH=""
 
1067
GDM_RBAC_SYSCMD_KEYS=""
 
1068
 
941
1069
case "$host" in
942
1070
*solaris*)
943
 
        GDM_USER_PATH="/usr/bin"
944
 
        HALT_COMMAND="/sbin/init 5"
945
 
        REBOOT_COMMAND="/sbin/init 6"
946
 
        SUSPEND_COMMAND="/usr/openwin/bin/sys-suspend -n"
947
 
        XSESSION_SHELL=/bin/ksh
948
 
        SOUND_PROGRAM=/usr/bin/audioplay
949
 
        ;;
 
1071
        HOST_GDM_USER_PATH="/usr/bin"
 
1072
        HOST_HALT_COMMAND="/sbin/init 5"
 
1073
        HOST_REBOOT_COMMAND="/sbin/init 6"
 
1074
        HOST_SUSPEND_COMMAND="/usr/openwin/bin/sys-suspend -n"
 
1075
        HOST_XSESSION_SHELL=/bin/ksh
 
1076
        HOST_SOUND_PROGRAM=/usr/bin/audioplay
 
1077
        HOST_GDMGNOMESESSIONCMD=/usr/dt/config/Xsession.jds
 
1078
        HOST_GDM_RBAC_SYSCMD_KEYS="HALT:solaris.system.shutdown;REBOOT:solaris.system.shutdown;SUSPEND:solaris.system.power.suspend.ram"
 
1079
        HOST_UTMP_LINE_ATTACHED="/dev/dtlocal"
 
1080
        HOST_UTMP_LINE_REMOTE="/dev/dtremote"
 
1081
        HOST_UTMP_PSEUDO_DEVICE="true"
 
1082
        os_solaris=yes
 
1083
        ;;
950
1084
*freebsd*)
951
 
        GDM_USER_PATH="/bin:/usr/bin"
952
 
        HALT_COMMAND="/sbin/shutdown -p now;/usr/sbin/shutdown -p now"
953
 
        REBOOT_COMMAND="/sbin/shutdown -r now;/usr/sbin/shutdown -r now"
954
 
        SUSPEND_COMMAND="/usr/sbin/zzz"
955
 
        XSESSION_SHELL=/bin/sh
956
 
        SOUND_PROGRAM=
 
1085
        HOST_GDM_USER_PATH="/bin:/usr/bin"
 
1086
        HOST_HALT_COMMAND="/sbin/shutdown -p now;/usr/sbin/shutdown -p now"
 
1087
        HOST_REBOOT_COMMAND="/sbin/shutdown -r now;/usr/sbin/shutdown -r now"
 
1088
        HOST_SUSPEND_COMMAND="/usr/sbin/zzz"
 
1089
        HOST_XSESSION_SHELL=/bin/sh
 
1090
        HOST_SOUND_PROGRAM=
 
1091
        HOST_GDMGNOMESESSIONCMD=gnome-session
 
1092
        HOST_UTMP_LINE_ATTACHED="/dev/console"
 
1093
        HOST_UTMP_LINE_REMOTE=""
 
1094
        HOST_UTMP_PSEUDO_DEVICE="false"
 
1095
        ;;
 
1096
*openbsd*)
 
1097
        HOST_GDM_USER_PATH="/bin:/usr/bin"
 
1098
        HOST_HALT_COMMAND="/sbin/halt -p;/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now"
 
1099
        HOST_REBOOT_COMMAND="/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now"
 
1100
        HOST_SUSPEND_COMMAND="/usr/bin/zzz"
 
1101
        HOST_XSESSION_SHELL=/bin/sh
 
1102
        HOST_SOUND_PROGRAM="$real_gdm_prefix/bin/play"
 
1103
        HOST_GDMGNOMESESSIONCMD=gnome-session
 
1104
        HOST_UTMP_LINE_ATTACHED="/dev/console"
 
1105
        HOST_UTMP_LINE_REMOTE=""
 
1106
        HOST_UTMP_PSEUDO_DEVICE="false"
957
1107
        ;;
958
1108
*)
959
 
        GDM_USER_PATH="/bin:/usr/bin"
960
 
        HALT_COMMAND="/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now"
961
 
        REBOOT_COMMAND="/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now"
962
 
        SUSPEND_COMMAND=""
963
 
        XSESSION_SHELL=/bin/sh
964
 
        SOUND_PROGRAM=/usr/bin/play
965
 
        ;;
 
1109
        HOST_GDM_USER_PATH="/bin:/usr/bin"
 
1110
        HOST_HALT_COMMAND="/usr/bin/poweroff;/sbin/poweroff;/sbin/shutdown -h now;/usr/sbin/shutdown -h now"
 
1111
        HOST_REBOOT_COMMAND="/usr/bin/reboot;/sbin/reboot;/sbin/shutdown -r now;/usr/sbin/shutdown -r now"
 
1112
        HOST_SUSPEND_COMMAND=""
 
1113
        HOST_XSESSION_SHELL=/bin/sh
 
1114
        HOST_SOUND_PROGRAM=/usr/bin/play
 
1115
        HOST_GDMGNOMESESSIONCMD=gnome-session
 
1116
        HOST_UTMP_LINE_ATTACHED="/dev/console"
 
1117
        HOST_UTMP_LINE_REMOTE=""
 
1118
        HOST_UTMP_PSEUDO_DEVICE="false"
 
1119
        ;;
966
1120
esac
967
1121
 
968
 
# First check with "! -h" for /usr/X11R6 and /usr/X11 since they often
969
 
# symlink to each other, and configure should use the more stable
970
 
# location (the real directory) if possible.
971
 
#
972
 
if true; then # debian
 
1122
# allow user to override the host-specific default
 
1123
 
 
1124
test "x$GDM_USER_PATH" == x && GDM_USER_PATH=${HOST_GDM_USER_PATH}
 
1125
test "x$GDM_HALT_COMMAND" == x && GDM_HALT_COMMAND=${HOST_GDM_HALT_COMMAND}
 
1126
test "x$HALT_COMMAND" == x && HALT_COMMAND=${HOST_HALT_COMMAND}
 
1127
test "x$REBOOT_COMMAND" == x && REBOOT_COMMAND=${HOST_REBOOT_COMMAND}
 
1128
test "x$SUSPEND_COMMAND" == x && SUSPEND_COMMAND=${HOST_SUSPEND_COMMAND}
 
1129
test "x$XSESSION_SHELL" == x && XSESSION_SHELL=${HOST_XSESSION_SHELL}
 
1130
test "x$SOUND_PROGRAM" == x && SOUND_PROGRAM=${HOST_SOUND_PROGRAM}
 
1131
test "x$GDMGNOMESESSIONCMD" == x && GDMGNOMESESSIONCMD=${HOST_GDMGNOMESESSIONCMD}
 
1132
test "x$UTMP_LINE_ATTACHED" == x && UTMP_LINE_ATTACHED=${HOST_UTMP_LINE_ATTACHED}
 
1133
test "x$UTMP_LINE_REMOTE" == x && UTMP_LINE_REMOTE=${HOST_UTMP_LINE_REMOTE}
 
1134
test "x$UTMP_PSEUDO_DEVICE" == x && UTMP_PSEUDO_DEVICE=${HOST_UTMP_PSEUDO_DEVICE}
 
1135
test "x$GDM_RBAC_SYSCMD_KEYS" == x && GDM_RBAC_SYSCMD_KEYS=${HOST_GDM_RBAC_SYSCMD_KEYS}
 
1136
 
 
1137
# On Solaris, the /usr/bin/Xserver script is used to decide whether to
 
1138
# use Xsun or Xorg, so this is used on Solaris.
 
1139
#
 
1140
# When testing for /usr/X11R6, first check with "! -h" for /usr/X11R6
 
1141
# and /usr/X11 since they often symlink to each other, and configure
 
1142
# should use the more stable location (the real directory) if possible.
 
1143
#
 
1144
if test -x /usr/X11/bin/Xserver; then
 
1145
   X_PATH="/usr/X11/bin"
 
1146
   X_SERVER_PATH="/usr/X11/bin"
 
1147
   X_SERVER="/usr/X11/bin/Xserver"
 
1148
   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
 
1149
   X_CONFIG_OPTIONS="-audit 0"
 
1150
elif test ! -h /usr/X11R6 -a ! -h /usr/X11R6/bin -a -x /usr/X11R6/bin/X; then
 
1151
   X_PATH="/usr/X11R6/bin"
 
1152
   X_SERVER_PATH="/usr/X11R6/bin"
 
1153
   X_SERVER="/usr/X11R6/bin/X"
 
1154
   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
 
1155
   X_CONFIG_OPTIONS="-audit 0"
 
1156
elif test ! -h /usr/X11 -a ! -h /usr/X11/bin -a -x /usr/X11/bin/X; then
 
1157
   X_PATH="/usr/X11/bin"
 
1158
   X_SERVER_PATH="/usr/X11/bin"
 
1159
   X_SERVER="/usr/X11/bin/X"
 
1160
   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
 
1161
   X_CONFIG_OPTIONS="-audit 0"
 
1162
elif test -x /usr/bin/X; then
973
1163
   X_PATH="/usr/bin"
974
1164
   X_SERVER_PATH="/usr/bin"
975
1165
   X_SERVER="/usr/bin/X"
976
1166
   X_CONFIG_OPTIONS="-audit 0"
977
 
elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
978
 
   X_PATH="/usr/X11R6/bin"
979
 
   X_SERVER_PATH="/usr/X11R6/bin"
980
 
   X_SERVER="/usr/X11R6/bin/X"
981
 
   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
982
 
   X_CONFIG_OPTIONS="-audit 0"
983
 
elif test ! -h /usr/X11 -a -x /usr/X11/bin/X; then
 
1167
elif test -x /usr/X11/bin/Xorg; then
984
1168
   X_PATH="/usr/X11/bin"
985
1169
   X_SERVER_PATH="/usr/X11/bin"
986
 
   X_SERVER="/usr/X11/bin/X"
987
 
   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11/bin"
988
 
   X_CONFIG_OPTIONS="-audit 0"
989
 
elif test -x /usr/X11R6/bin/X; then
990
 
   X_PATH="/usr/X11R6/bin"
991
 
   X_SERVER_PATH="/usr/X11R6/bin"
992
 
   X_SERVER="/usr/X11R6/bin/X"
993
 
   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
 
1170
   X_SERVER="/usr/X11/bin/Xorg"
994
1171
   X_CONFIG_OPTIONS="-audit 0"
995
1172
elif test -x /usr/bin/Xorg; then
996
1173
   X_PATH="/usr/bin"
997
1174
   X_SERVER_PATH="/usr/bin"
998
1175
   X_SERVER="/usr/bin/Xorg"
999
1176
   X_CONFIG_OPTIONS="-audit 0"
 
1177
elif test -x /usr/X11R6/bin/X; then
 
1178
   X_PATH="/usr/X11R6/bin"
 
1179
   X_SERVER_PATH="/usr/X11R6/bin"
 
1180
   X_SERVER="/usr/X11R6/bin/X"
 
1181
   GDM_USER_PATH="$GDM_USER_PATH:/usr/X11R6/bin"
 
1182
   X_CONFIG_OPTIONS="-audit 0"
1000
1183
elif test -x /usr/X11/bin/X; then
1001
1184
   X_PATH="/usr/X11/bin"
1002
1185
   X_SERVER_PATH="/usr/X11/bin"
1032
1215
   X_CONFIG_OPTIONS="-audit 0"
1033
1216
fi
1034
1217
 
1035
 
# Don't add bindir to GDM_USER_PATH if it is already in the PATH.
1036
 
# If it is /bin or /usr/bin, for example.
1037
 
if test "x$real_gdm_prefix" != "x/" -a "x$real_gdm_prefix" != "x/usr"; then
1038
 
    GDM_USER_PATH="$GDM_USER_PATH:${bindir}"
1039
 
fi
1040
 
 
1041
 
# You have to use /usr/openwin/bin/Xnest even if you are using the
1042
 
# Xorg Xserver on Solaris x86.
 
1218
# Use Xephyr if it is available.  It works better than Xnest since Xephyr
 
1219
# supports the Xserver extensions, even if on a remote machine.
1043
1220
#
1044
 
case "$host" in
1045
 
*solaris*)
1046
 
        X_XNEST_PATH="/usr/openwin/bin"
 
1221
X_XNEST_UNSCALED_FONTPATH="true"
 
1222
if test -x $X_SERVER_PATH/Xephyr; then
 
1223
    X_XNEST_CMD="$X_SERVER_PATH/Xephyr"
 
1224
    X_XNEST_CONFIG_OPTIONS="-audit 0"
 
1225
else
 
1226
    if test -x /usr/openwin/bin/Xnest; then
 
1227
        # If on Solaris, Xnest is only shipped with the Xsun Xserver, so
 
1228
        # use this version.
 
1229
        #
 
1230
        X_XNEST_CMD="/usr/openwin/bin/Xnest"
1047
1231
        X_XNEST_CONFIG_OPTIONS="-audit 0 -name Xnest -pn"
1048
 
        ;;
1049
 
*)
1050
 
        X_XNEST_PATH=$X_SERVER_PATH
1051
 
        X_XNEST_CONFIG_OPTIONS="-audit 0 -name Xnest"
1052
 
        ;;
1053
 
esac
 
1232
        X_XNEST_UNSCALED_FONTPATH="false"
 
1233
    else
 
1234
        if test -x $X_SERVER_PATH/Xnest; then
 
1235
            X_XNEST_CMD="$X_SERVER_PATH/Xnest"
 
1236
            X_XNEST_CONFIG_OPTIONS="-audit 0 -name Xnest"
 
1237
        fi
 
1238
    fi
 
1239
fi
1054
1240
 
1055
1241
# Set POST_PATH after doing system specific case above just in case
1056
1242
# any platforms want to update the PATH for a specific OS or distro.
1060
1246
   GDM_USER_PATH="$GDM_USER_PATH:$USER_POST_PATH"
1061
1247
fi
1062
1248
 
 
1249
dnl ---------------------------------------------------------------------------
 
1250
dnl Expand vars
 
1251
dnl ---------------------------------------------------------------------------
 
1252
 
 
1253
AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
 
1254
AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
 
1255
AS_AC_EXPAND(DATADIR, $datadir)
 
1256
AS_AC_EXPAND(BINDIR, $bindir)
 
1257
AS_AC_EXPAND(SBINDIR, $sbindir)
 
1258
AS_AC_EXPAND(LIBDIR, $libdir)
 
1259
AS_AC_EXPAND(LIBEXECDIR, $libexecdir)
 
1260
 
 
1261
dnl ---------------------------------------------------------------------------
 
1262
dnl - PID file
 
1263
dnl ---------------------------------------------------------------------------
 
1264
 
 
1265
AC_ARG_WITH(pid-file,    [  --with-pid-file=<file>     pid file])
 
1266
 
 
1267
if ! test -z "$with_pid_file"; then
 
1268
   GDM_PID_FILE=$with_pid_file
 
1269
else
 
1270
   GDM_PID_FILE=/var/run/gdm.pid
 
1271
fi
 
1272
 
 
1273
AC_SUBST(GDM_PID_FILE)
 
1274
AC_DEFINE_UNQUOTED(GDM_PID_FILE, "$GDM_PID_FILE", [pid file])
 
1275
 
 
1276
dnl ---------------------------------------------------------------------------
 
1277
dnl - Additional warnings
 
1278
dnl ---------------------------------------------------------------------------
 
1279
 
 
1280
AC_ARG_ENABLE(more-warnings,
 
1281
  AC_HELP_STRING([--enable-more-warnings], [Maximum compiler warnings]),
 
1282
set_more_warnings="$enableval",[
 
1283
if test -d $srcdir/.svn; then
 
1284
        set_more_warnings=yes
 
1285
else
 
1286
        set_more_warnings=no
 
1287
fi
 
1288
])
 
1289
AC_MSG_CHECKING(for more warnings)
 
1290
if test "$GCC" = "yes" -a "$set_more_warnings" != "no"; then
 
1291
        AC_MSG_RESULT(yes)
 
1292
        CFLAGS="\
 
1293
        -Wall \
 
1294
        -Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
 
1295
        -Wnested-externs -Wpointer-arith \
 
1296
        -Wcast-align -Wsign-compare \
 
1297
        $CFLAGS"
 
1298
 
 
1299
        for option in -Wno-strict-aliasing -Wno-sign-compare; do
 
1300
                SAVE_CFLAGS="$CFLAGS"
 
1301
                CFLAGS="$CFLAGS $option"
 
1302
                AC_MSG_CHECKING([whether gcc understands $option])
 
1303
                AC_TRY_COMPILE([], [],
 
1304
                        has_option=yes,
 
1305
                        has_option=no,)
 
1306
                if test $has_option = no; then
 
1307
                        CFLAGS="$SAVE_CFLAGS"
 
1308
                fi
 
1309
                AC_MSG_RESULT($has_option)
 
1310
                unset has_option
 
1311
                unset SAVE_CFLAGS
 
1312
        done
 
1313
        unset option
 
1314
else
 
1315
        AC_MSG_RESULT(no)
 
1316
fi
 
1317
 
 
1318
# Allow configure to specify RBAC keys.
 
1319
#
 
1320
AC_ARG_WITH(rbac-system-command-keys,    [  --with-rbac-system-command-keys=<keys>     RBAC system command keys])
 
1321
 
 
1322
if ! test -z "$with_system_command_keys"; then
 
1323
   GDM_RBAC_SYSCMD_KEYS=$with_system_command_keys
 
1324
fi
 
1325
 
 
1326
# Set configuration choices.
 
1327
#
 
1328
AM_CONDITIONAL(OS_SOLARIS, test x$os_solaris = xyes)
 
1329
 
1063
1330
AC_SUBST(HALT_COMMAND)
1064
1331
AC_DEFINE_UNQUOTED(HALT_COMMAND,"$HALT_COMMAND")
1065
1332
AC_SUBST(REBOOT_COMMAND)
1069
1336
AC_SUBST(XSESSION_SHELL)
1070
1337
AC_DEFINE_UNQUOTED(XSESSION_SHELL,"$XSESSION_SHELL")
1071
1338
AC_SUBST(GDM_USER_PATH)
 
1339
AC_DEFINE_UNQUOTED(GDM_USER_PATH,"$GDM_USER_PATH")
1072
1340
AC_SUBST(SOUND_PROGRAM)
1073
1341
AC_DEFINE_UNQUOTED(SOUND_PROGRAM,"$SOUND_PROGRAM")
 
1342
AC_SUBST(UTMP_LINE_ATTACHED)
 
1343
AC_DEFINE_UNQUOTED(UTMP_LINE_ATTACHED,"$UTMP_LINE_ATTACHED")
 
1344
AC_SUBST(UTMP_LINE_REMOTE)
 
1345
AC_DEFINE_UNQUOTED(UTMP_LINE_REMOTE,"$UTMP_LINE_REMOTE")
 
1346
AC_SUBST(UTMP_PSEUDO_DEVICE)
 
1347
AC_DEFINE_UNQUOTED(UTMP_PSEUDO_DEVICE,"$UTMP_PSEUDO_DEVICE")
 
1348
AC_SUBST(GDMGNOMESESSIONCMD)
 
1349
AC_SUBST(GDM_RBAC_SYSCMD_KEYS)
 
1350
AC_DEFINE_UNQUOTED(GDM_RBAC_SYSCMD_KEYS,"$GDM_RBAC_SYSCMD_KEYS")
1074
1351
 
1075
1352
AC_SUBST(X_PATH)
1076
1353
AC_SUBST(X_SERVER)
1077
1354
AC_SUBST(X_SERVER_PATH)
1078
 
AC_SUBST(X_XNEST_PATH)
1079
 
AC_SUBST(X_XNEST_CONFIG_OPTIONS)
1080
1355
AC_SUBST(X_CONFIG_OPTIONS)
1081
1356
AC_DEFINE_UNQUOTED(X_SERVER,"$X_SERVER")
1082
1357
AC_DEFINE_UNQUOTED(X_SERVER_PATH,"$X_SERVER_PATH")
1083
1358
AC_DEFINE_UNQUOTED(X_CONFIG_OPTIONS,"$X_CONFIG_OPTIONS", Options used when launching xserver)
1084
1359
 
 
1360
AC_SUBST(X_XNEST_CMD)
 
1361
AC_SUBST(X_XNEST_CONFIG_OPTIONS)
 
1362
AC_SUBST(X_XNEST_UNSCALED_FONTPATH)
 
1363
AC_DEFINE_UNQUOTED(X_XNEST_CMD,"$X_XNEST_CMD")
 
1364
AC_DEFINE_UNQUOTED(X_XNEST_CONFIG_OPTIONS,"$X_XNEST_CONFIG_OPTIONS")
 
1365
AC_DEFINE_UNQUOTED(X_XNEST_UNSCALED_FONTPATH,"$X_XNEST_UNSCALED_FONTPATH")
 
1366
 
1085
1367
## Stuff for debian/changelog.in
1086
1368
#if test -e "debian/changelog"; then
1087
1369
#  DEBIAN_DATESTAMP=`head -1 debian/changelog| sed -e 's/.*cvs.//' -e 's/).*//'`
1097
1379
AC_OUTPUT([
1098
1380
Makefile
1099
1381
daemon/Makefile
 
1382
data/Makefile
 
1383
data/icons/Makefile
 
1384
data/icons/16x16/Makefile
 
1385
data/icons/16x16/apps/Makefile
 
1386
data/icons/22x22/Makefile
 
1387
data/icons/22x22/apps/Makefile
 
1388
data/icons/24x24/Makefile
 
1389
data/icons/24x24/apps/Makefile
 
1390
data/icons/32x32/Makefile
 
1391
data/icons/32x32/apps/Makefile
 
1392
data/icons/48x48/Makefile
 
1393
data/icons/48x48/apps/Makefile
 
1394
data/icons/scalable/Makefile
 
1395
data/icons/scalable/apps/Makefile
1100
1396
gui/Makefile
 
1397
gui/gdmflexiserver-xnest.desktop.in
1101
1398
gui/faces/Makefile
1102
1399
gui/greeter/Makefile
1103
1400
gui/greeter/themes/Makefile
1108
1405
utils/Makefile
1109
1406
pixmaps/Makefile
1110
1407
pixmaps/16x16/Makefile
 
1408
pixmaps/24x24/Makefile
1111
1409
pixmaps/32x32/Makefile
1112
1410
pixmaps/48x48/Makefile
1113
1411
config/Makefile
1114
1412
po/Makefile.in
1115
 
vicious-extensions/Makefile
 
1413
common/Makefile
1116
1414
docs/Makefile
1117
 
docs/de/Makefile
1118
 
docs/es/Makefile
1119
 
docs/fr/Makefile
1120
 
docs/it/Makefile
1121
 
docs/ja/Makefile
1122
 
docs/ko/Makefile
1123
 
docs/zh_CN/Makefile
1124
 
docs/zh_HK/Makefile
1125
 
docs/zh_TW/Makefile
1126
1415
config/Init
1127
1416
config/PreSession
1128
1417
config/PostSession
1129
1418
config/gdmprefetchlist
 
1419
config/gnome.desktop.in
1130
1420
config/ssh.desktop.in
1131
 
gdm-stop
1132
 
gdm-restart
1133
 
gdm-safe-restart
1134
 
gdm.spec
1135
1421
])
1136
1422
 
1137
1423
dnl add back when help comes back
1220
1506
        echo "Solaris Trusted Extensions support    : NO"
1221
1507
fi
1222
1508
 
 
1509
dnl <= ConsoleKit support =>
 
1510
if test "x$use_console_kit" = "xyes" ; then
 
1511
        echo "ConsoleKit support                    : YES"
 
1512
else
 
1513
        echo "ConsoleKit support                    : NO"
 
1514
fi
 
1515
 
1223
1516
dnl <= Authentication scheme =>
1224
1517
echo "Authentication scheme                 : $VRFY"
1225
1518