X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=configure.in;h=0beeff1aabbc8c3cd1fac5c7b13ac781a875ddb4;hp=457af807905c463e89ee362fb467f2a3796b669e;hb=5f9c47ca98dd43d8f59b7c27d3fde6edfde4fe21;hpb=50be9bb40dc60130c99ffa568e6677779904ff70 diff --git a/configure.in b/configure.in index 457af807..0beeff1a 100644 --- a/configure.in +++ b/configure.in @@ -37,28 +37,32 @@ AH_TEMPLATE([HAVE_XHPDISABLERESET], thing which allows the Ctrl-Sh-Reset key sequence to be temporarily disabled.)]) -AH_TEMPLATE([HAVE_XIDLE_EXTENSION], - [Define this if you have the XIDLE extension installed. If you - have the XIDLE extension, this is recommended. (You have this - extension if the file /usr/include/X11/extensions/xidle.h - exists.) Turning on this flag lets XScreenSaver work better with - servers which support this extension; but it will still work - with servers which do not suport it, so it's a good idea to - compile in support for it if you can.]) - -AH_TEMPLATE([HAVE_MIT_SAVER_EXTENSION], - [Define this if you have the MIT-SCREEN-SAVER extension - installed. See the caveats about this extension, above. - (It's available if /usr/include/X11/extensions/scrnsaver.h - exists.)]) - -AH_TEMPLATE([HAVE_SGI_SAVER_EXTENSION], - [Define this if you have the SGI SCREEN_SAVER extension. This is - standard on Irix systems, and not available elsewhere.]) - -AH_TEMPLATE([HAVE_SGI_VC_EXTENSION], - [Define this if you have the SGI-VIDEO-CONTROL extension. This - is standard on Irix systems, and not available elsewhere.]) +# This only ever existed in X11R4 and X11R5. +#AH_TEMPLATE([HAVE_XIDLE_EXTENSION], +# [Define this if you have the XIDLE extension installed. If you +# have the XIDLE extension, this is recommended. (You have this +# extension if the file /usr/include/X11/extensions/xidle.h +# exists.) Turning on this flag lets XScreenSaver work better with +# servers which support this extension; but it will still work +# with servers which do not suport it, so it's a good idea to +# compile in support for it if you can.]) + +# Using this extension will crash your X server and make fading not work. +#AH_TEMPLATE([HAVE_MIT_SAVER_EXTENSION], +# [Define this if you have the MIT-SCREEN-SAVER extension +# installed. See the caveats about this extension, above. +# (It's available if /usr/include/X11/extensions/scrnsaver.h +# exists.)]) + +# This only ever existed on SGI hardware. +#AH_TEMPLATE([HAVE_SGI_SAVER_EXTENSION], +# [Define this if you have the SGI SCREEN_SAVER extension. This is +# standard on Irix systems, and not available elsewhere.]) + +# This only ever existed on SGI hardware. +#AH_TEMPLATE([HAVE_SGI_VC_EXTENSION], +# [Define this if you have the SGI-VIDEO-CONTROL extension. This +# is standard on Irix systems, and not available elsewhere.]) AH_TEMPLATE([HAVE_DPMS_EXTENSION], [Define this if you have the XDPMS extension. This is standard @@ -1316,7 +1320,7 @@ fi ############################################################################### # # Handle the --with-configdir option -# Help for --with-x-app-defaults option added.. +# Help for --with-x-app-defaults option added. # ############################################################################### @@ -1357,37 +1361,37 @@ fi # ############################################################################### -have_sgi=no -with_sgi_req=unspecified -AC_ARG_WITH(sgi-ext, -[Except where noted, all of the --with options below can also take a -directory argument: for example, `--with-motif=/opt/Motif'. That would -cause /opt/Motif/include/ to be added to the -I list, and /opt/Motif/lib/ -to be added to the -L list, assuming those directories exist. - -By default, support for each of these options will be built in, if the -relevant library routines exist. At run time, they will then be used -only if the X server being used supports them. Each --with option has -a corresponding --without option, to override building support for them -at all. - -Screen blanking and idle-detection options: - - --with-sgi-ext Include support for the SGI SCREEN_SAVER extension.], - [with_sgi="$withval"; with_sgi_req="$withval"],[with_sgi=yes]) - -HANDLE_X_PATH_ARG(with_sgi, --with-sgi-ext, SGI SCREEN_SAVER) - -if test "$with_sgi" = yes; then - AC_CHECK_X_HEADER(X11/extensions/XScreenSaver.h, - [have_sgi=yes - AC_DEFINE(HAVE_SGI_SAVER_EXTENSION)],, - [#include ]) - -elif test "$with_sgi" != no; then - echo "error: must be yes or no: --with-sgi-ext=$with_sgi" - exit 1 -fi +#have_sgi=no +#with_sgi_req=unspecified +#AC_ARG_WITH(sgi-ext, +#[Except where noted, all of the --with options below can also take a +#directory argument: for example, `--with-motif=/opt/Motif'. That would +#cause /opt/Motif/include/ to be added to the -I list, and /opt/Motif/lib/ +#to be added to the -L list, assuming those directories exist. +# +#By default, support for each of these options will be built in, if the +#relevant library routines exist. At run time, they will then be used +#only if the X server being used supports them. Each --with option has +#a corresponding --without option, to override building support for them +#at all. +# +#Screen blanking and idle-detection options: +# +# --with-sgi-ext Include support for the SGI SCREEN_SAVER extension.], +# [with_sgi="$withval"; with_sgi_req="$withval"],[with_sgi=yes]) +# +#HANDLE_X_PATH_ARG(with_sgi, --with-sgi-ext, SGI SCREEN_SAVER) +# +#if test "$with_sgi" = yes; then +# AC_CHECK_X_HEADER(X11/extensions/XScreenSaver.h, +# [have_sgi=yes +# AC_DEFINE(HAVE_SGI_SAVER_EXTENSION)],, +# [#include ]) +# +#elif test "$with_sgi" != no; then +# echo "error: must be yes or no: --with-sgi-ext=$with_sgi" +# exit 1 +#fi ############################################################################### @@ -1396,23 +1400,23 @@ fi # ############################################################################### -have_xidle=no -with_xidle_req=unspecified -AC_ARG_WITH(xidle-ext, -[ --with-xidle-ext Include support for the XIDLE extension.], - [with_xidle="$withval"; with_xidle_req="$withval"],[with_xidle=yes]) - -HANDLE_X_PATH_ARG(with_xidle, --with-xidle-ext, XIDLE) - -if test "$with_xidle" = yes; then - AC_CHECK_X_HEADER(X11/extensions/xidle.h, - [have_xidle=yes - AC_DEFINE(HAVE_XIDLE_EXTENSION)],, - [#include ]) -elif test "$with_xidle" != no; then - echo "error: must be yes or no: --with-xidle-ext=$with_xidle" - exit 1 -fi +#have_xidle=no +#with_xidle_req=unspecified +#AC_ARG_WITH(xidle-ext, +#[ --with-xidle-ext Include support for the XIDLE extension.], +# [with_xidle="$withval"; with_xidle_req="$withval"],[with_xidle=yes]) +# +#HANDLE_X_PATH_ARG(with_xidle, --with-xidle-ext, XIDLE) +# +#if test "$with_xidle" = yes; then +# AC_CHECK_X_HEADER(X11/extensions/xidle.h, +# [have_xidle=yes +# AC_DEFINE(HAVE_XIDLE_EXTENSION)],, +# [#include ]) +#elif test "$with_xidle" != no; then +# echo "error: must be yes or no: --with-xidle-ext=$with_xidle" +# exit 1 +#fi ############################################################################### @@ -1421,37 +1425,37 @@ fi # ############################################################################### -have_sgivc=no -with_sgivc_req=unspecified -AC_ARG_WITH(sgivc-ext, -[ --with-sgivc-ext Include support for the SGI-VIDEO-CONTROL extension.], - [with_sgivc="$withval"; with_sgivc_req="$withval"],[with_sgivc=yes]) - -HANDLE_X_PATH_ARG(with_sgivc, --with-sgivc-ext, SGI-VIDEO-CONTROL) - -if test "$with_sgivc" = yes; then - - # first check for XSGIvc.h - AC_CHECK_X_HEADER(X11/extensions/XSGIvc.h, [have_sgivc=yes],, - [#include ]) - - # if that succeeded, then check for the -lXsgivc - if test "$have_sgivc" = yes; then - have_sgivc=no - AC_CHECK_X_LIB(Xsgivc, XSGIvcQueryGammaMap, - [have_sgivc=yes; SAVER_LIBS="$SAVER_LIBS -lXsgivc"], [true], - -lXext -lX11) - fi - - # if that succeeded, then we've really got it. - if test "$have_sgivc" = yes; then - AC_DEFINE(HAVE_SGI_VC_EXTENSION) - fi - -elif test "$with_sgivc" != no; then - echo "error: must be yes or no: --with-sgivc-ext=$with_sgivc" - exit 1 -fi +#have_sgivc=no +#with_sgivc_req=unspecified +#AC_ARG_WITH(sgivc-ext, +#[ --with-sgivc-ext Include support for the SGI-VIDEO-CONTROL extension.], +# [with_sgivc="$withval"; with_sgivc_req="$withval"],[with_sgivc=yes]) +# +#HANDLE_X_PATH_ARG(with_sgivc, --with-sgivc-ext, SGI-VIDEO-CONTROL) +# +#if test "$with_sgivc" = yes; then +# +# # first check for XSGIvc.h +# AC_CHECK_X_HEADER(X11/extensions/XSGIvc.h, [have_sgivc=yes],, +# [#include ]) +# +# # if that succeeded, then check for the -lXsgivc +# if test "$have_sgivc" = yes; then +# have_sgivc=no +# AC_CHECK_X_LIB(Xsgivc, XSGIvcQueryGammaMap, +# [have_sgivc=yes; SAVER_LIBS="$SAVER_LIBS -lXsgivc"], [true], +# -lXext -lX11) +# fi +# +# # if that succeeded, then we've really got it. +# if test "$have_sgivc" = yes; then +# AC_DEFINE(HAVE_SGI_VC_EXTENSION) +# fi +# +#elif test "$with_sgivc" != no; then +# echo "error: must be yes or no: --with-sgivc-ext=$with_sgivc" +# exit 1 +#fi ############################################################################### @@ -1558,7 +1562,7 @@ fi have_xinput=no with_xinput_req=unspecified AC_ARG_WITH(xinput-ext, -[ --with-xinput-ext Include support for the XInput extension.], +[ --with-xinput-ext Include support for the XInput extension.], [with_xinput="$withval"; with_xinput_req="$withval"], [with_xinput=yes]) HANDLE_X_PATH_ARG(with_xinput, --with-xinput-ext, XINPUT) @@ -1916,8 +1920,8 @@ AC_ARG_WITH(pam, [with_pam="$withval"; with_pam_req="$withval"],[with_pam=$with_pam_default]) AC_ARG_WITH([pam_service_name], - AC_HELP_STRING([--with-pam-service-name=NAME], - [NAME is the name of the PAM service that + AC_HELP_STRING([--with-pam-service-name], + [NAME arg is the name of the PAM service that xscreensaver will authenticate as.]), [pam_service_name="$withval"],[pam_service_name="xscreensaver"]) @@ -2587,7 +2591,7 @@ fi have_motif=no with_motif_req=unspecified AC_ARG_WITH(motif,[ --with-motif Use the Motif toolkit for the user interface - (not recommended.)], + (no longer supported.)], [with_motif="$withval"; with_motif_req="$withval"],[with_motif=no]) HANDLE_X_PATH_ARG(with_motif, --with-motif, Motif) @@ -3408,8 +3412,8 @@ have_imagedir=no with_imagedir_req=unspecified AC_ARG_WITH(image-directory, -[ --with-image-directory=DIR By default, some demos may display random images - from this directory.], +[ --with-image-directory Arg is the default directory from which some demos + will choose random images to display.], [with_imagedir="$withval"; with_imagedir_req="$withval"], [with_imagedir=yes]) # no HANDLE_X_PATH_ARG for this one @@ -3540,7 +3544,7 @@ have_browser=no with_browser_req=unspecified AC_ARG_WITH(browser, -[ --with-browser=BROWSER Specify the browser to show help URL.], +[ --with-browser=BROWSER Specify the web browser used to show the help URL.], [with_browser="$withval"; with_browser_req="$withval"], [with_browser=no ]) # no HANDLE_X_PATH_ARG for this one