X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=configure.in;h=748879558d5ea3a0967201433bad0ee939cfc7e5;hp=457af807905c463e89ee362fb467f2a3796b669e;hb=019de959b265701cd0c3fccbb61f2b69f06bf9ee;hpb=50be9bb40dc60130c99ffa568e6677779904ff70 diff --git a/configure.in b/configure.in index 457af807..74887955 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 @@ -186,6 +190,11 @@ AH_TEMPLATE([HAVE_GLE], AH_TEMPLATE([HAVE_GLE3],[Define this if you have the -lgle from GLE version 3]) +AH_TEMPLATE([HAVE_JWZGLES],[Define this to target the OpenGL ES 1.x API + instead of OpenGL 1.3.]) + +AH_TEMPLATE([HAVE_GLBITMAP],[Define this if glBitmap exists.]) + AH_TEMPLATE([HAVE_XSHM_EXTENSION], [Define this if you have the X Shared Memory Extension.]) @@ -241,6 +250,11 @@ AH_TEMPLATE([HAVE_PAM_FAIL_DELAY], [Define this if you have pam_fail_delay function. see driver/passwd-pam.c.]) +AH_TEMPLATE([PAM_CHECK_ACCOUNT_TYPE], + [Whether PAM should check the result of account modules + when authenticating. Only do this if you have account + configured properly on your system.]) + AH_TEMPLATE([PAM_STRERROR_TWO_ARGS], [Define if you have PAM and pam_strerror() requires two arguments.]) @@ -285,6 +299,9 @@ AH_TEMPLATE([HAVE_ICMPHDR], [Define this if you do pings with a `struct icmphdr' and an `un.echo.id' slot.]) +AH_TEMPLATE([HAVE_GETIFADDRS], + [Define this if you have the getifaddrs() function.]) + AH_TEMPLATE([HAVE_FORKPTY], [Define this if you have the 'forkpty' function: This allows 'phosphor' and 'apple2' to run curses-based @@ -321,7 +338,7 @@ done ############################################################################### AC_DEFUN(AC_PROG_CC_ANSI, - [AC_PROG_CC + [AC_REQUIRE([AC_PROG_CC]) if test -z "$GCC"; then # not using GCC @@ -959,6 +976,21 @@ AC_DEFUN(AC_X_RANDOM_PATHS, ;; esac]) +AC_DEFUN(AC_CHECK_GETIFADDRS, + [AC_CACHE_CHECK([for getifaddrs], ac_cv_have_getifaddrs, + [AC_TRY_COMPILE([#include + #include + #include + #include ], + [struct ifaddrs *ifa; + getifaddrs (&ifa); + ifa->ifa_next = 0; + ifa->ifa_addr->sa_family = 0;], + [ac_cv_have_getifaddrs=yes], + [ac_cv_have_getifaddrs=no])]) + if test "$ac_cv_have_getifaddrs" = yes ; then + AC_DEFINE(HAVE_GETIFADDRS) + fi]) ############################################################################### @@ -1152,11 +1184,13 @@ AC_HEADER_TIME AC_HEADER_SYS_WAIT AC_HEADER_DIRENT AC_GETTIMEOFDAY_ARGS +AC_SYS_LARGEFILE AC_CHECK_FUNCS(select fcntl uname nice setpriority getcwd getwd putenv sbrk) AC_CHECK_FUNCS(sigaction syslog realpath setrlimit) AC_CHECK_FUNCS(setlocale) AC_CHECK_ICMP AC_CHECK_ICMPHDR +AC_CHECK_GETIFADDRS AC_CHECK_HEADERS(crypt.h sys/select.h) AC_PROG_PERL @@ -1316,7 +1350,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 +1391,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 +1430,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 +1455,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 +1592,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,11 +1950,25 @@ 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"]) +AC_ARG_ENABLE(pam-check-account-type, + [AC_HELP_STRING([--enable-pam-check-account-type], + [Whether PAM should check the result of account + modules when authenticating. Only do this if you + have account configured properly on your system.])], + [enable_pam_check_account_type="$enableval"],[enable_pam_check_account_type=no]) +if test "$enable_pam_check_account_type" = yes ; then + AC_DEFINE(PAM_CHECK_ACCOUNT_TYPE) + true +elif test "$enable_pam_check_account_type" != no ; then + echo "error: must be yes or no: --enable-pam-check-account-type=$enable_pam_check_account_type" + exit 1 +fi + HANDLE_X_PATH_ARG(with_pam, --with-pam, PAM) if test "$enable_locking" = yes -a "$with_pam" = yes; then @@ -2587,7 +2635,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) @@ -2825,6 +2873,15 @@ if test "$with_gl" = yes; then AC_MSG_RESULT(adding "$osx_crud" to GL_LIBS) GL_LIBS="$GL_LIBS $osx_crud" unset osx_crud + + # New lossage in 10.6.8: we can't allow -L/opt/local/lib to be in the + # link line, or at runtime XQueryExtension gets a segv due to some kind + # of library version skew. Libs must come from /usr/X11/lib even if + # $prefix and/or $exec_prefix are set to /opt/local/. + # + AC_MSG_RESULT(omitting "$libdir" from LDFLAGS) + libdir='' + fi @@ -3054,6 +3111,41 @@ elif test "$with_gle" != no; then fi +############################################################################### +# +# Handle --with-gles +# +############################################################################### + +with_gles_req=unspecified +AC_ARG_WITH(gles, +[ --with-gles Target OpenGL ES 1.x API instead of OpenGL 1.3.], + [with_gles="$withval"; with_gles_req="$withval"],[with_gles=no]) + +HANDLE_X_PATH_ARG(with_gles, --with-gles, JWZGLES) + +if test "$with_gles" = yes; then + have_gles=yes + AC_DEFINE(HAVE_JWZGLES) + JWZGLES_OBJS="jwzgles.o" + AC_MSG_RESULT(using OpenGL ES compatiblity shim) +elif test "$with_gles" != no; then + echo "error: must be yes or no: --with-gles=$with_xpm" + exit 1 +fi + +# May want to phase out glBitmap even in a non-GLES world. +# +if test "$have_gles" = yes; then + GLFPS_OBJS="fps-gl.o glxfonts.o texfont.o" + GLFONT_OBJS="" +else + AC_DEFINE(HAVE_GLBITMAP) + GLFPS_OBJS="fps-gl.o glxfonts.o" + GLFONT_OBJS="texfont.o" +fi + + ############################################################################### # # Check for -lgdk_pixbuf. @@ -3408,8 +3500,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 @@ -3502,10 +3594,13 @@ case "$with_textfile" in "/usr/share/doc/xserver-common/copyright" \ "/usr/share/doc/xserver-xorg-core/copyright" \ "/usr/X11R6/README" \ + "/usr/share/doc/libX11*/COPYING" \ + "/usr/X11/share/X11/doc/README*" \ "/usr/share/doc/debian/debian-manifesto" \ ; do if test -z "$with_textfile"; then AC_MSG_CHECKING([for text file $f]) + f=`/bin/ls $f 2>&- | head -1` if test -f "$f" ; then AC_MSG_RESULT(yes) with_textfile="$f" @@ -3540,7 +3635,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 @@ -3636,6 +3731,11 @@ if test "$have_pam" = yes; then PASSWD_OBJS="$PASSWD_OBJS \$(PAM_OBJS)" INSTALL_PAM="install-pam" fi +if test "$enable_pam_check_account_type" = yes; then + COMMENT_PAM_CHECK_ACCOUNT="" +else + COMMENT_PAM_CHECK_ACCOUNT="#" +fi if test "$have_passwd_helper" = yes; then PASSWD_SRCS="$PASSWD_SRCS \$(PWHELPER_SRCS)" PASSWD_OBJS="$PASSWD_OBJS \$(PWHELPER_OBJS)" @@ -3784,6 +3884,7 @@ AC_SUBST(INSTALL_DIRS) AC_SUBST(NEED_SETUID) AC_SUBST(INSTALL_PAM) AC_SUBST(HAVE_PAM_FAIL_DELAY) +AC_SUBST(COMMENT_PAM_CHECK_ACCOUNT) AC_SUBST(NEW_LOGIN_COMMAND) AC_SUBST(NEW_LOGIN_COMMAND_P) AC_SUBST(DEFAULT_IMAGES_P) @@ -3815,6 +3916,9 @@ AC_SUBST(GL_MEN) AC_SUBST(GL_KLUDGE) AC_SUBST(GLE_EXES) AC_SUBST(GLE_KLUDGE) +AC_SUBST(JWZGLES_OBJS) +AC_SUBST(GLFPS_OBJS) +AC_SUBST(GLFONT_OBJS) AC_SUBST(GNOME24) AC_SUBST(GNOME22) AC_SUBST(NOGNOME) @@ -3836,6 +3940,7 @@ AC_SUBST(PERL) AC_OUTPUT(Makefile utils/Makefile driver/Makefile + driver/xscreensaver.pam hacks/Makefile hacks/glx/Makefile po/Makefile.in