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.])
jurassic_gtk=no
gtk_halfassed=no
+have_gtk_2_22_or_higher=no
+COMMENT_DEMO_GLADE2_GTK_2_22_HEAD=""
+COMMENT_DEMO_GLADE2_GTK_2_22_TAIL=""
if test "$with_gtk" = yes; then
have_gtk=no
AC_DEFINE(HAVE_XML)
fi
+ if test "$have_gtk" = yes; then
+ ok="yes"
+ pkg_check_version gtk+-2.0 2.22
+ have_gtk_2_22_or_higher="$ok"
+ if test "$have_gtk_2_22_or_higher" = yes; then
+ COMMENT_DEMO_GLADE2_GTK_2_22_HEAD="<!-- comment>"
+ COMMENT_DEMO_GLADE2_GTK_2_22_TAIL="</comment -->"
+ fi
+ fi
fi
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.
AC_SUBST(DEFAULT_IMAGE_DIRECTORY)
AC_SUBST(DEFAULT_TEXT_FILE)
AC_SUBST(WITH_BROWSER)
+AC_SUBST(COMMENT_DEMO_GLADE2_GTK_2_22_HEAD)
+AC_SUBST(COMMENT_DEMO_GLADE2_GTK_2_22_TAIL)
+
AC_SUBST(OBJCC)
AC_SUBST(EXES_OSX)
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)
utils/Makefile
driver/Makefile
driver/xscreensaver.pam
+ driver/xscreensaver-demo.glade2
hacks/Makefile
hacks/glx/Makefile
po/Makefile.in