cleaned source code

diff --git a/xscreensaver/configure b/xscreensaver/configure
index 2106b95..40324fa 100755 (executable)
--- a/xscreensaver/configure
+++ b/xscreensaver/configure
@@ -15370,32 +15370,6 @@ ac_dbus_config_libs=$ac_cv_dbus_config_libs
 INCLUDES="$INCLUDES $ac_dbus_config_cflags"
 DBUS_LIBS="$GTK_LIBS $ac_dbus_config_libs"
 
-{ echo "$as_me:$LINENO: checking for OSSO includes" >&5
-echo $ECHO_N "checking for OSSO includes... $ECHO_C" >&6; }
-if test "${ac_cv_osso_config_cflags+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_osso_config_cflags=`$pkg_config --cflags libosso`
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_osso_config_cflags" >&5
-echo "${ECHO_T}$ac_cv_osso_config_cflags" >&6; }
-{ echo "$as_me:$LINENO: checking for OSSO includes" >&5
-echo $ECHO_N "checking for OSSO includes... $ECHO_C" >&6; }
-if test "${ac_cv_osso_config_libs+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_cv_osso_config_libs=`$pkg_config --libs libosso`
-fi
-{ echo "$as_me:$LINENO: result: $ac_cv_osso_config_libs" >&5
-echo "${ECHO_T}$ac_cv_osso_config_libs" >&6; }
-
-ac_osso_config_cflags=$ac_cv_osso_config_cflags
-ac_osso_config_libs=$ac_cv_osso_config_libs
-
-INCLUDES="$INCLUDES $ac_osso_config_cflags"
-GTK_LIBS="$GTK_LIBS $ac_osso_config_libs"
-
-
 
 
 # Check for the various Gnome help and URL loading programs.
@@ -16810,7 +16784,7 @@ if test "${ac_cv_mesagl_version_string+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 16813 "configure"
+#line 16787 "configure"
 #include "confdefs.h"
 #include <GL/gl.h>
 #ifndef MESA_MAJOR_VERSION

diff --git a/xscreensaver/configure.in b/xscreensaver/configure.in
index 0431d92..23976dc 100644 (file)
--- a/xscreensaver/configure.in
+++ b/xscreensaver/configure.in
@@ -2521,18 +2521,6 @@ ac_dbus_config_libs=$ac_cv_dbus_config_libs
 INCLUDES="$INCLUDES $ac_dbus_config_cflags"
 DBUS_LIBS="$GTK_LIBS $ac_dbus_config_libs"
 
-AC_CACHE_CHECK([for OSSO includes], ac_cv_osso_config_cflags,
-                   [ac_cv_osso_config_cflags=`$pkg_config --cflags libosso`])
-AC_CACHE_CHECK([for OSSO includes], ac_cv_osso_config_libs,
-                   [ac_cv_osso_config_libs=`$pkg_config --libs libosso`])
-
-ac_osso_config_cflags=$ac_cv_osso_config_cflags
-ac_osso_config_libs=$ac_cv_osso_config_libs
-
-INCLUDES="$INCLUDES $ac_osso_config_cflags"
-GTK_LIBS="$GTK_LIBS $ac_osso_config_libs"
-
-
 
 
 # Check for the various Gnome help and URL loading programs.

diff --git a/xscreensaver/hacks/screenhack.c b/xscreensaver/hacks/screenhack.c
index 6366745..7c46686 100644 (file)
--- a/xscreensaver/hacks/screenhack.c
+++ b/xscreensaver/hacks/screenhack.c
@@ -92,9 +92,7 @@
 #include <X11/Shell.h>
 #include <X11/StringDefs.h>
 #include <X11/keysym.h>
-/* #include <libosso.h> */
 #include <dbus/dbus.h>
-/* #include <dbus/dbus-glib.h>  */
 
 #ifdef __sgi
 # include <X11/SGIScheme.h>    /* for SgiUseSchemes() */