diff -crN ./xscreensaver/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/Makefile.in *** ./xscreensaver/Makefile.in Tue Sep 10 12:15:59 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/Makefile.in Tue Dec 10 17:18:49 2002 *************** *** 4,9 **** --- 4,10 ---- @SET_MAKE@ srcdir = @srcdir@ VPATH = @srcdir@ + CPPFLAGS = @CPPFLAGS@ SHELL = /bin/sh SUBDIRS = utils driver hacks hacks/glx po diff -crN ./xscreensaver/configure.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/configure.in *** ./xscreensaver/configure.in Wed Oct 23 13:24:25 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/configure.in Wed Jan 22 11:29:56 2003 *************** *** 1,3 **** --- 1,4 ---- + # configure.in --- xscreensaver, Copyright (c) 1997-2002 Jamie Zawinski. # *************** *** 41,48 **** CC="$CC -Ae" ;; *-aix* ) ! AC_MSG_RESULT(AIX: adding -qlanglvl=ansi -qhalt=e) ! CC="$CC -qlanglvl=ansi -qhalt=e" ;; *-dec-* ) --- 42,49 ---- CC="$CC -Ae" ;; *-aix* ) ! AC_MSG_RESULT(AIX: adding -qlanglvl=ansi) ! CC="$CC -qlanglvl=ansi" ;; *-dec-* ) *************** *** 65,71 **** if test -n "$GCC"; then AC_MSG_RESULT(Turning on gcc compiler warnings.) ! CC="$CC -Wall -Wstrict-prototypes -Wnested-externs" else case "$host" in *-irix5* |*-irix6.[0-3]* ) --- 66,72 ---- if test -n "$GCC"; then AC_MSG_RESULT(Turning on gcc compiler warnings.) ! CC="$CC -Wall -Wstrict-prototypes -Wnested-externs -Wno-format" else case "$host" in *-irix5* |*-irix6.[0-3]* ) *************** *** 213,222 **** --- 214,227 ---- ac_cv_gettimeofday_args=$ac_gettimeofday_args]) ac_gettimeofday_args=$ac_cv_gettimeofday_args if test "$ac_gettimeofday_args" = 1 ; then + AH_TEMPLATE([HAVE_GETTIMEOFDAY], [Define if you have the gettimeofday function.]) AC_DEFINE(HAVE_GETTIMEOFDAY) AC_MSG_RESULT(one argument) elif test "$ac_gettimeofday_args" = 2 ; then + AH_TEMPLATE([HAVE_GETTIMEOFDAY], [Define if you have the gettimeofday function.]) AC_DEFINE(HAVE_GETTIMEOFDAY) + AH_TEMPLATE([GETTIMEOFDAY_TWO_ARGS], + [Define if gettimeofday requires two arguments.]) AC_DEFINE(GETTIMEOFDAY_TWO_ARGS) AC_MSG_RESULT(two arguments) else *************** *** 237,243 **** changequote([,]) AC_DEFUN(AC_PROG_PERL, ! [AC_PATH_PROGS(PERL, [perl5 perl],,) if test -z "$PERL" ; then PERL_VERSION=0 else --- 242,252 ---- changequote([,]) AC_DEFUN(AC_PROG_PERL, ! [ ! if test "$PERL_PATH"; then ! PERL=$PERL_PATH ! fi ! AC_PATH_PROGS(PERL, [perl5 perl],,) if test -z "$PERL" ; then PERL_VERSION=0 else *************** *** 314,319 **** --- 323,330 ---- [ac_cv_have_icmp=yes], [ac_cv_have_icmp=no])]) if test "$ac_cv_have_icmp" = yes ; then + AH_TEMPLATE([HAVE_ICMP], + [Define this if you do pings with a `struct icmp' and a `icmp_id' slot.]) AC_DEFINE(HAVE_ICMP) fi]) *************** *** 352,358 **** [ac_cv_have_icmphdr=yes], [ac_cv_have_icmphdr=no])]) if test "$ac_cv_have_icmphdr" = yes ; then ! AC_DEFINE(HAVE_ICMPHDR) fi]) --- 363,371 ---- [ac_cv_have_icmphdr=yes], [ac_cv_have_icmphdr=no])]) if test "$ac_cv_have_icmphdr" = yes ; then ! AH_TEMPLATE([HAVE_ICMPHDR], ! [Define this if you do pings with a `struct icmphdr' and a `un.echo.id' slot.]) ! AC_DEFINE(HAVE_ICMPHDR) fi]) *************** *** 464,469 **** --- 477,483 ---- [ac_cv_xpointer=yes], [ac_cv_xpointer=no])]) if test "$ac_cv_xpointer" != yes; then + AH_TEMPLATE([XPointer],[char*]) AC_DEFINE(XPointer,[char*]) fi]) *************** *** 804,814 **** AC_PROG_INTLTOOL GETTEXT_PACKAGE=xscreensaver AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE, "$GETTEXT_PACKAGE") AC_SUBST(GETTEXT_PACKAGE) ! ALL_LINGUAS="ca da de es et fi fr hu it ja ko nl no pl pt pt_BR ru sk sv vi wa zh_CN zh_TW" AM_GLIB_GNU_GETTEXT --- 818,832 ---- AC_PROG_INTLTOOL GETTEXT_PACKAGE=xscreensaver + AH_TEMPLATE([GETTEXT_PACKAGE], [$GETTEXT_PACKAGE]) + AH_TEMPLATE(PACKAGE, [$GETTEXT_PACKAGE]) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE") AC_DEFINE_UNQUOTED(PACKAGE, "$GETTEXT_PACKAGE") AC_SUBST(GETTEXT_PACKAGE) ! # #### no sign of en_GB ! #ALL_LINGUAS="ca de en_GB et fr it ko pl sv da es fi hu ja no pt pt_BR ru wa" ! ALL_LINGUAS="ca de et fr it ko pl sv da es fi hu ja no pt pt_BR ru wa" AM_GLIB_GNU_GETTEXT *************** *** 831,836 **** --- 849,857 ---- XMU_SRCS='' XMU_OBJS='' XMU_LIBS='-lXmu' + AH_TEMPLATE([HAVE_XMU], + [Define this if you have the Xmu library. This is standard part of X, and + if your vendor doesn't ship it, you should report that as a bug.]) AC_DEFINE(HAVE_XMU) fi *************** *** 990,998 **** 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 --- 1011,1022 ---- HANDLE_X_PATH_ARG(with_sgi, --with-sgi-ext, SGI SCREEN_SAVER) if test "$with_sgi" = yes; then + 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.]) AC_CHECK_X_HEADER(X11/extensions/XScreenSaver.h, [have_sgi=yes ! AC_DEFINE(HAVE_SGI_SAVER_EXTENSION)],, [#include ]) elif test "$with_sgi" != no; then *************** *** 1044,1050 **** fi if test "$have_mit" = yes; then ! AC_DEFINE(HAVE_MIT_SAVER_EXTENSION) fi fi --- 1068,1078 ---- fi if test "$have_mit" = yes; then ! 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 the file ! /usr/include/X11/extensions/scrnsaver.h exists.)]) ! AC_DEFINE(HAVE_MIT_SAVER_EXTENSION) fi fi *************** *** 1070,1078 **** 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" --- 1098,1115 ---- HANDLE_X_PATH_ARG(with_xidle, --with-xidle-ext, XIDLE) if test "$with_xidle" = yes; then + 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.]) 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" *************** *** 1110,1115 **** --- 1147,1155 ---- # if that succeeded, then we've really got it. if test "$have_sgivc" = yes; then + 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.]) AC_DEFINE(HAVE_SGI_VC_EXTENSION) fi *************** *** 1157,1162 **** --- 1197,1206 ---- # if that succeeded, then we've really got it. if test "$have_dpms" = yes; then + AH_TEMPLATE([HAVE_DPMS_EXTENSION], + [Define this if you have the XDPMS extension. This is standard on + sufficiently-recent XFree86 systems, and possibly elsewhere. (It's + available if the file /usr/include/X11/extensions/dpms.h exists.)]) AC_DEFINE(HAVE_DPMS_EXTENSION) fi *************** *** 1204,1209 **** --- 1248,1257 ---- # if that succeeded, then we've really got it. if test "$have_xinerama" = yes; then + AH_TEMPLATE([HAVE_XINERAMA], + [Define this if you have the Xinerama extension. This is standard on + sufficiently-recent XFree86 systems, and possibly elsewhere. (It's + available if the file /usr/include/X11/extensions/Xinerama.h exists.)]) AC_DEFINE(HAVE_XINERAMA) fi *************** *** 1244,1249 **** --- 1292,1304 ---- # if that succeeded, then we've really got it. if test "$have_xf86vmode" = yes; then + AH_TEMPLATE([HAVE_XF86VMODE], + [Define this if you have the functions XF86VidModeGetModeLine() and + XF86VidModeGetViewPort(), in support of virtual desktops where the + X server's root window is bigger than the actual screen. This is + an XFree86 thing, and probably doesn't exist elsewhere. (It's + available if the file /usr/include/X11/extensions/xf86vmode.h + exists.)]) AC_DEFINE(HAVE_XF86VMODE) fi *************** *** 1297,1306 **** --- 1352,1372 ---- # if those tests succeeded, then we've really got the functions. if test "$have_xf86gamma" = yes; then + AH_TEMPLATE([HAVE_XF86VMODE_GAMMA], + [Define this if you have the functions XF86VidModeGetGamma() and + XF86VidModeSetGamma(), which allow clients to change the gamma + response of the monitor. This is an XFree86 4.0.x thing, and + probably doesn't exist elsewhere. (It's available if the file + /usr/include/X11/extensions/xf86vmode.h exists and has stuff about + gamma in it.)]) AC_DEFINE(HAVE_XF86VMODE_GAMMA) fi if test "$have_xf86gamma_ramp" = yes; then + AH_TEMPLATE([HAVE_XF86VMODE_GAMMA_RAMP], + [Define this if you have the functions XF86VidModeGetGammaRamp() and + XF86VidModeSetGammaRamp(), which provide finer-grained control than + XF86VidMode[GS]etGamma(). These appeared in XFree86 4.1.0.]) AC_DEFINE(HAVE_XF86VMODE_GAMMA_RAMP) fi *************** *** 1321,1328 **** # ############################################################################### AC_EGREP_X_HEADER(XHPDisableReset, X11/XHPlib.h, ! [AC_DEFINE(HAVE_XHPDISABLERESET) SAVER_LIBS="-lXhp11 $SAVER_LIBS"]) --- 1387,1397 ---- # ############################################################################### + AH_TEMPLATE([HAVE_XHPDISABLERESET], + [Define this if you have the XHPDisableReset function (an HP only thing.)]) + AC_EGREP_X_HEADER(XHPDisableReset, X11/XHPlib.h, ! [AC_DEFINE(HAVE_XHPDISABLERESET) SAVER_LIBS="-lXhp11 $SAVER_LIBS"]) *************** *** 1352,1357 **** --- 1421,1429 ---- have_proc_interrupts=$ac_cv_have_proc_interrupts if test "$have_proc_interrupts" = yes; then + AH_TEMPLATE([HAVE_PROC_INTERRUPTS], + [Define this if you have a Linux-like /proc/interrupts file which can be + examined to determine when keyboard activity has occurred.]) AC_DEFINE(HAVE_PROC_INTERRUPTS) fi *************** *** 1376,1381 **** --- 1448,1455 ---- if test "$enable_locking" = yes; then true elif test "$enable_locking" = no; then + AH_TEMPLATE([NO_LOCKING], + [Define this to remove the option of locking the screen at all.]) AC_DEFINE(NO_LOCKING) else echo "error: must be yes or no: --enable-locking=$enable_locking" *************** *** 1458,1463 **** --- 1532,1540 ---- [ac_cv_pam=no])]) if test "$ac_cv_pam" = yes ; then have_pam=yes + AH_TEMPLATE([HAVE_PAM], + [Define this if you want to use PAM (Pluggable Authentication Modules) + to lock/unlock the screen, instead of standard /etc/passwd authentication.]) AC_DEFINE(HAVE_PAM) PASSWD_LIBS="${PASSWD_LIBS} -lpam" *************** *** 1485,1490 **** --- 1562,1569 ---- if test "$ac_pam_strerror_args" = 1 ; then AC_MSG_RESULT(one argument) elif test "$ac_pam_strerror_args" = 2 ; then + AH_TEMPLATE([PAM_STRERROR_TWO_ARGS], + [Define if you have PAM and pam_strerror() requires two arguments.]) AC_DEFINE(PAM_STRERROR_TWO_ARGS) AC_MSG_RESULT(two arguments) else *************** *** 1522,1534 **** --- 1601,1634 ---- if test "$ac_cv_kerberos" = yes ; then have_kerberos=yes + AH_TEMPLATE([HAVE_KERBEROS], + [Define this if you want to use Kerberos authentication to lock/unlock the + screen instead of your local password. This currently uses Kerberos V4, + but a V5 server with V4 compatibility will work. WARNING: DO NOT USE AFS + string-to-key passwords with this option. This option currently *only* + works with standard Kerberos des_string_to_key. If your password is an + AFS password and not a kerberos password, it will not authenticate + properly. See the comments in driver/kpasswd.c for more information if you + need it.]) AC_DEFINE(HAVE_KERBEROS) fi if test "$ac_cv_kerberos5" = yes ; then have_kerberos=yes have_kerberos5=yes + AH_TEMPLATE([HAVE_KERBEROS], + [Define this if you want to use Kerberos authentication to lock/unlock the + screen instead of your local password. This currently uses Kerberos V4, + but a V5 server with V4 compatibility will work. WARNING: DO NOT USE AFS + string-to-key passwords with this option. This option currently *only* + works with standard Kerberos des_string_to_key. If your password is an + AFS password and not a kerberos password, it will not authenticate + properly. See the comments in driver/kpasswd.c for more information if you + need it.]) AC_DEFINE(HAVE_KERBEROS) + AH_TEMPLATE([HAVE_KERBEROS5], + [Define this if you have Kerberos 5, meaning we need to use the Kerberos 4 + compatibility layer.]) AC_DEFINE(HAVE_KERBEROS5) fi *************** *** 1756,1767 **** --- 1856,1888 ---- if test "$have_shadow_adjunct" = yes ; then + AH_TEMPLATE([HAVE_ADJUNCT_PASSWD], + [Define this if your system is Solaris with ``adjunct'' passwords (this is + the version where one gets at the passwords with getpwanam() instead of + getpwnam().) I haven't tested this one, let me know if it works.)]) AC_DEFINE(HAVE_ADJUNCT_PASSWD) + elif test "$have_shadow_enhanced" = yes ; then + AH_TEMPLATE([HAVE_ENHANCED_PASSWD], + [Define this if your system is Digital or SCO Unix with so-called ``Enhanced + Security'', that is, the passwords live in /tcb/files/auth// + instead of in /etc/passwd, and one reads them with getprpwnam() instead + of getpwnam().]) AC_DEFINE(HAVE_ENHANCED_PASSWD) + elif test "$have_shadow_hpux" = yes ; then + AH_TEMPLATE([HAVE_HPUX_PASSWD], + [Define this if you are running HPUX with so-called ``Secure Passwords'' + (if you have /usr/include/hpsecurity.h, you probably have this.) I + haven't tested this one, let me know if it works.]) AC_DEFINE(HAVE_HPUX_PASSWD) + elif test "$have_shadow" = yes ; then + AH_TEMPLATE([HAVE_SHADOW_PASSWD], + [Define this if your system is Digital or SCO Unix with so-called ``Enhanced + Security'', that is, the passwords live in /tcb/files/auth// + instead of in /etc/passwd, and one reads them with getprpwnam() instead + of getpwnam().]) AC_DEFINE(HAVE_SHADOW_PASSWD) fi *************** *** 1790,1798 **** if test "$with_motif" = yes; then have_motif=no AC_CHECK_X_HEADER(Xm/Xm.h, [have_motif=yes ! AC_DEFINE(HAVE_MOTIF) MOTIF_LIBS="$MOTIF_LIBS -lXm"],, [#include #include --- 1911,1920 ---- if test "$with_motif" = yes; then have_motif=no + AH_TEMPLATE([HAVE_MOTIF], [Define this if you have Motif.]) AC_CHECK_X_HEADER(Xm/Xm.h, [have_motif=yes ! AC_DEFINE(HAVE_MOTIF) MOTIF_LIBS="$MOTIF_LIBS -lXm"],, [#include #include *************** *** 1801,1806 **** --- 1923,1930 ---- if test "$have_motif" = yes; then + AH_TEMPLATE([HAVE_XMCOMBOBOX], + [Define this if you have the XmComboBox Motif widget (Motif 2.0.)])] AC_CHECK_X_HEADER(Xm/ComboBox.h, [AC_DEFINE(HAVE_XMCOMBOBOX)],, [#include #include *************** *** 1944,1954 **** if test "$have_gtk" = yes; then have_gtk2=yes AC_DEFINE(HAVE_GTK2) else if test -n "$ac_gtk_version_string" ; then gtk2_halfassed="$ac_gtk_version_string" - gtk2_halfassed_lib="$req" fi fi --- 2068,2078 ---- if test "$have_gtk" = yes; then have_gtk2=yes + AH_TEMPLATE([HAVE_GTK2], [Define this if you have Gtk 2.x.]) AC_DEFINE(HAVE_GTK2) else if test -n "$ac_gtk_version_string" ; then gtk2_halfassed="$ac_gtk_version_string" fi fi *************** *** 1975,1981 **** if test "$have_gnome" = no; then pkgs="$old_pkgs" else ! AC_DEFINE(HAVE_CRAPPLET) fi fi fi --- 2099,2109 ---- if test "$have_gnome" = no; then pkgs="$old_pkgs" else ! AH_TEMPLATE([HAVE_CRAPPLET], ! [Define this if you have Gnome and want to build support for the ! xscreensaver control panel in the Gnome Control Center (gnomecc). ! (This is needed only with Gtk 1.x.)]) ! AC_DEFINE(HAVE_CRAPPLET) fi fi fi *************** *** 2101,2112 **** if test "$have_gtk" = yes -a "$have_gtk2" = no; then # check for this function that was not in libcapplet 1.2. # (only needed in Gnome/Gtk 1.x, not Gnome/Gtk 2.x) AC_CHECK_X_LIB(capplet, capplet_widget_changes_are_immediate, ! [AC_DEFINE(HAVE_CRAPPLET_IMMEDIATE)], [true], ! $ac_gnome_config_libs) fi GNOME_DATADIR="" if test "$have_gtk" = yes; then if test -n "$pkg_config"; then --- 2229,2250 ---- if test "$have_gtk" = yes -a "$have_gtk2" = no; then # check for this function that was not in libcapplet 1.2. # (only needed in Gnome/Gtk 1.x, not Gnome/Gtk 2.x) + AH_TEMPLATE([HAVE_CRAPPLET_IMMEDIATE], + [Define this if HAVE_CRAPPLET is defined, and the function + capplet_widget_changes_are_immediate() is available.]) AC_CHECK_X_LIB(capplet, capplet_widget_changes_are_immediate, ! [AC_DEFINE(HAVE_CRAPPLET_IMMEDIATE)], [true], ! $ac_gnome_config_libs) ! fi + if test -n "$pkg_config"; then + if $pkg_config gnome-desktop-2.0 ; then + have_gnome=yes + fi + fi + GNOME_DATADIR="" if test "$have_gtk" = yes; then if test -n "$pkg_config"; then *************** *** 2132,2137 **** --- 2270,2276 ---- if test "$have_gtk" = yes; then INCLUDES="$INCLUDES $ac_gtk_config_cflags" GTK_LIBS="$GTK_LIBS $ac_gtk_config_libs" + AH_TEMPLATE([HAVE_GTK], [Define this if you have Gtk (any version.)]) AC_DEFINE(HAVE_GTK) if test "$have_gtk2" = yes; then *************** *** 2149,2155 **** if test "$have_gtk" = yes; then AC_CHECK_PROGS(have_gnome_help, yelp gnome-help-browser, no) if test "$have_gnome_help" != no; then ! have_gnome_help=yes fi fi --- 2288,2294 ---- if test "$have_gtk" = yes; then AC_CHECK_PROGS(have_gnome_help, yelp gnome-help-browser, no) if test "$have_gnome_help" != no; then ! have_gnome_help=yes fi fi *************** *** 2297,2307 **** # we have the header, now check for the library have_xml=no xml_halfassed=yes AC_CHECK_X_LIB(c, xmlParseChunk, [have_xml=yes xml_halfassed=no XML_LIBS="$ac_xml_config_libs" ! AC_DEFINE(HAVE_XML)], [true], $ac_xml_config_libs) fi --- 2436,2448 ---- # we have the header, now check for the library have_xml=no xml_halfassed=yes + AH_TEMPLATE([HAVE_XML], + [Define this if you have the XML library.]) AC_CHECK_X_LIB(c, xmlParseChunk, [have_xml=yes xml_halfassed=no XML_LIBS="$ac_xml_config_libs" ! AC_DEFINE(HAVE_XML)], [true], $ac_xml_config_libs) fi *************** *** 2309,2316 **** --- 2450,2461 ---- if test "$have_xml" = yes; then INCLUDES="$INCLUDES $ac_xml_config_cflags" GTK_LIBS="$GTK_LIBS $ac_xml_config_libs" + AH_TEMPLATE([HAVE_XML], [Define this if you have the XML library.]) AC_DEFINE(HAVE_XML) if test "$have_old_xml" = yes; then + AH_TEMPLATE([HAVE_OLD_XML_HEADERS], + [Define this if you have the XML library headers in their old, + non-namespaced location (you lack the gnome-xml/libxml symlink)]) AC_DEFINE(HAVE_OLD_XML_HEADERS) fi fi *************** *** 2541,2549 **** gl_halfassed=yes else # linking works -- we can build the GL hacks. AC_DEFINE(HAVE_GL) if test "$ac_have_mesa_gl" = yes ; then ! AC_DEFINE(HAVE_MESA_GL) fi fi fi --- 2686,2701 ---- gl_halfassed=yes else # linking works -- we can build the GL hacks. + AH_TEMPLATE([HAVE_GL], + [Define this if you have OpenGL. Some of the demos require it, so if you + don't have it, then those particular demos won't be built. (This won't + affect the screen saver as a whole.)]) AC_DEFINE(HAVE_GL) if test "$ac_have_mesa_gl" = yes ; then ! AH_TEMPLATE([HAVE_MESA_GL], ! [Define this if you have OpenGL, but it's the MesaGL variant. (The ! libraries have different names.) (HAVE_GL should be defined too.)]) ! AC_DEFINE(HAVE_MESA_GL) fi fi fi *************** *** 2612,2619 **** # Check for OpenGL 1.1 features. # AC_CHECK_X_LIB($gl_lib_1, glBindTexture, [AC_DEFINE(HAVE_GLBINDTEXTURE)], ! [true], $GL_LIBS -lX11 -lXext -lm) fi elif test "$with_gl" != no; then --- 2764,2774 ---- # Check for OpenGL 1.1 features. # + AH_TEMPLATE([HAVE_GLBINDTEXTURE], + [Define this if your version of OpenGL has the glBindTexture() routine. + This is the case for OpenGL 1.1, but not for OpenGL 1.0.]) AC_CHECK_X_LIB($gl_lib_1, glBindTexture, [AC_DEFINE(HAVE_GLBINDTEXTURE)], ! [true], $GL_LIBS -lX11 -lXext -lm) fi elif test "$with_gl" != no; then *************** *** 2642,2648 **** if test "$have_gl" = no ; then true ! elif test "$with_gle" = yes; then AC_CHECK_X_HEADER(GL/gle.h, have_gle3=yes, have_gle3=no, [#include ]) --- 2797,2803 ---- if test "$have_gl" = no ; then true ! elif test "$with_gle" = yes; then AC_CHECK_X_HEADER(GL/gle.h, have_gle3=yes, have_gle3=no, [#include ]) *************** *** 2695,2702 **** --- 2850,2860 ---- fi if test "$have_gle" = yes ; then + AH_TEMPLATE([HAVE_GLE], + [Define this if you have the -lgle and -lmatrix libraries (GL extrusion.)]) AC_DEFINE(HAVE_GLE) if test "$have_gle3" = yes ; then + AH_TEMPLATE([HAVE_GLE3], [Define this if you have the -lgle from GLE version 3]) AC_DEFINE(HAVE_GLE3) fi fi *************** *** 2725,2733 **** HANDLE_X_PATH_ARG(with_xpm, --with-xpm, XPM) if test "$with_xpm" = yes; then AC_CHECK_X_HEADER(X11/xpm.h, [have_xpm=yes ! AC_DEFINE(HAVE_XPM) XPM_LIBS="-lXpm"],, [#include ]) elif test "$with_xpm" != no; then --- 2883,2894 ---- HANDLE_X_PATH_ARG(with_xpm, --with-xpm, XPM) if test "$with_xpm" = yes; then + AH_TEMPLATE([HAVE_XPM], + [Define this if you have the XPM library installed. Some of + the demos can make use of this if it is available.]) AC_CHECK_X_HEADER(X11/xpm.h, [have_xpm=yes ! AC_DEFINE(HAVE_XPM) XPM_LIBS="-lXpm"],, [#include ]) elif test "$with_xpm" != no; then *************** *** 2936,2941 **** --- 3097,3105 ---- if test "$have_gdk_pixbuf" = yes; then INCLUDES="$INCLUDES $ac_gdk_pixbuf_config_cflags" XPM_LIBS="$ac_gdk_pixbuf_config_libs" + AH_TEMPLATE([HAVE_GDK_PIXBUF], + [Define this if you have the GDK_Pixbuf library installed. + Some of the demos can make use of this if it is available.]) AC_DEFINE(HAVE_GDK_PIXBUF) else have_gdk_pixbuf2=no *************** *** 2948,2954 **** # Check for -ljpeg # ############################################################################### - have_jpeg=no with_jpeg_req=unspecified jpeg_halfassed=no --- 3112,3117 ---- *************** *** 2961,2973 **** HANDLE_X_PATH_ARG(with_jpeg, --with-jpeg, JPEG) ! if test "$with_jpeg" != yes -a "$with_jpeg" != no ; then echo "error: must be yes or no: --with-jpeg=$with_jpeg" exit 1 fi if test "$with_jpeg" = yes; then - have_jpeg=no AC_CHECK_X_HEADER(jpeglib.h, [have_jpeg=yes]) --- 3124,3135 ---- HANDLE_X_PATH_ARG(with_jpeg, --with-jpeg, JPEG) ! if test "$with_jpeg" != yes -a "$with_jpeg" != no; then echo "error: must be yes or no: --with-jpeg=$with_jpeg" exit 1 fi if test "$with_jpeg" = yes; then have_jpeg=no AC_CHECK_X_HEADER(jpeglib.h, [have_jpeg=yes]) *************** *** 2975,2985 **** # we have the header, now check for the library have_jpeg=no jpeg_halfassed=yes AC_CHECK_X_LIB(jpeg, jpeg_start_compress, [have_jpeg=yes jpeg_halfassed=no JPEG_LIBS="-ljpeg" ! AC_DEFINE(HAVE_JPEGLIB)]) fi fi --- 3137,3151 ---- # we have the header, now check for the library have_jpeg=no jpeg_halfassed=yes + AH_TEMPLATE([HAVE_JPEGLIB], + [Define this if you have the Independent JPEG Group's + JPEG library installed. Some of the demos can make use of + this if it is available.]) AC_CHECK_X_LIB(jpeg, jpeg_start_compress, [have_jpeg=yes jpeg_halfassed=no JPEG_LIBS="-ljpeg" ! AC_DEFINE(HAVE_JPEGLIB)]) fi fi *************** *** 3035,3040 **** --- 3201,3208 ---- # if that succeeded, then we've really got it. if test "$have_xshm" = yes; then + AH_TEMPLATE([HAVE_XSHM_EXTENSION], + [Define this if you have the X Shared Memory Extension.]) AC_DEFINE(HAVE_XSHM_EXTENSION) fi *************** *** 3063,3069 **** AC_CHECK_X_HEADER(X11/extensions/Xdbe.h, [have_xdbe=yes],, [#include ]) if test "$have_xdbe" = yes; then ! AC_DEFINE(HAVE_DOUBLE_BUFFER_EXTENSION) fi elif test "$with_xdbe" != no; then --- 3231,3239 ---- AC_CHECK_X_HEADER(X11/extensions/Xdbe.h, [have_xdbe=yes],, [#include ]) if test "$have_xdbe" = yes; then ! AH_TEMPLATE([HAVE_DOUBLE_BUFFER_EXTENSION], ! [Define this if you have the X Double Buffer Extension.]) ! AC_DEFINE(HAVE_DOUBLE_BUFFER_EXTENSION) fi elif test "$with_xdbe" != no; then *************** *** 3092,3099 **** HANDLE_X_PATH_ARG(with_readdisplay, --with-readdisplay, XReadDisplay) if test "$with_readdisplay" = yes; then AC_CHECK_X_HEADER(X11/extensions/readdisplay.h, ! AC_DEFINE(HAVE_READ_DISPLAY_EXTENSION),, [#include ]) elif test "$with_readdisplay" != no; then echo "error: must be yes or no: --with-readdisplay=$with_readdisplay" --- 3262,3274 ---- HANDLE_X_PATH_ARG(with_readdisplay, --with-readdisplay, XReadDisplay) if test "$with_readdisplay" = yes; then + AH_TEMPLATE([HAVE_READ_DISPLAY_EXTENSION], + [Define this if you have the XReadDisplay extension (I think + this is an SGI-only thing; it's in .) A few of the screenhacks will take + advantage of this if it's available.]) AC_CHECK_X_HEADER(X11/extensions/readdisplay.h, ! AC_DEFINE(HAVE_READ_DISPLAY_EXTENSION),, [#include ]) elif test "$with_readdisplay" != no; then echo "error: must be yes or no: --with-readdisplay=$with_readdisplay" *************** *** 3192,3200 **** unset ac_cv_path_fortune_tmp unset fortune_tmp AC_DEFINE_UNQUOTED(FORTUNE_PROGRAM, "$ac_cv_fortune_program") - ############################################################################### # # Check whether it's ok to install some hacks as setuid (e.g., "sonar") --- 3367,3375 ---- unset ac_cv_path_fortune_tmp unset fortune_tmp + AH_TEMPLATE([FORTUNE_PROGRAM], [$ac_cv_fortune_program]) AC_DEFINE_UNQUOTED(FORTUNE_PROGRAM, "$ac_cv_fortune_program") ############################################################################### # # Check whether it's ok to install some hacks as setuid (e.g., "sonar") *************** *** 3360,3366 **** GLADE_DATADIR='' fi - # Set PO_DATADIR to something sensible. # AC_MSG_CHECKING([for locale directory]) --- 3535,3540 ---- *************** *** 3396,3402 **** AC_MSG_RESULT($PO_DATADIR/locale) - # canonicalize slashes. HACK_CONF_DIR=`echo "${HACK_CONF_DIR}" | sed 's@/$@@;s@//*@/@g'` --- 3570,3575 ---- *************** *** 3410,3416 **** # INCLUDES=`echo "$INCLUDES" | sed 's@ -I${prefix}/include@@g;'` - ############################################################################### # # Perform substitutions and write Makefiles. --- 3583,3588 ---- diff -crN ./xscreensaver/driver/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/driver/Makefile.in *** ./xscreensaver/driver/Makefile.in Thu Oct 24 04:26:18 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/driver/Makefile.in Wed Jun 4 08:51:37 2003 *************** *** 35,40 **** --- 35,41 ---- CC = @CC@ CFLAGS = @CFLAGS@ + CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ DEFS = @DEFS@ INTL_DEFS = -DLOCALEDIR=\"$(localedir)\" *************** *** 565,570 **** --- 566,575 ---- $(install_prefix)$(GLADE_DATADIR)/$$target ;\ $(INSTALL_DATA) $(LOGO) \ $(install_prefix)$(GLADE_DATADIR)/$$target ;\ + echo $(INSTALL_DATA) $(LOGO) \ + $(install_prefix)/$(GNOME_DATADIR)/pixmaps/$$target ;\ + $(INSTALL_DATA) $(LOGO) \ + $(install_prefix)/$(GNOME_DATADIR)/pixmaps/$$target ;\ fi # ../utils/images/screensaver-*.xpm *************** *** 814,835 **** # How we build object files in this directory. .c.o: ! $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $< # subprocs takes an extra -D option. subprocs.o: subprocs.c ! $(CC) -c $(INCLUDES) $(SUBP_DEFS) $(CFLAGS) $(X_CFLAGS) \ $(srcdir)/subprocs.c # demo-Gtk takes extra -D options, and an extra -I option. demo-Gtk.o: demo-Gtk.c $(CC) -c $(INCLUDES) $(SUBP_DEFS) -I$(ICON_SRC) \ ! $(GTK_DEFS) $(INTL_DEFS) $(CFLAGS) $(X_CFLAGS) \ $(srcdir)/demo-Gtk.c # demo-Gtk-conf takes an extra -D option. demo-Gtk-conf.o: demo-Gtk-conf.c ! $(CC) -c $(INCLUDES) $(CONF_DEFS) $(GTK_DEFS) $(CFLAGS) $(X_CFLAGS) \ $(srcdir)/demo-Gtk-conf.c --- 819,840 ---- # How we build object files in this directory. .c.o: ! $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(CPPFLAGS) $(X_CFLAGS) $< # subprocs takes an extra -D option. subprocs.o: subprocs.c ! $(CC) -c $(INCLUDES) $(SUBP_DEFS) $(CFLAGS) $(CPPFLAGS) $(X_CFLAGS) \ $(srcdir)/subprocs.c # demo-Gtk takes extra -D options, and an extra -I option. demo-Gtk.o: demo-Gtk.c $(CC) -c $(INCLUDES) $(SUBP_DEFS) -I$(ICON_SRC) \ ! $(GTK_DEFS) $(INTL_DEFS) $(CFLAGS) $(CPPFLAGS) $(X_CFLAGS) \ $(srcdir)/demo-Gtk.c # demo-Gtk-conf takes an extra -D option. demo-Gtk-conf.o: demo-Gtk-conf.c ! $(CC) -c $(INCLUDES) $(CONF_DEFS) $(GTK_DEFS) $(CFLAGS) $(CPPFLAGS) $(X_CFLAGS) \ $(srcdir)/demo-Gtk-conf.c *************** *** 843,852 **** # The executables linked in this directory. # xscreensaver: $(SAVER_OBJS) ! $(CC) $(LDFLAGS) -o $@ $(SAVER_OBJS) $(SAVER_LIBS) xscreensaver-command: $(CMD_OBJS) ! $(CC) $(LDFLAGS) -o $@ $(CMD_OBJS) $(CMD_LIBS) xscreensaver-demo: @PREFERRED_DEMO_PROGRAM@ --- 848,857 ---- # The executables linked in this directory. # xscreensaver: $(SAVER_OBJS) ! $(CC) $(LDFLAGS) -o $@ $(SAVER_OBJS) $(SAVER_LIBS) $(CPPFLAGS) xscreensaver-command: $(CMD_OBJS) ! $(CC) $(LDFLAGS) -o $@ $(CMD_OBJS) $(CMD_LIBS) $(CPPFLAGS) xscreensaver-demo: @PREFERRED_DEMO_PROGRAM@ *************** *** 854,870 **** # $(INSTALL_PROGRAM) @PREFERRED_DEMO_PROGRAM@ $@ xscreensaver-demo-Xm: $(DEMO_OBJS) $(MOTIF_OBJS) ! $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(MOTIF_OBJS) $(LIBS) $(X_LIBS) \ $(MOTIF_LIBS) $(INTL_LIBS) $(X_PRE_LIBS) -lXt -lX11 \ $(XDPMS_LIBS) -lXext $(X_EXTRA_LIBS) xscreensaver-demo-Gtk: $(DEMO_OBJS) $(GTK_OBJS) ! $(CC) $(LDFLAGS) -o $@ $(DEMO_OBJS) $(GTK_OBJS) $(LIBS) $(X_LIBS) \ $(GTK_LIBS) $(XML_LIBS) $(INTL_LIBS) $(X_PRE_LIBS) -lXt -lX11 \ $(XDPMS_LIBS) -lXext $(X_EXTRA_LIBS) xscreensaver-getimage: $(GETIMG_OBJS) ! $(CC) $(LDFLAGS) -o $@ $(GETIMG_OBJS) $(GETIMG_LIBS) -lm TEST_PASSWD_OBJS = test-passwd.o $(LOCK_OBJS_1) $(PASSWD_OBJS) \ --- 859,875 ---- # $(INSTALL_PROGRAM) @PREFERRED_DEMO_PROGRAM@ $@ xscreensaver-demo-Xm: $(DEMO_OBJS) $(MOTIF_OBJS) ! $(CC) $(LDFLAGS) $(CPPFLAGS) -o $@ $(DEMO_OBJS) $(MOTIF_OBJS) $(LIBS) $(X_LIBS) \ $(MOTIF_LIBS) $(INTL_LIBS) $(X_PRE_LIBS) -lXt -lX11 \ $(XDPMS_LIBS) -lXext $(X_EXTRA_LIBS) xscreensaver-demo-Gtk: $(DEMO_OBJS) $(GTK_OBJS) ! $(CC) $(LDFLAGS) $(CPPFLAGS) -o $@ $(DEMO_OBJS) $(GTK_OBJS) $(LIBS) $(X_LIBS) \ $(GTK_LIBS) $(XML_LIBS) $(INTL_LIBS) $(X_PRE_LIBS) -lXt -lX11 \ $(XDPMS_LIBS) -lXext $(X_EXTRA_LIBS) xscreensaver-getimage: $(GETIMG_OBJS) ! $(CC) $(LDFLAGS) $(CPPFLAGS) -o $@ $(GETIMG_OBJS) $(GETIMG_LIBS) -lm TEST_PASSWD_OBJS = test-passwd.o $(LOCK_OBJS_1) $(PASSWD_OBJS) \ *************** *** 873,904 **** test-passwd.o: XScreenSaver_ad.h test-passwd: $(TEST_PASSWD_OBJS) XScreenSaver_ad.h ! $(CC) $(LDFLAGS) -o $@ $(TEST_PASSWD_OBJS) $(SAVER_LIBS) test-uid: test-uid.o ! $(CC) $(LDFLAGS) -o $@ test-uid.o test-xdpms: test-xdpms.o ! $(CC) $(LDFLAGS) -o $@ test-xdpms.o $(LIBS) $(X_LIBS) $(XDPMS_LIBS) \ $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) test-grab: test-grab.o ! $(CC) $(LDFLAGS) -o $@ test-grab.o $(SAVER_LIBS) test-apm: test-apm.o ! $(CC) $(LDFLAGS) -o $@ test-apm.o $(SAVER_LIBS) -lapm TEST_FADE_OBJS = test-fade.o $(UTILS_SRC)/fade.o $(DEMO_UTIL_OBJS) test-fade: test-fade.o $(UTILS_BIN)/fade.o ! $(CC) $(LDFLAGS) -o $@ $(TEST_FADE_OBJS) $(SAVER_LIBS) xdpyinfo.o: xdpyinfo.c ! $(CC) -c $(INCLUDES) -DHAVE_GLX $(CFLAGS) $(X_CFLAGS) \ $(srcdir)/xdpyinfo.c xdpyinfo: xdpyinfo.o ! $(CC) $(LDFLAGS) -o $@ xdpyinfo.o \ $(LIBS) $(X_LIBS) @GL_LIBS@ \ $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) -lm --- 878,909 ---- test-passwd.o: XScreenSaver_ad.h test-passwd: $(TEST_PASSWD_OBJS) XScreenSaver_ad.h ! $(CC) $(LDFLAGS) $(CPPFLAGS) -o $@ $(TEST_PASSWD_OBJS) $(SAVER_LIBS) test-uid: test-uid.o ! $(CC) $(LDFLAGS) $(CPPFLAGS) -o $@ test-uid.o test-xdpms: test-xdpms.o ! $(CC) $(LDFLAGS) $(CPPFLAGS) -o $@ test-xdpms.o $(LIBS) $(X_LIBS) $(XDPMS_LIBS) \ $(X_PRE_LIBS) -lXt -lX11 -lXext $(X_EXTRA_LIBS) test-grab: test-grab.o ! $(CC) $(LDFLAGS) $(CPPFLAGS) -o $@ test-grab.o $(SAVER_LIBS) test-apm: test-apm.o ! $(CC) $(LDFLAGS) $(CPPFLAGS) -o $@ test-apm.o $(SAVER_LIBS) -lapm TEST_FADE_OBJS = test-fade.o $(UTILS_SRC)/fade.o $(DEMO_UTIL_OBJS) test-fade: test-fade.o $(UTILS_BIN)/fade.o ! $(CC) $(LDFLAGS) $(CPPFLAGS) -o $@ $(TEST_FADE_OBJS) $(SAVER_LIBS) xdpyinfo.o: xdpyinfo.c ! $(CC) -c $(INCLUDES) -DHAVE_GLX $(CFLAGS) $(CPPFLAGS) $(X_CFLAGS) \ $(srcdir)/xdpyinfo.c xdpyinfo: xdpyinfo.o ! $(CC) $(LDFLAGS) $(CPPFLAGS) -o $@ xdpyinfo.o \ $(LIBS) $(X_LIBS) @GL_LIBS@ \ $(X_PRE_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) -lm diff -crN ./xscreensaver/hacks/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/hacks/Makefile.in *** ./xscreensaver/hacks/Makefile.in Thu Oct 24 04:26:18 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/hacks/Makefile.in Tue Dec 10 19:37:53 2002 *************** *** 19,24 **** --- 19,25 ---- CC = @CC@ CFLAGS = @CFLAGS@ + CPPFLAGS = @CPPFLAGS@ LDFLAGS = @LDFLAGS@ DEFS = -DSTANDALONE @DEFS@ LIBS = @LIBS@ *************** *** 478,490 **** # How we build object files in this directory. .c.o: ! $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $< # Some hacks use a slightly-differently-compiled variant of this file. # This is how to make the the other .o file from it. # screenhack-xlock.o: screenhack.c ! $(CC) -o $@ -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) \ -DXLOCKMORE $(srcdir)/screenhack.c # Some abbreviations to keep the lines short... --- 479,491 ---- # How we build object files in this directory. .c.o: ! $(CC) -c $(INCLUDES) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(X_CFLAGS) $< # Some hacks use a slightly-differently-compiled variant of this file. # This is how to make the the other .o file from it. # screenhack-xlock.o: screenhack.c ! $(CC) -o $@ -c $(INCLUDES) $(CPPFLAGS) $(DEFS) $(CFLAGS) $(X_CFLAGS) \ -DXLOCKMORE $(srcdir)/screenhack.c # Some abbreviations to keep the lines short... *************** *** 500,509 **** DBE = $(XDBE_OBJS) BARS = $(UTILS_BIN)/colorbars.o $(LOGO) ! CC_HACK = $(CC) $(LDFLAGS) xscreensaver-sgigl: xscreensaver-sgigl.c ! $(CC) $(LDFLAGS) -o $@ $< -I$(UTILS_SRC) $(HACK_PRE) \ $(XMU_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) -lm --- 501,510 ---- DBE = $(XDBE_OBJS) BARS = $(UTILS_BIN)/colorbars.o $(LOGO) ! CC_HACK = $(CC) $(LDFLAGS) $(CPPFLAGS) xscreensaver-sgigl: xscreensaver-sgigl.c ! $(CC) $(LDFLAGS) $(CPPFLAGS) -o $@ $< -I$(UTILS_SRC) $(HACK_PRE) \ $(XMU_LIBS) -lX11 -lXext $(X_EXTRA_LIBS) -lm diff -crN ./xscreensaver/hacks/flow.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/hacks/flow.c *** ./xscreensaver/hacks/flow.c Mon Jul 17 03:25:46 2000 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/hacks/flow.c Tue Dec 10 17:54:14 2002 *************** *** 113,119 **** FLOW_2D = 8, /* Allow 2D attractors */ FLOW_BOX = 16, /* Compute a box around the attractor */ FLOW_SLOW = 32, /* Some bees are slower (and have antifreeze) */ ! FLOW_FREEZE = 64, /* Freeze some of the bees in action */ } FlowMode; #define FLOW_DEFAULT (FLOW_ROTATE|FLOW_RIDE|FLOW_ZOOM|FLOW_2D|\ --- 113,119 ---- FLOW_2D = 8, /* Allow 2D attractors */ FLOW_BOX = 16, /* Compute a box around the attractor */ FLOW_SLOW = 32, /* Some bees are slower (and have antifreeze) */ ! FLOW_FREEZE = 64 /* Freeze some of the bees in action */ } FlowMode; #define FLOW_DEFAULT (FLOW_ROTATE|FLOW_RIDE|FLOW_ZOOM|FLOW_2D|\ diff -crN ./xscreensaver/hacks/juggle.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/hacks/juggle.c *** ./xscreensaver/hacks/juggle.c Wed Oct 23 11:48:29 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/hacks/juggle.c Tue Dec 10 18:05:55 2002 *************** *** 100,105 **** --- 100,108 ---- into the Adam notation, [*] which means 'lose the current ball'.] */ + #ifndef STANDALONE + #define STANDALONE + #endif #ifdef STANDALONE #define MODE_juggle #define PROGCLASS "Juggle" diff -crN ./xscreensaver/hacks/speedmine.c /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/hacks/speedmine.c *** ./xscreensaver/hacks/speedmine.c Fri Sep 28 03:29:45 2001 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/hacks/speedmine.c Tue Dec 10 19:43:42 2002 *************** *** 116,122 **** #define BACKWARDS -1 static int direction = FORWARDS; ! static int pindex=0, nearest=0; static int flipped_at=0; static int xoffset=0, yoffset=0; --- 116,122 ---- #define BACKWARDS -1 static int direction = FORWARDS; ! static int p_index=0, pnearest=0; static int flipped_at=0; static int xoffset=0, yoffset=0; *************** *** 230,238 **** zf = 8.0*28.0 / (double)(width*TERRAIN_LENGTH); if (be_wormy) zf *= 3.0; ! depth = TERRAIN_PDIST - INTERP + pindex; ! view_pos = (nearest+3*TERRAIN_LENGTH/4)%TERRAIN_LENGTH; xoffset += - xcurvature[view_pos]*curviness/8; xoffset /= 2; --- 230,238 ---- zf = 8.0*28.0 / (double)(width*TERRAIN_LENGTH); if (be_wormy) zf *= 3.0; ! depth = TERRAIN_PDIST - INTERP + p_index; ! view_pos = (pnearest+3*TERRAIN_LENGTH/4)%TERRAIN_LENGTH; xoffset += - xcurvature[view_pos]*curviness/8; xoffset /= 2; *************** *** 240,246 **** yoffset += - ycurvature[view_pos]*curviness/4; yoffset /= 2; ! rotation_offset += (int)((zcurvature[view_pos]-zcurvature[nearest])*ROTS/8); rotation_offset /= 2; rotation_bias = orientation + spin_bonus - rotation_offset; --- 240,246 ---- yoffset += - ycurvature[view_pos]*curviness/4; yoffset /= 2; ! rotation_offset += (int)((zcurvature[view_pos]-zcurvature[pnearest])*ROTS/8); rotation_offset /= 2; rotation_bias = orientation + spin_bonus - rotation_offset; *************** *** 259,265 **** MODULO(rotation_bias, ROTS); for (t=0; t < TERRAIN_LENGTH; t++) { ! i = nearest + t; MODULO(i, TERRAIN_LENGTH); xc += xcurvature[i]; yc += ycurvature[i]; zc += zcurvature[i]; xcc += xc; ycc += yc; zcc += zc; maxx[i] = maxy[i] = 0; --- 259,265 ---- MODULO(rotation_bias, ROTS); for (t=0; t < TERRAIN_LENGTH; t++) { ! i = pnearest + t; MODULO(i, TERRAIN_LENGTH); xc += xcurvature[i]; yc += ycurvature[i]; zc += zcurvature[i]; xcc += xc; ycc += yc; zcc += zc; maxx[i] = maxy[i] = 0; *************** *** 267,273 **** } for (t=0; t < TERRAIN_LENGTH; t++) { ! i = nearest - 1 - t; MODULO(i, TERRAIN_LENGTH); zfactor = (double)depth* (12.0 - TERRAIN_LENGTH/8.0) * zf; for (j=0; j < TERRAIN_BREADTH; j++) { --- 267,273 ---- } for (t=0; t < TERRAIN_LENGTH; t++) { ! i = pnearest - 1 - t; MODULO(i, TERRAIN_LENGTH); zfactor = (double)depth* (12.0 - TERRAIN_LENGTH/8.0) * zf; for (j=0; j < TERRAIN_BREADTH; j++) { *************** *** 350,357 **** bonus_bright = 20; for (i=0; i < TERRAIN_LENGTH; i++) { ! in = nearest + i; MODULO(in, TERRAIN_BREADTH); ! ip = nearest - i; MODULO(ip, TERRAIN_BREADTH); for (j=0; j < TERRAIN_BREADTH; j++) { t = terrain[ip][j]; terrain[ip][j] = terrain[in][j]; --- 350,357 ---- bonus_bright = 20; for (i=0; i < TERRAIN_LENGTH; i++) { ! in = pnearest + i; MODULO(in, TERRAIN_BREADTH); ! ip = pnearest - i; MODULO(ip, TERRAIN_BREADTH); for (j=0; j < TERRAIN_BREADTH; j++) { t = terrain[ip][j]; terrain[ip][j] = terrain[in][j]; *************** *** 603,609 **** if (jamming > 0) { jamming--; ! nearest -= 2; MODULO(nearest, TERRAIN_LENGTH); return; } --- 603,609 ---- if (jamming > 0) { jamming--; ! pnearest -= 2; MODULO(pnearest, TERRAIN_LENGTH); return; } *************** *** 623,629 **** spin_bonus -= ROTS; break; case 4: /* look backwards / look forwards */ ! flipped_at = nearest; flip_direction (); backwards_bonus = (backwards_bonus?0:10); break; --- 623,629 ---- spin_bonus -= ROTS; break; case 4: /* look backwards / look forwards */ ! flipped_at = pnearest; flip_direction (); backwards_bonus = (backwards_bonus?0:10); break; *************** *** 631,637 **** change_colors(); break; case 6: /* jam against the bonus a few times; deja vu! */ ! nearest -= 2; MODULO(nearest, TERRAIN_LENGTH); jamming = 3; break; default: --- 631,637 ---- change_colors(); break; case 6: /* jam against the bonus a few times; deja vu! */ ! pnearest -= 2; MODULO(pnearest, TERRAIN_LENGTH); jamming = 3; break; default: *************** *** 653,661 **** if (!bonuses_flag) return; if (step >= 0.0) { ! start = nearest; end = nearest + (int)floor(step); } else { ! end = nearest; start = nearest + (int)floor(step); } if (be_wormy) { --- 653,661 ---- if (!bonuses_flag) return; if (step >= 0.0) { ! start = pnearest; end = pnearest + (int)floor(step); } else { ! end = pnearest; start = pnearest + (int)floor(step); } if (be_wormy) { *************** *** 688,695 **** if (backwards_bonus > 1) backwards_bonus--; else if (backwards_bonus == 1) { ! nearest += 2*(MAX(flipped_at, nearest) - MIN(flipped_at,nearest)); ! MODULO(nearest, TERRAIN_LENGTH); flip_direction (); backwards_bonus = 0; } --- 688,695 ---- if (backwards_bonus > 1) backwards_bonus--; else if (backwards_bonus == 1) { ! pnearest += 2*(MAX(flipped_at, pnearest) - MIN(flipped_at,pnearest)); ! MODULO(pnearest, TERRAIN_LENGTH); flip_direction (); backwards_bonus = 0; } *************** *** 738,744 **** int start, end; int passed; ! passed = nearest % (TERRAIN_LENGTH/4); if (speed == 0.0 || (speed > 0.0 && passed > (int)step) || --- 738,744 ---- int start, end; int passed; ! passed = pnearest % (TERRAIN_LENGTH/4); if (speed == 0.0 || (speed > 0.0 && passed > (int)step) || *************** *** 747,753 **** return; } ! end = nearest - passed - 1; MODULO(end, TERRAIN_LENGTH); start = end - TERRAIN_LENGTH/4 + 1; MODULO(start, TERRAIN_LENGTH); if (DEBUG_FLAG) printf ("Regenerating [%d - %d]\n", start, end); --- 747,753 ---- return; } ! end = pnearest - passed - 1; MODULO(end, TERRAIN_LENGTH); start = end - TERRAIN_LENGTH/4 + 1; MODULO(start, TERRAIN_LENGTH); if (DEBUG_FLAG) printf ("Regenerating [%d - %d]\n", start, end); *************** *** 847,853 **** XPoint points[4]; GC gc; ! assert (i == (nearest - (t + dt) + TERRAIN_LENGTH) % TERRAIN_LENGTH); in = i + 1; MODULO(in, TERRAIN_LENGTH); --- 847,853 ---- XPoint points[4]; GC gc; ! assert (i == (pnearest - (t + dt) + TERRAIN_LENGTH) % TERRAIN_LENGTH); in = i + 1; MODULO(in, TERRAIN_LENGTH); *************** *** 860,866 **** points[3].x = xvals[t][j2]; points[3].y = yvals[t][j2]; index = bonus_bright + ncolors/3 + ! t*(t*INTERP + pindex) * ncolors / (3*TERRAIN_LENGTH*TERRAIN_PDIST); if (!wireframe) { index += (int)((points[0].y - points[3].y) / 8); --- 860,866 ---- points[3].x = xvals[t][j2]; points[3].y = yvals[t][j2]; index = bonus_bright + ncolors/3 + ! t*(t*INTERP + p_index) * ncolors / (3*TERRAIN_LENGTH*TERRAIN_PDIST); if (!wireframe) { index += (int)((points[0].y - points[3].y) / 8); *************** *** 912,918 **** XPoint points[5]; GC gc; ! assert (i == (nearest -t + TERRAIN_LENGTH) % TERRAIN_LENGTH); in = i + 1; MODULO(in, TERRAIN_LENGTH); --- 912,918 ---- XPoint points[5]; GC gc; ! assert (i == (pnearest -t + TERRAIN_LENGTH) % TERRAIN_LENGTH); in = i + 1; MODULO(in, TERRAIN_LENGTH); *************** *** 927,933 **** points[4].x = xvals[t][j3]; points[4].y = yvals[t][j3]; index = bonus_bright + ncolors/3 + ! t*(t*INTERP + pindex) * ncolors / (3*TERRAIN_LENGTH*TERRAIN_PDIST); if (!wireframe) { index += (int)((points[0].y - points[3].y) / 8); --- 927,933 ---- points[4].x = xvals[t][j3]; points[4].y = yvals[t][j3]; index = bonus_bright + ncolors/3 + ! t*(t*INTERP + p_index) * ncolors / (3*TERRAIN_LENGTH*TERRAIN_PDIST); if (!wireframe) { index += (int)((points[0].y - points[3].y) / 8); *************** *** 1034,1040 **** { int bt; ! assert (i == (nearest -t + TERRAIN_LENGTH) % TERRAIN_LENGTH); if (!bonuses[i] || wireframe) return; --- 1034,1040 ---- { int bt; ! assert (i == (pnearest -t + TERRAIN_LENGTH) % TERRAIN_LENGTH); if (!bonuses[i] || wireframe) return; *************** *** 1073,1082 **** static void render_speedmine (Display * dpy, Drawable d) { ! int t, i=nearest, dt=1; GC gc; ! assert (nearest >= 0 && nearest < TERRAIN_LENGTH); if (be_wormy || wireframe) { XFillRectangle (dpy, d, erase_gc, 0, 0, width, height); --- 1073,1082 ---- static void render_speedmine (Display * dpy, Drawable d) { ! int t, i=pnearest, dt=1; GC gc; ! assert (pnearest >= 0 && pnearest < TERRAIN_LENGTH); if (be_wormy || wireframe) { XFillRectangle (dpy, d, erase_gc, 0, 0, width, height); *************** *** 1093,1099 **** t = MAX(begin_at(), TERRAIN_LENGTH/4); /*t = TERRAIN_LENGTH/4; dt = 2; */ dt = (t >= 3*TERRAIN_LENGTH/4 ? 1 : 2); ! i = (nearest -t + TERRAIN_LENGTH) % TERRAIN_LENGTH; render_block (dpy, d, tunnelend_gc, t); } --- 1093,1099 ---- t = MAX(begin_at(), TERRAIN_LENGTH/4); /*t = TERRAIN_LENGTH/4; dt = 2; */ dt = (t >= 3*TERRAIN_LENGTH/4 ? 1 : 2); ! i = (pnearest -t + TERRAIN_LENGTH) % TERRAIN_LENGTH; render_block (dpy, d, tunnelend_gc, t); } *************** *** 1110,1116 **** dt=1; if (be_wormy) { ! for (; t < TERRAIN_LENGTH-(1+(pindex= INTERP) { ! nearest --; ! pindex -= INTERP; } ! while (pindex < 0) { ! nearest ++; ! pindex += INTERP; } ! nearest += dpos; MODULO(nearest, TERRAIN_LENGTH); pos -= dpos; ! accel = thrust + ycurvature[nearest] * gravity; speed += accel; if (speed > maxspeed) speed = maxspeed; if (speed < -maxspeed) speed = -maxspeed; --- 1152,1172 ---- pos += step; dpos = SIGN3(pos) * floor(fabs(pos)); ! p_index += SIGN3(effective_speed) + INTERP; ! while (p_index >= INTERP) { ! pnearest --; ! p_index -= INTERP; } ! while (p_index < 0) { ! pnearest ++; ! p_index += INTERP; } ! pnearest += dpos; MODULO(pnearest, TERRAIN_LENGTH); pos -= dpos; ! accel = thrust + ycurvature[pnearest] * gravity; speed += accel; if (speed > maxspeed) speed = maxspeed; if (speed < -maxspeed) speed = -maxspeed; diff -crN ./xscreensaver/utils/Makefile.in /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/utils/Makefile.in *** ./xscreensaver/utils/Makefile.in Thu Oct 24 04:26:17 2002 --- /gestconf/project/GNOME_ACL/GNOME/build/sh_build_GNOME/src/./xscreensaver/utils/Makefile.in Tue Dec 10 17:37:47 2002 *************** *** 84,89 **** --- 84,90 ---- CC = @CC@ CFLAGS = @CFLAGS@ + CPPFLAGS = @CPPFLAGS@ DEFS = @DEFS@ DEPEND = @DEPEND@ *************** *** 181,187 **** # How we build object files in this directory. .c.o: ! $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(X_CFLAGS) $< # Rules for generating the VMS makefiles on Unix, so that it doesn't have to --- 182,188 ---- # How we build object files in this directory. .c.o: ! $(CC) -c $(INCLUDES) $(DEFS) $(CFLAGS) $(CPPFLAGS) $(X_CFLAGS) $< # Rules for generating the VMS makefiles on Unix, so that it doesn't have to