summaryrefslogtreecommitdiff
path: root/x11/gdm/files/patch-configure
diff options
context:
space:
mode:
authorKoop Mast <kwm@FreeBSD.org>2018-09-30 11:58:29 +0000
committerKoop Mast <kwm@FreeBSD.org>2018-09-30 11:58:29 +0000
commit951c1f5d1c7354f058f5919d858dbb0c174dc73e (patch)
tree6146e775343aaf339921799078894a48fef9aa15 /x11/gdm/files/patch-configure
parentRemove expired ports: (diff)
The FreeBSD GNOME team proudly presents GNOME 3.28 for FreeBSD.
The offical GNOME 3.28 release notes can be found at https://help.gnome.org/misc/release-notes/3.28/ Thanks to Antoine Brodin for running the exp-runs. PR: 229761
Notes
Notes: svn path=/head/; revision=480951
Diffstat (limited to 'x11/gdm/files/patch-configure')
-rw-r--r--x11/gdm/files/patch-configure431
1 files changed, 431 insertions, 0 deletions
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure
new file mode 100644
index 000000000000..c683d50161f5
--- /dev/null
+++ b/x11/gdm/files/patch-configure
@@ -0,0 +1,431 @@
+--- configure.orig 2018-01-14 13:01:10.629609000 +0100
++++ configure 2018-01-14 13:02:06.272152000 +0100
+@@ -677,6 +677,7 @@ HAVE_ADT_TRUE
+ XEVIE_OPTION
+ CHECK_ACCELERATED_DIR
+ GNOME_SETTINGS_DAEMON_DIR
++CONSOLEKIT_DIR
+ GDM_OLD_CONF
+ GDM_CUSTOM_CONF
+ GDM_DEFAULTS_CONF
+@@ -697,6 +698,9 @@ JOURNALD_LIBS
+ JOURNALD_CFLAGS
+ SYSTEMD_LIBS
+ SYSTEMD_CFLAGS
++WITH_CONSOLE_KIT
++WITH_CONSOLE_KIT_FALSE
++WITH_CONSOLE_KIT_TRUE
+ XINERAMA_LIBS
+ LIBWRAP_LIBS
+ OS_SOLARIS_FALSE
+@@ -983,6 +987,8 @@ enable_authentication_scheme
+ with_xinerama
+ with_xdmcp
+ with_tcp_wrappers
++with_console_kit
++with_systemd
+ with_systemdsystemunitdir
+ enable_systemd_journal
+ enable_wayland_support
+@@ -1002,6 +1008,7 @@ with_log_dir
+ with_at_bindir
+ with_defaults_conf
+ with_custom_conf
++with_consolekit_directory
+ with_gnome_settings_daemon_directory
+ with_check_accelerated_directory
+ with_xevie
+@@ -1748,6 +1755,8 @@ Optional Packages:
+ --with-xinerama Add Xinerama support [default=auto]
+ --with-xdmcp Add XDMCP (remote login) support [default=auto]
+ --with-tcp-wrappers Use TCP Wrappers [default=auto]
++ --with-console-kit Add ConsoleKit support [default=auto]
++ --with-systemd Add systemd support [default=auto]
+ --with-systemdsystemunitdir=DIR
+ Directory for systemd service files
+ --with-plymouth Add plymouth support [default=yes]
+@@ -1776,6 +1785,9 @@ Optional Packages:
+ --with-custom-conf=<FILENAME>
+ FILENAME to give to custom configuration file
+ [default=GDMCONFDIR/custom.conf]
++ --with-consolekit-directory
++ Specify the directory of ck-get-x11-display-device
++ [default=libexecdir]
+ --with-gnome-settings-daemon-directory
+ Specify the directory of gnome-settings-daemon used
+ by the chooser [default=libexecdir]
+@@ -20860,24 +20872,6 @@ else
+ fi
+
+
+-for ac_header in security/pam_modules.h security/pam_modutil.h security/pam_ext.h
+-do :
+- as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+-ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+- cat >>confdefs.h <<_ACEOF
+-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
+-_ACEOF
+- have_pam=yes
+-else
+- if test "x$have_pam" = xyes ; then
+- as_fn_error $? "PAM development files not found." "$LINENO" 5
+- fi
+-fi
+-
+-done
+-
+-
+ # Check whether --enable-console-helper was given.
+ if test "${enable_console_helper+set}" = set; then :
+ enableval=$enable_console_helper;
+@@ -20922,7 +20916,23 @@ fi
+
+
+
++# Check whether --with-console-kit was given.
++if test "${with_console_kit+set}" = set; then :
++ withval=$with_console_kit;
++else
++ with_console_kit=no
++fi
+
++
++
++# Check whether --with-systemd was given.
++if test "${with_systemd+set}" = set; then :
++ withval=$with_systemd; with_systemd=$withval
++else
++ with_systemd=auto
++fi
++
++
+ # Check whether --with-systemdsystemunitdir was given.
+ if test "${with_systemdsystemunitdir+set}" = set; then :
+ withval=$with_systemdsystemunitdir; with_systemdsystemunitdir=$withval
+@@ -21764,8 +21774,17 @@ fi
+
+ $as_echo "#define SUPPORTS_PAM_EXTENSIONS 1" >>confdefs.h
+
++else
++ if false; then
++ SUPPORTS_PAM_EXTENSIONS_TRUE=
++ SUPPORTS_PAM_EXTENSIONS_FALSE='#'
++else
++ SUPPORTS_PAM_EXTENSIONS_TRUE='#'
++ SUPPORTS_PAM_EXTENSIONS_FALSE=
+ fi
+
++fi
++
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for keyctl_read in -lkeyutils" >&5
+ $as_echo_n "checking for keyctl_read in -lkeyutils... " >&6; }
+ if ${ac_cv_lib_keyutils_keyctl_read+:} false; then :
+@@ -22008,7 +22027,7 @@ fi
+
+
+
+-for ac_header in utmp.h utmpx.h libutil.h sys/param.h
++for ac_header in utmp.h utmpx.h util.h sys/param.h
+ do :
+ as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default"
+@@ -22021,7 +22040,7 @@ fi
+
+ done
+
+-for ac_func in getutxent updwtmpx updwtmp
++for ac_func in getutxent getttyent updwtmpx updwtmp
+ do :
+ as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
+ ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
+@@ -22033,94 +22052,6 @@ _ACEOF
+ fi
+ done
+
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for login in -lutil" >&5
+-$as_echo_n "checking for login in -lutil... " >&6; }
+-if ${ac_cv_lib_util_login+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lutil $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char login ();
+-int
+-main ()
+-{
+-return login ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_util_login=yes
+-else
+- ac_cv_lib_util_login=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_login" >&5
+-$as_echo "$ac_cv_lib_util_login" >&6; }
+-if test "x$ac_cv_lib_util_login" = xyes; then :
+-
+-
+-$as_echo "#define HAVE_LOGIN 1" >>confdefs.h
+-
+- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for logout in -lutil" >&5
+-$as_echo_n "checking for logout in -lutil... " >&6; }
+-if ${ac_cv_lib_util_logout+:} false; then :
+- $as_echo_n "(cached) " >&6
+-else
+- ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lutil $LIBS"
+-cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+-/* end confdefs.h. */
+-
+-/* Override any GCC internal prototype to avoid an error.
+- Use char because int might match the return type of a GCC
+- builtin and then its argument prototype would still apply. */
+-#ifdef __cplusplus
+-extern "C"
+-#endif
+-char logout ();
+-int
+-main ()
+-{
+-return logout ();
+- ;
+- return 0;
+-}
+-_ACEOF
+-if ac_fn_c_try_link "$LINENO"; then :
+- ac_cv_lib_util_logout=yes
+-else
+- ac_cv_lib_util_logout=no
+-fi
+-rm -f core conftest.err conftest.$ac_objext \
+- conftest$ac_exeext conftest.$ac_ext
+-LIBS=$ac_check_lib_save_LIBS
+-fi
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_util_logout" >&5
+-$as_echo "$ac_cv_lib_util_logout" >&6; }
+-if test "x$ac_cv_lib_util_logout" = xyes; then :
+-
+-
+-$as_echo "#define HAVE_LOGOUT 1" >>confdefs.h
+-
+- EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
+-fi
+-
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for logwtmp in -lutil" >&5
+ $as_echo_n "checking for logwtmp in -lutil... " >&6; }
+ if ${ac_cv_lib_util_logwtmp+:} false; then :
+@@ -23207,7 +23138,25 @@ fi
+ CPPFLAGS="$xinerama_save_cppflags"
+
+
++use_console_kit=no
++if test "x$with_console_kit" != "xno" ; then
++ use_console_kit=yes
+
++$as_echo "#define WITH_CONSOLE_KIT 1" >>confdefs.h
++
++fi
++ if test x$use_console_kit = xyes; then
++ WITH_CONSOLE_KIT_TRUE=
++ WITH_CONSOLE_KIT_FALSE='#'
++else
++ WITH_CONSOLE_KIT_TRUE='#'
++ WITH_CONSOLE_KIT_FALSE=
++fi
++
++
++
++
++
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for SYSTEMD" >&5
+ $as_echo_n "checking for SYSTEMD... " >&6; }
+@@ -23216,12 +23165,12 @@ if test -n "$SYSTEMD_CFLAGS"; then
+ pkg_cv_SYSTEMD_CFLAGS="$SYSTEMD_CFLAGS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 186 libsystemd-daemon\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libsystemd-login >= 186 libsystemd-daemon") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd" 2>/dev/null`
++ pkg_cv_SYSTEMD_CFLAGS=`$PKG_CONFIG --cflags "libsystemd-login >= 186 libsystemd-daemon" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -23233,12 +23182,12 @@ if test -n "$SYSTEMD_LIBS"; then
+ pkg_cv_SYSTEMD_LIBS="$SYSTEMD_LIBS"
+ elif test -n "$PKG_CONFIG"; then
+ if test -n "$PKG_CONFIG" && \
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd\""; } >&5
+- ($PKG_CONFIG --exists --print-errors "libsystemd") 2>&5
++ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libsystemd-login >= 186 libsystemd-daemon\""; } >&5
++ ($PKG_CONFIG --exists --print-errors "libsystemd-login >= 186 libsystemd-daemon") 2>&5
+ ac_status=$?
+ $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+ test $ac_status = 0; }; then
+- pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd" 2>/dev/null`
++ pkg_cv_SYSTEMD_LIBS=`$PKG_CONFIG --libs "libsystemd-login >= 186 libsystemd-daemon" 2>/dev/null`
+ test "x$?" != "x0" && pkg_failed=yes
+ else
+ pkg_failed=yes
+@@ -23259,50 +23208,49 @@ else
+ _pkg_short_errors_supported=no
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+- SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd" 2>&1`
++ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libsystemd-login >= 186 libsystemd-daemon" 2>&1`
+ else
+- SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd" 2>&1`
++ SYSTEMD_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libsystemd-login >= 186 libsystemd-daemon" 2>&1`
+ fi
+ # Put the nasty error message in config.log where it belongs
+ echo "$SYSTEMD_PKG_ERRORS" >&5
+
+- as_fn_error $? "Package requirements (libsystemd) were not met:
+-
+-$SYSTEMD_PKG_ERRORS
+-
+-Consider adjusting the PKG_CONFIG_PATH environment variable if you
+-installed software in a non-standard prefix.
+-
+-Alternatively, you may set the environment variables SYSTEMD_CFLAGS
+-and SYSTEMD_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details." "$LINENO" 5
++ have_systemd=no
+ elif test $pkg_failed = untried; then
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+ $as_echo "no" >&6; }
+- { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+-as_fn_error $? "The pkg-config script could not be found or is too old. Make sure it
+-is in your PATH or set the PKG_CONFIG environment variable to the full
+-path to pkg-config.
+-
+-Alternatively, you may set the environment variables SYSTEMD_CFLAGS
+-and SYSTEMD_LIBS to avoid the need to call pkg-config.
+-See the pkg-config man page for more details.
+-
+-To get pkg-config, see <http://pkg-config.freedesktop.org/>.
+-See \`config.log' for more details" "$LINENO" 5; }
++ have_systemd=no
+ else
+ SYSTEMD_CFLAGS=$pkg_cv_SYSTEMD_CFLAGS
+ SYSTEMD_LIBS=$pkg_cv_SYSTEMD_LIBS
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+ $as_echo "yes" >&6; }
++ have_systemd=yes
++fi
+
++if test "x$with_systemd" = "xauto" ; then
++ if test x$have_systemd = xno ; then
++ use_systemd=no
++ else
++ use_systemd=yes
++ fi
++else
++ use_systemd="$with_systemd"
+ fi
+
++if test "x$use_systemd" != "xno" ; then
++ if test "x$have_systemd" = "xno"; then
++ as_fn_error $? "Systemd support explicitly required, but systemd not found" "$LINENO" 5
++ fi
+
+
++$as_echo "#define WITH_SYSTEMD 1" >>confdefs.h
+
++fi
+
++
++
++
+ pkg_failed=no
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JOURNALD" >&5
+ $as_echo_n "checking for JOURNALD... " >&6; }
+@@ -23727,6 +23675,18 @@ GDM_OLD_CONF='${gdmconfdir}/gdm.conf'
+
+
+
++# Check whether --with-consolekit-directory was given.
++if test "${with_consolekit_directory+set}" = set; then :
++ withval=$with_consolekit_directory;
++else
++ with_consolekit_directory="\${libexecdir}"
++fi
++
++
++CONSOLEKIT_DIR=$with_consolekit_directory
++
++
++
+ # Check whether --with-gnome-settings-daemon-directory was given.
+ if test "${with_gnome_settings_daemon_directory+set}" = set; then :
+ withval=$with_gnome_settings_daemon_directory;
+@@ -24829,6 +24789,10 @@ if test -z "${SUPPORTS_PAM_EXTENSIONS_TRUE}" && test -
+ as_fn_error $? "conditional \"SUPPORTS_PAM_EXTENSIONS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${SUPPORTS_PAM_EXTENSIONS_TRUE}" && test -z "${SUPPORTS_PAM_EXTENSIONS_FALSE}"; then
++ as_fn_error $? "conditional \"SUPPORTS_PAM_EXTENSIONS\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${XDMCP_SUPPORT_TRUE}" && test -z "${XDMCP_SUPPORT_FALSE}"; then
+ as_fn_error $? "conditional \"XDMCP_SUPPORT\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -24841,6 +24805,10 @@ if test -z "${OS_SOLARIS_TRUE}" && test -z "${OS_SOLAR
+ as_fn_error $? "conditional \"OS_SOLARIS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+ fi
++if test -z "${WITH_CONSOLE_KIT_TRUE}" && test -z "${WITH_CONSOLE_KIT_FALSE}"; then
++ as_fn_error $? "conditional \"WITH_CONSOLE_KIT\" was never defined.
++Usually this means the macro was only invoked conditionally." "$LINENO" 5
++fi
+ if test -z "${INSTALL_SYSTEMD_UNITS_TRUE}" && test -z "${INSTALL_SYSTEMD_UNITS_FALSE}"; then
+ as_fn_error $? "conditional \"INSTALL_SYSTEMD_UNITS\" was never defined.
+ Usually this means the macro was only invoked conditionally." "$LINENO" 5
+@@ -27325,6 +27293,7 @@ echo "
+ dmconfdir: ${dmconfdir}
+ localstatedir: ${localstatedir}
+ datadir: ${datadir}
++ consolekit location: ${with_consolekit_directory}
+ gnome-settings-daemon location: ${with_gnome_settings_daemon_directory}
+ gnome-session-check-accel location: ${with_check_accelerated_directory}
+ source code location: ${srcdir}
+@@ -27354,6 +27323,8 @@ echo \
+ " Xinerama support: ${XINERAMA_SUPPORT}
+ XDMCP support: ${XDMCP_SUPPORT}
+ SELinux support: ${use_selinux}
++ ConsoleKit support: ${use_console_kit}
++ systemd support: ${use_systemd}
+ systemd unit dir: ${with_systemdsystemunitdir}
+ plymouth support: ${use_plymouth}
+ wayland support: ${enable_wayland_support}
+@@ -27362,3 +27333,4 @@ echo \
+ Enable documentation: ${enable_documentation}
+ Install GDM's Xsession: ${enable_gdm_xsession}
+ "
++