-# Makefile.in --- xscreensaver, Copyright (c) 1999-2008 Jamie Zawinski.
+# Makefile.in --- xscreensaver, Copyright (c) 1999-2010 Jamie Zawinski.
# the `../configure' script generates `Makefile' from this file.
@SET_MAKE@
VPATH = @srcdir@
SHELL = /bin/sh
-SUBDIRS = utils driver hacks hacks/glx po
+SUBDIRS = utils driver hacks hacks/glx po
+#SUBDIRS = utils driver hacks hacks/glx
SUBDIRS2 = $(SUBDIRS) OSX
TARFILES = README README.hacking README.VMS INSTALL \
configure configure.in Makefile.in config.h.in \
# out options we don't use. Odds are good that this will fail with any version
# of autoconf other than the ones I've tried (2.12 and 2.13.)
#
+# NOTE: we now require autoconf 2.63 or earlier, because later versions have
+# the "Expanded-Before-Required" change and I can't make any sense of it.
+# If someone wants to send me a patch to make configure.in work with 2.64
+# or later, feel free. Personally, I can't be bothered.
+#
configure::
- autoconf
- autoheader
+ autoconf263
+ autoheader263
@TMP=configure.$$$$ ; \
echo "munging configure's --help message..." ; \
( perl -e ' \
cd $$DEST ; \
\
TMP=/tmp/xd.$$$$ ; \
- sed "s/xscreensaver-5\.[0-9][0-9ab]*/$$HEAD/g" download.html > $$TMP ; \
+ sed "s/xscreensaver-5\.[0-9][0-9ab]*/$$HEAD/g" download.html > $$TMP ; \
echo '' ; \
diff -U0 download.html $$TMP ; \
echo '' ; \
set -x ; \
rm $$OLDEST ; \
cvs remove $$OLDEST ; \
- else \
- set -x ; \
+ set +x ; \
fi ; \
done ; \
+ set -x ; \
cvs add -kb $$BNAME $$BNAME2 ; \
cat $$TMP > download.html ; \
rm -f $$TMP ; \