"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "configure.ac" between
xscreensaver-6.00.tar.gz and xscreensaver-6.01.tar.gz

About: XScreenSaver is a large collection of screen savers and also the framework for blanking and locking the screen.

configure.ac  (xscreensaver-6.00):configure.ac  (xscreensaver-6.01)
skipping to change at line 129 skipping to change at line 129
#AH_TEMPLATE([HAVE_XCOMPOSITE_EXTENSION], #AH_TEMPLATE([HAVE_XCOMPOSITE_EXTENSION],
# [Define this if you have the X Composite Extension.]) # [Define this if you have the X Composite Extension.])
AH_TEMPLATE([HAVE_XKB], AH_TEMPLATE([HAVE_XKB],
[Define this if you have the X Keyboard Extension.]) [Define this if you have the X Keyboard Extension.])
AH_TEMPLATE([HAVE_LIBSYSTEMD], AH_TEMPLATE([HAVE_LIBSYSTEMD],
[Define this if you have libsystemd.]) [Define this if you have libsystemd.])
AH_TEMPLATE([HAVE_LIBELOGIND],
[Define this if you have libelogind.])
AH_TEMPLATE([HAVE_PROC_INTERRUPTS], AH_TEMPLATE([HAVE_PROC_INTERRUPTS],
[Define this if you have a Linux-like /proc/interrupts file which [Define this if you have a Linux-like /proc/interrupts file which
can be examined to determine when keyboard activity has can be examined to determine when keyboard activity has
occurred, and you use PS/2 input devices instead of USB.]) occurred, and you use PS/2 input devices instead of USB.])
AH_TEMPLATE([HAVE_PROC_OOM], AH_TEMPLATE([HAVE_PROC_OOM],
[Define this if you have a Linux-like /proc/.../oom_score_adj file [Define this if you have a Linux-like /proc/.../oom_score_adj file
which can be adjusted by root to exempt us from the out-of-memory which can be adjusted by root to exempt us from the out-of-memory
killer.]) killer.])
skipping to change at line 2095 skipping to change at line 2098
EXES_SYSTEMD='$(EXES_SYSTEMD)' EXES_SYSTEMD='$(EXES_SYSTEMD)'
SYSTEMD_LIBS="$ac_systemd_config_libs" SYSTEMD_LIBS="$ac_systemd_config_libs"
AC_DEFINE(HAVE_LIBSYSTEMD) AC_DEFINE(HAVE_LIBSYSTEMD)
else else
EXES_SYSTEMD='' EXES_SYSTEMD=''
SYSTEMD_LIBS='' SYSTEMD_LIBS=''
fi fi
############################################################################### ###############################################################################
# #
# Check for -lelogind, a stripped down subset of systemd.
#
###############################################################################
have_elogind=no
with_elogind_req=unspecified
elogind_halfassed=no
elogind_too_old=no
AC_ARG_WITH(elogind,
[ --with-elogind Use elogind instead of systemd.],
[with_elogind="$withval"; with_elogind_req="$withval"],
[with_elogind=yes])
HANDLE_X_PATH_ARG(with_elogind, --with-elogind, elogind)
if test "$with_elogind" != yes -a "$with_elogind" != no ; then
echo "error: must be yes or no: --with-elogind=$with_elogind"
exit 1
fi
if test "$with_elogind" = yes; then
pkgs=''
ok="yes"
pkg_check_version libelogind 221
have_elogind="$ok"
if test "$have_elogind" = no; then
if $pkg_config --exists libelogind ; then
elogind_too_old=yes
fi
fi
if test "$have_elogind" = yes; then
AC_CACHE_CHECK([for libelogind includes], ac_cv_elogind_config_cflags,
[ac_cv_elogind_config_cflags=`$pkg_config --cflags $pkgs`])
AC_CACHE_CHECK([for libelogind libs], ac_cv_elogind_config_libs,
[ac_cv_elogind_config_libs=`$pkg_config --libs $pkgs`])
fi
ac_elogind_config_cflags=$ac_cv_elogind_config_cflags
ac_elogind_config_libs=$ac_cv_elogind_config_libs
if test "$have_elogind" = yes; then
#
# we appear to have libelogind; check for headers/libs to be sure.
#
ac_save_elogind_CPPFLAGS="$CPPFLAGS"
CPPFLAGS="$CPPFLAGS $ac_elogind_config_cflags"
have_elogind=no
AC_CHECK_X_HEADER(elogind/sd-bus.h, [have_elogind=yes])
CPPFLAGS="$ac_save_elogind_CPPFLAGS"
fi
if test "$have_elogind" = yes; then
# we have the headers, now check for the libraries
have_elogind=no
elogind_halfassed=yes
AC_MSG_RESULT(checking for libelogind usability...)
AC_CHECK_X_LIB(c, sd_bus_open_system,
[have_elogind=yes; elogind_halfassed=no],,
$ac_elogind_config_libs -lX11 -lXext -lm)
fi
if test "$have_elogind" = no; then
AC_MSG_RESULT(checking for libelogind usability... no)
fi
fi
if test "$have_elogind" = yes; then
INCLUDES="$INCLUDES $ac_elogind_config_cflags"
EXES_SYSTEMD='$(EXES_SYSTEMD)'
SYSTEMD_LIBS="$ac_elogind_config_libs"
AC_DEFINE(HAVE_LIBELOGIND)
fi
###############################################################################
#
# The --enable-locking option # The --enable-locking option
# #
# Note: "configure --help" list all "--enable" options before any # Note: "configure --help" list all "--enable" options before any
# "--with" options, so we document the --enable options inline with # "--with" options, so we document the --enable options inline with
# the --with options where it looks better, instead of in AC_ARG_ENABLE # the --with options where it looks better, instead of in AC_ARG_ENABLE
# where it would make sense, sigh... # where it would make sense, sigh...
# #
############################################################################### ###############################################################################
AC_ARG_ENABLE(locking, AC_ARG_ENABLE(locking,
skipping to change at line 4661 skipping to change at line 4744
fi fi
if test \! -z "$rpm_vers" ; then if test \! -z "$rpm_vers" ; then
# M4 sucks!! # M4 sucks!!
changequote(A,B) changequote(A,B)
pkg_bindir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-settings$@\1@p '` pkg_bindir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-settings$@\1@p '`
pkg_bindir2=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'` pkg_bindir2=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@p'`
pkg_hackdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares$@\1@p'` pkg_hackdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares$@\1@p'`
pkg_confdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'` pkg_confdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p'`
pkg_fontdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)\.ttf$@\1@p'` pkg_fontdir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\).*\.ttf$@\1@p' | head -1`
pkg_addir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)XScreenSaver$@\1@p'` pkg_addir=`rpm -ql $rpmnames | sed -n 's@^\(.*/\)XScreenSaver$@\1@p'`
if test -z "$pkg_bindir" ; then pkg_bindir="$pkg_bindir2" ; fi if test -z "$pkg_bindir" ; then pkg_bindir="$pkg_bindir2" ; fi
changequote([,]) changequote([,])
fi fi
# Warn if there's a previous Debian package installed. # Warn if there's a previous Debian package installed.
# #
deb_vers= deb_vers=
if test -z "$pkg_vers" ; then if test -z "$pkg_vers" ; then
skipping to change at line 4690 skipping to change at line 4773
fi fi
if test \! -z "$deb_vers" ; then if test \! -z "$deb_vers" ; then
# M4 sucks!! # M4 sucks!!
changequote(A,B) changequote(A,B)
pkg_bindir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)xscreensaver-settings$ @\1@p'` pkg_bindir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)xscreensaver-settings$ @\1@p'`
pkg_bindir2=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@ p'` pkg_bindir2=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)xscreensaver-demo$@\1@ p'`
pkg_hackdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares$@\1@p'` pkg_hackdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares$@\1@p'`
pkg_confdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p' ` pkg_confdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)popsquares\.xml$@\1@p' `
pkg_fontdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)\.ttf$@\1@p'` pkg_fontdir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\).*\.ttf$@\1@p' | head -1`
pkg_addir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)XScreenSaver[^/]*$@\1@ p'` pkg_addir=`dpkg -L $debnames 2>&- | sed -n 's@^\(.*/\)XScreenSaver[^/]*$@\1@ p'`
changequote([,]) changequote([,])
if test -z "$pkg_bindir" ; then pkg_bindir="$pkg_bindir2" ; fi if test -z "$pkg_bindir" ; then pkg_bindir="$pkg_bindir2" ; fi
fi fi
bindir_err= bindir_err=
hackdir_err= hackdir_err=
confdir_err= confdir_err=
fontdir_err= fontdir_err=
 End of changes. 4 change blocks. 
2 lines changed or deleted 85 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)