diff -pr zoom-1.0.1/THANKS zoom-1.0.1a/THANKS *** zoom-1.0.1/THANKS Sat Oct 19 18:39:47 2002 --- zoom-1.0.1a/THANKS Sun Nov 3 14:08:03 2002 *************** These people have contributed to this ve *** 2,7 **** --- 2,8 ---- variously contributed patches, bug reports or feature requests. Zoom would not be what it is without them! + Christoffer Heggem Gregg V. Carroll Volker Lanz Roger Kenyon diff -pr zoom-1.0.1/configure zoom-1.0.1a/configure *** zoom-1.0.1/configure Sat Oct 19 22:18:01 2002 --- zoom-1.0.1a/configure Mon Nov 11 14:05:54 2002 *************** fi *** 980,986 **** PATH_SEPARATOR="$ac_path_separator" rm -f conftest.sh ! VERSION=1.0.1 PACKAGE=zoom # Extract the first word of "tput", so it can be a program name with args. --- 980,986 ---- PATH_SEPARATOR="$ac_path_separator" rm -f conftest.sh ! VERSION=1.0.1a PACKAGE=zoom # Extract the first word of "tput", so it can be a program name with args. *************** fi *** 6704,6710 **** echo "$as_me:6704: result: $ac_cv_lib_z_inflate" >&5 echo "${ECHO_T}$ac_cv_lib_z_inflate" >&6 if test $ac_cv_lib_z_inflate = yes; then ! LDFLAGS="$LDFLAGS -lz" fi echo "$as_me:6710: checking for png_get_IHDR in -lpng" >&5 --- 6704,6710 ---- echo "$as_me:6704: result: $ac_cv_lib_z_inflate" >&5 echo "${ECHO_T}$ac_cv_lib_z_inflate" >&6 if test $ac_cv_lib_z_inflate = yes; then ! LIBS="$LIBS -lz" fi echo "$as_me:6710: checking for png_get_IHDR in -lpng" >&5 *************** if test $ac_cv_lib_png_png_get_IHDR = ye *** 6762,6768 **** #define HAVE_LIBPNG 1 EOF ! LDFLAGS="$LDFLAGS -lpng" else --- 6762,6768 ---- #define HAVE_LIBPNG 1 EOF ! LIBS="$LIBS -lpng" else *************** fi *** 7244,7252 **** HAVE_T1LIB=0 if test "$WINDOW_SYSTEM" = "1"; then ! LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS" CFLAGS="$CFLAGS $X_CFLAGS" ! LDFLAGS="$LDFLAGS $X_PRE_LIBS -lX11" echo "$as_me:7251: checking for sin in -lm" >&5 echo $ECHO_N "checking for sin in -lm... $ECHO_C" >&6 --- 7244,7252 ---- HAVE_T1LIB=0 if test "$WINDOW_SYSTEM" = "1"; then ! LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS" CFLAGS="$CFLAGS $X_CFLAGS" ! LIBS="$LIBS -lX11" echo "$as_me:7251: checking for sin in -lm" >&5 echo $ECHO_N "checking for sin in -lm... $ECHO_C" >&6 *************** echo "$as_me:7356: result: $ac_cv_lib_t1 *** 7357,7363 **** echo "${ECHO_T}$ac_cv_lib_t1_T1_InitLib" >&6 if test $ac_cv_lib_t1_T1_InitLib = yes; then ! LDFLAGS="$LDFLAGS -lt1" echo "$as_me:7361: checking for T1_SetCharX in -lt1x" >&5 echo $ECHO_N "checking for T1_SetCharX in -lt1x... $ECHO_C" >&6 if test "${ac_cv_lib_t1x_T1_SetCharX+set}" = set; then --- 7357,7363 ---- echo "${ECHO_T}$ac_cv_lib_t1_T1_InitLib" >&6 if test $ac_cv_lib_t1_T1_InitLib = yes; then ! LIBS="$LIBS -lt1" echo "$as_me:7361: checking for T1_SetCharX in -lt1x" >&5 echo $ECHO_N "checking for T1_SetCharX in -lt1x... $ECHO_C" >&6 if test "${ac_cv_lib_t1x_T1_SetCharX+set}" = set; then *************** fi *** 7408,7414 **** echo "$as_me:7408: result: $ac_cv_lib_t1x_T1_SetCharX" >&5 echo "${ECHO_T}$ac_cv_lib_t1x_T1_SetCharX" >&6 if test $ac_cv_lib_t1x_T1_SetCharX = yes; then ! LDFLAGS="$LDFLAGS -lt1x"; HAVE_T1LIB=1 fi fi --- 7408,7414 ---- echo "$as_me:7408: result: $ac_cv_lib_t1x_T1_SetCharX" >&5 echo "${ECHO_T}$ac_cv_lib_t1x_T1_SetCharX" >&6 if test $ac_cv_lib_t1x_T1_SetCharX = yes; then ! LIBS="$LIBS -lt1x"; HAVE_T1LIB=1 fi fi *************** fi *** 7508,7514 **** echo "$as_me:7508: result: $ac_cv_lib_Xext_XdbeQueryExtension" >&5 echo "${ECHO_T}$ac_cv_lib_Xext_XdbeQueryExtension" >&6 if test $ac_cv_lib_Xext_XdbeQueryExtension = yes; then ! LDFLAGS="$LDFLAGS -lXext" fi echo "$as_me:7514: checking for the DBE X extension library" >&5 --- 7508,7514 ---- echo "$as_me:7508: result: $ac_cv_lib_Xext_XdbeQueryExtension" >&5 echo "${ECHO_T}$ac_cv_lib_Xext_XdbeQueryExtension" >&6 if test $ac_cv_lib_Xext_XdbeQueryExtension = yes; then ! LIBS="$LIBS -lXext" fi echo "$as_me:7514: checking for the DBE X extension library" >&5 *************** echo "$as_me:7608: result: $ac_cv_lib_Xf *** 7609,7615 **** echo "${ECHO_T}$ac_cv_lib_Xft_XftInit" >&6 if test $ac_cv_lib_Xft_XftInit = yes; then ! LDFLAGS="$LDFLAGS -lXft" HAVE_XFT=1 fi --- 7609,7615 ---- echo "${ECHO_T}$ac_cv_lib_Xft_XftInit" >&6 if test $ac_cv_lib_Xft_XftInit = yes; then ! LIBS="$LIBS -lXft" HAVE_XFT=1 fi *************** echo "$as_me:7709: result: $ac_cv_lib_Xr *** 7710,7716 **** echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderQueryExtension" >&6 if test $ac_cv_lib_Xrender_XRenderQueryExtension = yes; then ! LDFLAGS="$LDFLAGS -lXft" HAVE_XRENDER=1 fi --- 7710,7716 ---- echo "${ECHO_T}$ac_cv_lib_Xrender_XRenderQueryExtension" >&6 if test $ac_cv_lib_Xrender_XRenderQueryExtension = yes; then ! LIBS="$LIBS -lXrender" HAVE_XRENDER=1 fi *************** if test $ac_cv_lib_png_png_get_IHDR = ye *** 7815,7821 **** #define HAVE_LIBPNG 1 EOF ! LDFLAGS="$LDFLAGS -lpng" else --- 7815,7821 ---- #define HAVE_LIBPNG 1 EOF ! LIBS="$LIBS -lpng" else diff -pr zoom-1.0.1/configure.in zoom-1.0.1a/configure.in *** zoom-1.0.1/configure.in Sat Oct 19 22:17:11 2002 --- zoom-1.0.1a/configure.in Mon Nov 11 14:05:12 2002 *************** *** 2,8 **** AC_PREREQ(2.13) AC_INIT() ! VERSION=1.0.1 PACKAGE=zoom UTIL_DISPLAY_INIT() --- 2,8 ---- AC_PREREQ(2.13) AC_INIT() ! VERSION=1.0.1a PACKAGE=zoom UTIL_DISPLAY_INIT() *************** if test "$MINGW32" != "yes"; then *** 237,248 **** AC_MSG_ERROR([QuickTime not found (?)]) fi ! AC_CHECK_LIB(z, inflate, [ LDFLAGS="$LDFLAGS -lz" ]) AC_CHECK_LIB(png, png_get_IHDR, [ AC_DEFINE(HAVE_LIBPNG) ! LDFLAGS="$LDFLAGS -lpng" ], [ AC_MSG_WARN([libpng not detected: blecherous QuickTime alpha blending will be used (Ew)]) --- 237,248 ---- AC_MSG_ERROR([QuickTime not found (?)]) fi ! AC_CHECK_LIB(z, inflate, [ LIBS="$LIBS -lz" ]) AC_CHECK_LIB(png, png_get_IHDR, [ AC_DEFINE(HAVE_LIBPNG) ! LIBS="$LIBS -lpng" ], [ AC_MSG_WARN([libpng not detected: blecherous QuickTime alpha blending will be used (Ew)]) *************** AC_SUBST(BUILDERCC) *** 322,337 **** HAVE_T1LIB=0 if test "$WINDOW_SYSTEM" = "1"; then ! LIBS="$LIBS $X_LIBS $X_EXTRA_LIBS" CFLAGS="$CFLAGS $X_CFLAGS" ! LDFLAGS="$LDFLAGS $X_PRE_LIBS -lX11" AC_CHECK_LIB(m, sin) AC_CHECK_LIB(t1, T1_InitLib, [ ! LDFLAGS="$LDFLAGS -lt1" AC_CHECK_LIB(t1x, T1_SetCharX, ! [ LDFLAGS="$LDFLAGS -lt1x"; HAVE_T1LIB=1 ]) ]) if test "$HAVE_T1LIB" = "1"; then --- 322,337 ---- HAVE_T1LIB=0 if test "$WINDOW_SYSTEM" = "1"; then ! LIBS="$LIBS $X_PRE_LIBS $X_LIBS $X_EXTRA_LIBS" CFLAGS="$CFLAGS $X_CFLAGS" ! LIBS="$LIBS -lX11" AC_CHECK_LIB(m, sin) AC_CHECK_LIB(t1, T1_InitLib, [ ! LIBS="$LIBS -lt1" AC_CHECK_LIB(t1x, T1_SetCharX, ! [ LIBS="$LIBS -lt1x"; HAVE_T1LIB=1 ]) ]) if test "$HAVE_T1LIB" = "1"; then *************** if test "$WINDOW_SYSTEM" = "1"; then *** 348,354 **** ]) fi ! AC_CHECK_LIB(Xext, XdbeQueryExtension, [ LDFLAGS="$LDFLAGS -lXext" ]) AC_MSG_CHECKING([for the DBE X extension library]) AC_TRY_LINK( [ #include --- 348,354 ---- ]) fi ! AC_CHECK_LIB(Xext, XdbeQueryExtension, [ LIBS="$LIBS -lXext" ]) AC_MSG_CHECKING([for the DBE X extension library]) AC_TRY_LINK( [ #include *************** if test "$WINDOW_SYSTEM" = "1"; then *** 367,373 **** AC_CHECK_LIB(Xft, XftInit, [ ! LDFLAGS="$LDFLAGS -lXft" HAVE_XFT=1 ]) if test "$HAVE_XFT" = "1"; then --- 367,373 ---- AC_CHECK_LIB(Xft, XftInit, [ ! LIBS="$LIBS -lXft" HAVE_XFT=1 ]) if test "$HAVE_XFT" = "1"; then *************** if test "$WINDOW_SYSTEM" = "1"; then *** 386,392 **** AC_CHECK_LIB(Xrender, XRenderQueryExtension, [ ! LDFLAGS="$LDFLAGS -lXft" HAVE_XRENDER=1 ]) if test "$HAVE_XRENDER" = "1"; then --- 386,392 ---- AC_CHECK_LIB(Xrender, XRenderQueryExtension, [ ! LIBS="$LIBS -lXrender" HAVE_XRENDER=1 ]) if test "$HAVE_XRENDER" = "1"; then *************** if test "$WINDOW_SYSTEM" = "1"; then *** 406,412 **** AC_CHECK_LIB(png, png_get_IHDR, [ AC_DEFINE(HAVE_LIBPNG) ! LDFLAGS="$LDFLAGS -lpng" ], [ AC_MSG_WARN([libpng not detected: image support will be disabled]) --- 406,412 ---- AC_CHECK_LIB(png, png_get_IHDR, [ AC_DEFINE(HAVE_LIBPNG) ! LIBS="$LIBS -lpng" ], [ AC_MSG_WARN([libpng not detected: image support will be disabled]) diff -pr zoom-1.0.1/src/Makefile.am zoom-1.0.1a/src/Makefile.am *** zoom-1.0.1/src/Makefile.am Tue Aug 6 20:42:17 2002 --- zoom-1.0.1a/src/Makefile.am Mon Nov 11 14:05:45 2002 *************** endif *** 74,80 **** CFLAGS = @CFLAGS@ @X_CFLAGS@ -DDATADIR="\"${pkgdatadir}\"" OBJCFLAGS = @CFLAGS@ @X_CFLAGS@ -DDATADIR="\"${pkgdatadir}\"" ! LIBS = @LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ YFLAGS = -d debug.c: eval.h --- 74,80 ---- CFLAGS = @CFLAGS@ @X_CFLAGS@ -DDATADIR="\"${pkgdatadir}\"" OBJCFLAGS = @CFLAGS@ @X_CFLAGS@ -DDATADIR="\"${pkgdatadir}\"" ! LIBS = @LIBS@ YFLAGS = -d debug.c: eval.h diff -pr zoom-1.0.1/src/Makefile.in zoom-1.0.1a/src/Makefile.in *** zoom-1.0.1/src/Makefile.in Sat Oct 19 22:18:32 2002 --- zoom-1.0.1a/src/Makefile.in Mon Nov 11 14:06:24 2002 *************** zoom_SOURCES = \ *** 118,124 **** CFLAGS = @CFLAGS@ @X_CFLAGS@ -DDATADIR="\"${pkgdatadir}\"" OBJCFLAGS = @CFLAGS@ @X_CFLAGS@ -DDATADIR="\"${pkgdatadir}\"" ! LIBS = @LIBS@ @X_PRE_LIBS@ @X_LIBS@ @X_EXTRA_LIBS@ YFLAGS = -d subdir = src mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs --- 118,124 ---- CFLAGS = @CFLAGS@ @X_CFLAGS@ -DDATADIR="\"${pkgdatadir}\"" OBJCFLAGS = @CFLAGS@ @X_CFLAGS@ -DDATADIR="\"${pkgdatadir}\"" ! LIBS = @LIBS@ YFLAGS = -d subdir = src mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs diff -pr zoom-1.0.1/src/rc.c zoom-1.0.1a/src/rc.c *** zoom-1.0.1/src/rc.c Sun Oct 20 17:10:55 2002 --- zoom-1.0.1a/src/rc.c Sun Nov 3 14:10:32 2002 *************** rc_game* rc_defgame = NULL; *** 50,57 **** void rc_error(char* erm) { ! zmachine_warning("Error while parsing .zoomrc (line %i): %s", ! _rc_line, erm); } void rc_load(void) --- 50,57 ---- void rc_error(char* erm) { ! zmachine_info("Error while parsing .zoomrc (line %i): %s", ! _rc_line, erm); } void rc_load(void) diff -pr zoom-1.0.1/src/zoomrc zoom-1.0.1a/src/zoomrc *** zoom-1.0.1/src/zoomrc Tue Oct 1 21:47:45 2002 --- zoom-1.0.1a/src/zoomrc Sun Nov 3 14:06:43 2002 *************** *** 8,14 **** # !! IMPORTANT !! (Well, sort of) # The default zoomrc file now sets anti-aliasing to off by default, # because many people have reported problems with Xft's selection ! # of fonts. Blech. Reset to 'on' to get anti-aliasing back. default "%s (%i.%.6s.%04x)" { interpreter 3 --- 8,14 ---- # !! IMPORTANT !! (Well, sort of) # The default zoomrc file now sets anti-aliasing to off by default, # because many people have reported problems with Xft's selection ! # of fonts. Blech. Reset to 'yes' to get anti-aliasing back. default "%s (%i.%.6s.%04x)" { interpreter 3