*** xscreensaver-4.01/driver/demo-Gtk-conf.c.orig Mon Jan 28 15:12:21 2002 --- xscreensaver-4.01/driver/demo-Gtk-conf.c Thu Mar 7 14:55:55 2002 *************** *** 14,20 **** # include "config.h" #endif ! #if defined(HAVE_GTK) && defined(HAVE_XML) /* whole file */ #include --- 14,20 ---- # include "config.h" #endif ! #if defined(HAVE_GTK) && (defined(HAVE_XML) || defined(HAVE_XML2)) /* whole file */ #include *** xscreensaver-4.01/driver/Makefile.in.orig Sun Feb 24 10:56:29 2002 --- xscreensaver-4.01/driver/Makefile.in Thu Mar 7 14:55:55 2002 *************** *** 31,36 **** --- 31,37 ---- SUBP_DEFS = $(DEFS) -DDEFAULT_PATH_PREFIX='"@HACKDIR@"' GTK_DEFS = $(DEFS) -DDEFAULT_ICONDIR='"$(GNOME_ICONDIR)"' CONF_DEFS = -DHACK_CONFIGURATION_PATH='"$(HACK_CONF_DIR)"' + XML_DEFS = @XML2_DEFS@ LIBS = @LIBS@ PERL = @PERL@ *************** *** 737,743 **** # 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 --- 738,744 ---- # demo-Gtk-conf takes an extra -D option. demo-Gtk-conf.o: demo-Gtk-conf.c ! $(CC) -c $(INCLUDES) $(CONF_DEFS) $(XML_DEFS) $(GTK_DEFS) $(CFLAGS) $(X_CFLAGS) \ $(srcdir)/demo-Gtk-conf.c *** xscreensaver-4.01/driver/demo-Gtk.c.orig Tue Feb 12 04:10:44 2002 --- xscreensaver-4.01/driver/demo-Gtk.c Thu Mar 7 14:55:55 2002 *************** *** 1606,1612 **** static void settings_sync_cmd_text (state *s) { ! # ifdef HAVE_XML GtkWidget *cmd = GTK_WIDGET (name_to_widget (s, "cmd_text")); char *cmd_line = get_configurator_command_line (s->cdata); gtk_entry_set_text (GTK_ENTRY (cmd), cmd_line); --- 1606,1612 ---- static void settings_sync_cmd_text (state *s) { ! # if defined(HAVE_XML) || defined(HAVE_XML2) GtkWidget *cmd = GTK_WIDGET (name_to_widget (s, "cmd_text")); char *cmd_line = get_configurator_command_line (s->cdata); gtk_entry_set_text (GTK_ENTRY (cmd), cmd_line); *************** *** 2012,2018 **** screenhack *hack = (hack_number >= 0 ? p->screenhacks[hack_number] : 0); char *doc_string = 0; ! # ifdef HAVE_XML if (s->cdata) { free_conf_data (s->cdata); --- 2012,2018 ---- screenhack *hack = (hack_number >= 0 ? p->screenhacks[hack_number] : 0); char *doc_string = 0; ! # if defined(HAVE_XML) || defined(HAVE_XML2) if (s->cdata) { free_conf_data (s->cdata); *************** *** 3670,3676 **** GtkWidget *std = GTK_WIDGET (name_to_widget (s, "std_button")); int page = 0; ! # ifdef HAVE_XML gtk_widget_hide (std); # else /* !HAVE_XML */ /* Make the advanced page be the only one available. */ --- 3670,3676 ---- GtkWidget *std = GTK_WIDGET (name_to_widget (s, "std_button")); int page = 0; ! # if defined(HAVE_XML) || defined(HAVE_XML2) gtk_widget_hide (std); # else /* !HAVE_XML */ /* Make the advanced page be the only one available. */ *** xscreensaver-4.01/hacks/glx/Makefile.in.orig Sun Feb 24 10:56:30 2002 --- xscreensaver-4.01/hacks/glx/Makefile.in Thu Mar 7 14:57:11 2002 *************** *** 373,378 **** --- 373,381 ---- flipscreen3d: flipscreen3d.o $(HACK_OBJS) $(GRAB_OBJS) $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(GRAB_OBJS) $(HACK_LIBS) + glsnake: glsnake.o $(HACK_OBJS) + $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(HACK_LIBS) + glsnake: glsnake.o $(HACK_OBJS) $(CC_HACK) -o $@ $@.o $(HACK_OBJS) $(HACK_LIBS) *** xscreensaver-4.01/hacks/webcollage-helper.c.orig Thu Feb 14 12:27:26 2002 --- xscreensaver-4.01/hacks/webcollage-helper.c Thu Mar 7 14:55:55 2002 *************** *** 236,242 **** --- 236,246 ---- cinfo.in_color_space = JCS_RGB; jpeg_set_defaults (&cinfo); + #if JPEG_LIB_VERSION < 62 cinfo.progressive_mode = TRUE; + #else + jpeg_simple_progression(&cinfo); + #endif jpeg_set_quality (&cinfo, jpeg_quality, TRUE); jpeg_start_compress (&cinfo, TRUE); *** xscreensaver-4.01/configure.in.orig Sun Feb 24 10:45:04 2002 --- xscreensaver-4.01/configure.in Thu Mar 7 14:55:55 2002 *************** *** 1,5 **** --- 1,6 ---- # configure.in --- xscreensaver, Copyright (c) 1997-2000 Jamie Zawinski. # + AC_PREREQ(2.13) AC_INIT(driver/subprocs.c) AC_CONFIG_HEADER(config.h) *************** *** 1978,2032 **** ############################################################################### # ! # Check for -lxml (if we have Gtk) # ############################################################################### ! have_xml=no ! with_xml_req=unspecified ! xml_halfassed=no ! AC_ARG_WITH(xml, ! [ --with-xml The XML toolkit is needed for some parts of ! the Gtk interface.], ! [with_xml="$withval"; with_xml_req="$withval"],[with_xml=yes]) ! ! HANDLE_X_PATH_ARG(with_xml, --with-xml, XML) ! if test "$with_xml" != yes -a "$with_xml" != no ; then ! echo "error: must be yes or no: --with-xml=$with_xml" exit 1 fi if test "$have_gtk" != yes; then # don't bother if no GTK ! with_xml=no ! fi ! ! if test "$with_xml" = yes; then ! have_xml=no ! # the XML stuff is likely to be in GTK paths. ! ac_save_X_CFLAGS="$X_CFLAGS" ! ac_save_X_LIBS="$X_LIBS" ! X_CFLAGS="$X_CFLAGS $ac_gtk_config_cflags" ! X_LIBS="$X_LIBS $ac_gtk_config_libs" ! AC_CHECK_X_HEADER(xmlIO.h, [have_xml=yes]) ! if test "$have_xml" = yes; then # we have the header, now check for the library ! have_xml=no ! xml_halfassed=yes ! AC_CHECK_X_LIB(xml, xmlParseChunk, ! [have_xml=yes ! xml_halfassed=no ! XML_LIBS="-lxml" ! AC_DEFINE(HAVE_XML)]) fi X_CFLAGS="$ac_save_X_CFLAGS" X_LIBS="$ac_save_X_LIBS" fi --- 1979,2083 ---- ############################################################################### # ! # Check for -lxml2 (if we have Gtk) # ############################################################################### ! have_xml2=no ! AC_ARG_WITH(xml2, ! [ --with-xml2 The XML2 toolkit is needed for some parts of ! the Gtk interface.], ! [with_xml2="$withval"; with_xml2_req="$withval"],[with_xml2=yes]) ! if test "$with_xml2" != yes -a "$with_xml2" != no ; then ! echo "error: must be yes or no: --with-xml2=$with_xml2" exit 1 fi if test "$have_gtk" != yes; then # don't bother if no GTK ! with_xml2=no ! else ! AC_PATH_PROGS(xml2_config, xml2-config,, "$PATH") ! AC_CACHE_CHECK([for xml2 includes], ac_cv_xml2_config_cflags, ! [ac_cv_xml2_config_cflags=`$xml2_config --cflags`]) ! AC_CACHE_CHECK([for xml2 libs], ac_cv_xml2_config_libs, ! [ac_cv_xml2_config_libs=`$xml2_config --libs`]) ! ac_xml2_config_cflags=$ac_cv_xml2_config_cflags ! ac_xml2_config_libs=$ac_cv_xml2_config_libs ! X_CFLAGS="$X_CFLAGS $ac_xml2_config_cflags" ! X_LIBS="$X_LIBS $ac_xml2_config_libs" ! AC_CHECK_X_HEADER(xmlIO.h, [have_xml2=yes]) ! if test "$have_xml2" = yes; then # we have the header, now check for the library ! have_xml2=no ! AC_CHECK_X_LIB(xml2, xmlParseChunk, ! [have_xml2=yes ! XML_LIBS="$ac_xml2_config_libs" ! AC_DEFINE(HAVE_XML2)]) ! XML2_DEFS="$ac_xml2_config_cflags" fi X_CFLAGS="$ac_save_X_CFLAGS" X_LIBS="$ac_save_X_LIBS" + fi + ############################################################################### + # + # Check for -lxml (if we have Gtk) + # + ############################################################################### + + if test "$have_xml2" = no; then + have_xml=no + with_xml_req=unspecified + xml_halfassed=no + AC_ARG_WITH(xml, + [ --with-xml The XML toolkit is needed for some parts of + the Gtk interface.], + [with_xml="$withval"; with_xml_req="$withval"],[with_xml=yes]) + + HANDLE_X_PATH_ARG(with_xml, --with-xml, XML) + + if test "$with_xml" != yes -a "$with_xml" != no ; then + echo "error: must be yes or no: --with-xml=$with_xml" + exit 1 + fi + + if test "$have_gtk" != yes; then + # don't bother if no GTK + with_xml=no + fi + + if test "$with_xml" = yes; then + have_xml=no + + # the XML stuff is likely to be in GTK paths. + ac_save_X_CFLAGS="$X_CFLAGS" + ac_save_X_LIBS="$X_LIBS" + X_CFLAGS="$X_CFLAGS $ac_gtk_config_cflags" + X_LIBS="$X_LIBS $ac_gtk_config_libs" + + AC_CHECK_X_HEADER(xmlIO.h, [have_xml=yes]) + + if test "$have_xml" = yes; then + # we have the header, now check for the library + have_xml=no + xml_halfassed=yes + AC_CHECK_X_LIB(xml, xmlParseChunk, + [have_xml=yes + xml_halfassed=no + XML_LIBS="-lxml" + AC_DEFINE(HAVE_XML)]) + fi + + X_CFLAGS="$ac_save_X_CFLAGS" + X_LIBS="$ac_save_X_LIBS" + + fi fi *************** *** 2909,2914 **** --- 2960,2966 ---- AC_SUBST(INSTALL_DIRS) AC_SUBST(NEED_SETUID) AC_SUBST(INSTALL_PAM) + AC_SUBST(XML2_DEFS) AC_SUBST(PASSWD_SRCS) AC_SUBST(PASSWD_OBJS) *************** *** 3082,3088 **** fi if test "$have_gtk" = yes ; then ! if test "$have_xml" = no ; then if test "$with_xml_req" = yes ; then warn 'Use of the XML library was requested, but the necessary' warn2 'headers and/or libraries were not found.' --- 3134,3140 ---- fi if test "$have_gtk" = yes ; then ! if test "$have_xml" = no -a "$have_xml2" = no ; then if test "$with_xml_req" = yes ; then warn 'Use of the XML library was requested, but the necessary' warn2 'headers and/or libraries were not found.' *************** *** 3099,3107 **** fi echo '' ! warn2 "Without XML, the per-display-mode \`Settings' dialogs" ! warn2 'will not be available. Specify the location of the XML' ! warn2 'library through the --with-xml option to configure.' fi fi --- 3151,3159 ---- fi echo '' ! warn2 "Without XML or XML2, the per-display-mode \`Settings' dialogs" ! warn2 'will not be available. Specify the location of the XML or XML2' ! warn2 'library through the --with-xml or --with-xml2 option to configure.' fi fi *** xscreensaver-4.01/config.h.in.orig Thu Feb 14 09:19:11 2002 --- xscreensaver-4.01/config.h.in Thu Mar 7 14:55:55 2002 *************** *** 157,162 **** --- 157,166 ---- */ #undef HAVE_XML + /* Define this if you have the XML2 library. + */ + #undef HAVE_XML2 + /* Define this if you have the XPM library installed. Some of the demos can * make use of this if it is available. */