* Documentation/GNUmakefile (SUBDIRS): remove misc/ directory.
depth = ..
NAME = documentation
-SUBDIRS=user bibliography pictures topdocs windows
+SUBDIRS=user bibliography pictures topdocs
STEPMAKE_TEMPLATES=documentation texinfo tex
LOCALSTEPMAKE_TEMPLATES=lilypond ly
LILYPOND_BOOK_FLAGS=--extra-options '-e "(ly:set-option (quote internal-type-checking) \#t)"'
+++ /dev/null
-
-depth=../..
-
-EXTRA_DIST_FILES = LilyPond.ico $(wildcard *.patch)
-STEPMAKE_TEMPLATES=documentation texinfo
-
-include $(depth)/make/stepmake.make
-
-default: local-doc
-
-local-WWW:
-
+++ /dev/null
-\input texinfo @c -*-texinfo-*-
-@setfilename babysit.info
-@settitle Babysit Windows Install Wizard
-
-@node Top
-@top
-
-@chapter Babysit Windows Install Wizard
-
-If, after installing LilyPond, it doesn't run: don't panic -- don't
-complain. Our Q+A team has devised an easy and well tested solution.
-We advise you to reinstall Windows, and this time follow the
-instructions of the wizard minutely. You can't go wrong. Good luck!
-
-@example
-Desktop
- :Netscape(1) :Netscape(2)
-Netscape
- :Bookmarks(3) :www.lilypond.org(4)
- :Windows Unstable(5)
- :setup.exe(6)
-Netscape download
- Unknown file type
- :Save file(7)
-Save as
- :Drop-down(8) :Select Desktop(9)@footnote{
-You could save the file where the dialog box suggests, ie,
-the almost at random place wherever you happened to save some
-previous file, but we're not in the business of saving clicks,
-and chances are you can't find it lateron, so we don't do that.}
-Save as
- :Save(10)
-Save as
- C:\WINDOWS\Desktop\setup.exe already exist
- Do you want to replace it? :Yes(11)
-Desktop
- :setup.exe(12) :setup.exe(13)
-GNU LilyPond Setup
- Setup.exe version 2.40 :Next(14)
- :X(15) Install from internet :Next(16)
- Local Package Directory
- :Browse(17) :C:\tmp(18) :Ok(19)@footnote{
-You could download everything on the desktop, but that will
-clutter it to a degree that your helpdesk will
-probably tell you that you need to reinstall windows, so
-we don't do that.} :Next(20)
- Select install root directory
- C:/cygwin :Next(21)
- :X Direct internet connection(22) :Next(23)
- Select Download Site
- :http://appel.lilypond.org(24) :Next(25)
- Select Packages to install (all) :Next(26)@footnote{
-You can get a lot of @emph{additional free clicks} here,
-by deselecting some packages, but the installation would
-be broken if you don't install everything, so we don't do that.}
- :X Create Desktop Icon(27)
- :X Add to Start Menu(28) :Next(29)
- Installation Complete :Ok(30)
-Desktop
- :GNU LilyPond(31):GNU LilyPond(32)
-@end example
-
-
-@bye
+++ /dev/null
-\input texinfo @c -*-texinfo-*-
-@setfilename compiling.info
-@settitle Compiling LilyPond on Windows
-
-@html
-<!--- @@WEB-TITLE@@=Windows Compilation --->
-@end html
-
-@section Obtaining LilyPond
-
-The most convenient way of getting the LilyPond source, is to run
-@uref{http://cygwin.com/setup.exe,setup.exe} and check the
-@emph{source} option next to LilyPond in the Packages View dialogue window.
-
-You can get the latest version of LilyPond at
-@uref{ftp://ftp.lilypond.org/pub/LilyPond/,
-ftp://ftp.lilypond.org/pub/LilyPond/}.
-
-@section Windows build requirements
-You need the following packages to compile Lilypond on Windows (ie,
-for Cygwin).
-
-@table @code
-@item The GNU + Cygnus tools, 1.3.10 or newer.
-Check out the @uref{http://cygwin.com,Cygwin webpage}.
-You can get the latest version of the GNU + Cygnus tools from a Cygwin
-@uref{http://cygwin.com/mirrors.html,mirror site}.
-@end table
-
-@subsection Cross compiling
-
-These binaries are cross compiled for Windows on a GNU/Linux box using
-mknetrel. Get it from:
-@quotation
-@example
- cvs -d:pserver:anoncvs@@sources.redhat.com:/cvs/cygwin-apps co mknetrel
-@end example
-@end quotation
-
-If your distribution does not include a Cygwin cross building
-environment, you can quite easily create one using mknetrel.
-Apply the
-@uref{http://lilypond.org/cygwin/mknetnel/mknetrel-cross-tools.patch,
-mknetrel-cross-tools patch}, and read @file{CROSS-TOOLS}.
-
-Although mknetrel is well suited for this, the mknetrel maintainer
-does not see any reason to include this patch.
-
-You can also get
-@uref{http://lilypond.org/lilypond/cygwin/i386-gnu-linux-x-i686-pc-cygwin,
-precompiled binaries for GNU/Linux ix68}.
-
-@subsection Compiling on Windows
-
-Compiling on Windows should be possible, but how should we know? If
-you have any experiences you want to share, please do so at
-@uref{http://lilypond.org/wiki?CompilingOnWindows,Compiling on
-Windows}. Or write to one of the mailing lists.
-
-@section Windows installation specifics
-
-Installing LilyPond on Windows is similar to a unix installation, but
-needs a number of extra tricks. All code for these tricks can be
-found in LilyPond's mknetrel build script in the source package
-directory @file{cygwin/mknetrel} and @uref{../../cygwin/mknetrel,
-mknetrel:extra/lilypond}.
-
-@section The LilyPond Installer RIP
-
-As LilyPond is now included in the Cygwin distribution, the LilyPond
-installer is no more. Use Cygwin's
-@uref{http://cygwin.com/setup.exe,setup.exe}.
-
+++ /dev/null
-diff -purN --exclude=configure ../setup/ChangeLog ./ChangeLog
---- ../setup/ChangeLog Fri Jun 14 18:44:05 2002
-+++ ./ChangeLog Fri Jun 14 18:47:17 2002
-@@ -1,3 +1,16 @@
-+2002-03-19 Jan Nieuwenhuizen <janneke@gnu.org>
-+
-+ * Forward port patch to cvs -r setup-200206 -D20020614.
-+
-+ * desktop.cc: Remove spurious line breaks from etc_profile.
-+ (make_lily_bat): New function.
-+ (save_icon): Parametrize.
-+ (do_desktop_setup): LilyPond support; disable Cygwin support.
-+
-+ * res.rc: Adapt for LilyPond.
-+
-+ * ini.cc (fprintf): Cygwin -> GNU LilyPond
-+
- 2002-06-10 Robert Collins <rbtcollins@hotmail.com>
-
- * IniParseFindVisitor (IniParseFindVisitor::visitFile): Apply Max
-diff -purN --exclude=configure ../setup/bz2lib/configure.in ./bz2lib/configure.in
---- ../setup/bz2lib/configure.in Fri Jun 14 18:45:37 2002
-+++ ./bz2lib/configure.in Fri Jun 14 18:46:33 2002
-@@ -7,7 +7,7 @@ AC_CONFIG_AUX_DIR(../cfgaux)
- AM_INIT_AUTOMAKE(libbz2, 0.0)
- AM_MAINTAINER_MODE
-
--CPPFLAGS=-U_WIN32
-+CPPFLAGS="$CPPFLAGS -U_WIN32"
- AC_CANONICAL_HOST
- AC_PROG_CC
- AC_PROG_RANLIB
-diff -purN --exclude=configure ../setup/desktop.cc ./desktop.cc
---- ../setup/desktop.cc Fri Jun 14 12:51:31 2002
-+++ ./desktop.cc Fri Jun 14 18:46:40 2002
-@@ -87,9 +87,7 @@ static const char *etc_profile[] = {
- "done",
- "",
- "export MAKE_MODE=unix",
-- "export PS1='\\[\\033]0;\\w\\007",
-- "\\033[32m\\]\\u@\\h \\[\\033[33m\\w\\033[0m\\]",
-- "$ '",
-+ "export PS1='\\[\\033]0;\\w\\007\\033[32m\\]\\u@\\h \\[\\033[33m\\w\\033[0m\\]$ '",
- "",
- "cd \"$HOME\"",
- 0
-@@ -216,6 +214,34 @@ make_cygwin_bat ()
- }
-
- static void
-+make_lily_bat ()
-+{
-+ batname = backslash (cygpath ("/lilypond.bat"));
-+
-+ /* if the batch file exists, don't overwrite it */
-+ if (_access (batname.cstr_oneuse (), 0) == 0)
-+ return;
-+
-+ FILE *bat = fopen (batname.cstr_oneuse (), "wt");
-+ if (!bat)
-+ return;
-+
-+ fprintf (bat, "@echo off\n\n");
-+
-+ fprintf (bat, "%.2s\n", get_root_dir ().cstr_oneuse ());
-+ fprintf (bat, "chdir %s\n\n",
-+ backslash (get_root_dir () + "/bin").cstr_oneuse ());
-+
-+ if (_access (cygpath ("/usr/bin/rxvt").cstr_oneuse (), 0) == 0)
-+ fprintf (bat, "rxtv -e /bin/bash --login -i \n");
-+ else
-+ /* fprintf (bat, "bash --rcfile /bin/lilypond-profile\n"); */
-+ fprintf (bat, "bash --login -i\n");
-+
-+ fclose (bat);
-+}
-+
-+static void
- make_etc_profile ()
- {
- String fname = cygpath ("/etc/profile");
-@@ -309,13 +335,13 @@ make_passwd_group ()
- fprintf (p, "bin\\mkgroup -l > etc\\group\n");
- fclose (p);
- }
--
-+
- static void
--save_icon ()
-+save_icon (char const* iconfile, char const* iconres)
- {
-- iconname = backslash (cygpath ("/cygwin.ico"));
--
-- HRSRC rsrc = FindResource (NULL, "CYGWIN.ICON", "FILE");
-+ iconname = backslash (cygpath (iconfile));
-+
-+ HRSRC rsrc = FindResource (NULL, iconres, "FILE");
- if (rsrc == NULL)
- {
- fatal ("FindResource failed");
-@@ -335,12 +361,13 @@ save_icon ()
- static void
- do_desktop_setup ()
- {
-- save_icon ();
-+ save_icon ("/cygwin.ico", "CYGWIN.ICON");
-
- make_cygwin_bat ();
- make_etc_profile ();
- make_passwd_group ();
-
-+#if 0
- if (root_menu)
- {
- start_menu ("Cygwin Bash Shell", batname);
-@@ -349,6 +376,20 @@ do_desktop_setup ()
- if (root_desktop)
- {
- desktop_icon ("Cygwin", batname);
-+ }
-+#endif
-+
-+ save_icon ("/LilyPond.ico", "LILYPOND.ICON");
-+ make_lily_bat ();
-+
-+ if (root_menu)
-+ {
-+ start_menu ("GNU LilyPond Shell", batname);
-+ }
-+
-+ if (root_desktop)
-+ {
-+ desktop_icon ("GNU LilyPond", batname);
- }
- }
-
-diff -purN --exclude=configure ../setup/ini.cc ./ini.cc
---- ../setup/ini.cc Fri Jun 14 12:51:38 2002
-+++ ./ini.cc Fri Jun 14 18:46:40 2002
-@@ -310,7 +310,7 @@ fprintf (FILE * f, const char *fmt, ...)
- {
- *nl = 0;
- /*OutputDebugString (stderrbuf); */
-- MessageBox (0, buf, "Cygwin Setup", 0);
-+ MessageBox (0, buf, "GNU LilyPond Setup", 0);
- stderrbuf[0] = 0;
- }
-
-diff -purN --exclude=configure ../setup/msg.cc ./msg.cc
---- ../setup/msg.cc Fri Jun 14 12:51:46 2002
-+++ ./msg.cc Fri Jun 14 18:46:40 2002
-@@ -47,7 +47,7 @@ mbox (HWND owner, const char *name, int
-
- vsprintf (buf, fmt, args);
- log (LOG_PLAIN, String ("mbox ") + name + ": " + buf);
-- return MessageBox (owner, buf, "Cygwin Setup", type);
-+ return MessageBox (owner, buf, "GNU LilyPond Setup", type);
- }
-
- void
-diff -purN --exclude=configure ../setup/res.rc ./res.rc
---- ../setup/res.rc Fri Jun 14 12:51:55 2002
-+++ ./res.rc Fri Jun 14 18:46:40 2002
-@@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_U
-
- IDD_SOURCE DIALOG DISCARDABLE 0, 0, 317, 179
- STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
--CAPTION "Cygwin Setup"
-+CAPTION "GNU LilyPond Setup"
- FONT 8, "MS Sans Serif"
- BEGIN
- CONTROL "&Install from Internet",IDC_SOURCE_NETINST,"Button",
-@@ -39,7 +39,7 @@ BEGIN
- BS_AUTORADIOBUTTON | WS_TABSTOP,101,84,115,10
- CONTROL "Install from &Local Directory",IDC_SOURCE_CWD,"Button",
- BS_AUTORADIOBUTTON | WS_TABSTOP,101,99,115,10
-- ICON IDI_CYGWIN,IDC_STATIC,290,0,21,20
-+ ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
- CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
- 317,1
- LTEXT "Choose A Download Source",IDC_STATIC_HEADER_TITLE,7,0,
-@@ -50,13 +50,13 @@ END
-
- IDD_LOCAL_DIR DIALOG DISCARDABLE 0, 0, 317, 179
- STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
--CAPTION "Cygwin Setup"
-+CAPTION "GNU LilyPond Setup"
- FONT 8, "MS Sans Serif"
- BEGIN
- EDITTEXT IDC_LOCAL_DIR,58,83,165,15,ES_AUTOHSCROLL | WS_GROUP
- PUSHBUTTON "B&rowse...",IDC_LOCAL_DIR_BROWSE,223,83,34,14
- GROUPBOX "Local Package Directory",IDC_STATIC,53,67,210,45
-- ICON IDI_CYGWIN,IDC_STATIC,290,0,21,20
-+ ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
- CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
- 317,1
- LTEXT "Select a directory where you want Setup to store the installation files it downloads. The directory will be created if it does not already exist.",
-@@ -67,7 +67,7 @@ END
-
- IDD_ROOT DIALOG DISCARDABLE 0, 0, 317, 179
- STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
--CAPTION "Cygwin Setup"
-+CAPTION "GNU LilyPond Setup"
- FONT 8, "MS Sans Serif"
- BEGIN
- GROUPBOX "Root Directory",IDC_STATIC,5,50,305,40,WS_TABSTOP
-@@ -83,7 +83,7 @@ BEGIN
- WS_GROUP | WS_TABSTOP,170,120,90,8
- CONTROL "&Unix",IDC_ROOT_BINARY,"Button",BS_AUTORADIOBUTTON |
- WS_TABSTOP,170,135,90,8
-- ICON IDI_CYGWIN,IDC_STATIC,290,0,20,20
-+ ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
- CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
- 317,1
- LTEXT "Select the directory where you want to install Cygwin. Also choose a few installation parameters.",
-@@ -96,10 +96,10 @@ IDD_SITE DIALOG DISCARDABLE 0, 0, 317,
- STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
- WS_CAPTION | WS_SYSMENU
- EXSTYLE WS_EX_CONTROLPARENT
--CAPTION "Cygwin Setup"
-+CAPTION "GNU LilyPond Setup"
- FONT 8, "MS Sans Serif"
- BEGIN
-- ICON IDI_CYGWIN,IDC_STATIC,290,0,20,20
-+ ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
- LISTBOX IDC_URL_LIST,66,45,185,110,LBS_NOINTEGRALHEIGHT |
- LBS_EXTENDEDSEL | WS_VSCROLL | WS_HSCROLL | WS_GROUP |
- WS_TABSTOP
-@@ -119,7 +119,7 @@ END
-
- IDD_NET DIALOG DISCARDABLE 0, 0, 317, 179
- STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_CAPTION | WS_SYSMENU
--CAPTION "Cygwin Setup"
-+CAPTION "GNU LilyPond Setup"
- FONT 8, "MS Sans Serif"
- BEGIN
- CONTROL "&Direct Connection",IDC_NET_DIRECT,"Button",
-@@ -137,7 +137,7 @@ BEGIN
- NOT WS_GROUP
- RTEXT "Por&t",IDC_STATIC,85,125,30,12,SS_CENTERIMAGE | NOT
- WS_GROUP
-- ICON IDI_CYGWIN,IDC_STATIC,290,0,21,20
-+ ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
- CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
- 317,1
- LTEXT "Setup needs to know how you want it to connect to the internet. Choose the appropriate settings below.",
-@@ -149,7 +149,7 @@ END
- IDD_INSTATUS DIALOG DISCARDABLE 0, 0, 317, 179
- STYLE DS_MODALFRAME | DS_CENTER | WS_CHILD | WS_VISIBLE | WS_CAPTION |
- WS_SYSMENU
--CAPTION "Cygwin Setup"
-+CAPTION "GNU LilyPond Setup"
- FONT 8, "MS Sans Serif"
- BEGIN
- LTEXT "Installing...",IDC_INS_ACTION,45,55,205,8,NOT WS_GROUP
-@@ -164,7 +164,7 @@ BEGIN
- LTEXT "Package:",IDC_INS_BL_PACKAGE,45,100,47,8,NOT WS_GROUP
- LTEXT "Total:",IDC_INS_BL_TOTAL,45,115,48,8,NOT WS_GROUP
- LTEXT "Disk:",IDC_INS_BL_DISK,45,130,47,8,NOT WS_GROUP
-- ICON IDI_CYGWIN,IDC_STATIC,290,0,20,20
-+ ICON IDI_LILYPOND,IDC_STATIC,290,0,20,20
- CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
- 317,1
- LTEXT "This page displays the progress of the download or installation.",
-@@ -175,10 +175,10 @@ END
-
- IDD_PROXY_AUTH DIALOG DISCARDABLE 0, 0, 215, 95
- STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
--CAPTION "Cygwin Setup"
-+CAPTION "GNU LilyPond Setup"
- FONT 8, "MS Sans Serif"
- BEGIN
-- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
-+ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
- LTEXT "Proxy &User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
- WS_EX_RIGHT
- EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
-@@ -192,10 +192,10 @@ END
-
- IDD_NET_AUTH DIALOG DISCARDABLE 0, 0, 215, 95
- STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
--CAPTION "Cygwin Setup"
-+CAPTION "GNU LilyPond Setup"
- FONT 8, "MS Sans Serif"
- BEGIN
-- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
-+ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
- LTEXT "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
- WS_EX_RIGHT
- EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
-@@ -206,37 +206,34 @@ BEGIN
- DEFPUSHBUTTON "&OK",IDOK,100,75,45,15,WS_DISABLED
- PUSHBUTTON "Cancel",IDCANCEL,165,75,45,15
- END
--
- IDD_SPLASH DIALOG DISCARDABLE 0, 0, 317, 179
- STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
- WS_CAPTION | WS_SYSMENU
--CAPTION "Cygwin Setup"
-+CAPTION "GNU LilyPond Setup"
- FONT 8, "MS Sans Serif"
- BEGIN
-- ICON IDI_CYGWIN,IDC_STATIC,113,112,21,20,WS_GROUP
--# CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,0,95,178
-- LTEXT "Version (unknown)",IDC_VERSION,115,137,195,10
-- LTEXT "Cygwin Net Release Setup Program",
-+ ICON IDI_LILYPOND,IDC_STATIC,113,112,21,20,WS_GROUP
-+ CONTROL "",IDC_STATIC,"Static",SS_WHITERECT,0,0,95,178
-+ LTEXT "Version (1.4.12)",IDC_VERSION,115,137,195,10
-+ LTEXT "GNU LilyPond Setup Program",
- IDC_STATIC_WELCOME_TITLE,115,1,195,24
-- LTEXT "Copyright 2000, 2001 Red Hat Inc.",IDC_STATIC,115,150,
-- 195,8
-- LTEXT "http://sources.redhat.com/cygwin/",IDC_STATIC,115,162,
-- 195,8
-- LTEXT "This wizard will guide you through the installation and updating of the Cygwin environment and a plethora of GNU packages.",
-- IDC_STATIC,115,33,195,54
-+ LTEXT "Copyright (C) 2000, 2001, 2002 Red Hat Inc.",
-+ IDC_STATIC,115,138,195,8
-+ LTEXT " (C) 2001, 2002 Jan Nieuwenhuizen <janneke@gnu.org>",IDC_STATIC,115,150,195,8
-+ LTEXT "http://www.lilypond.org/cygwin/",IDC_STATIC,115,162,195,8
-+ LTEXT "This wizard will guide you through the installation and updating LilyPond and all other necessary Cygwin packages.",IDC_STATIC,115,33,195,54
- END
--
- IDD_DESKTOP DIALOG DISCARDABLE 0, 0, 317, 179
- STYLE DS_MODALFRAME | DS_3DLOOK | DS_CENTER | WS_CHILD | WS_VISIBLE |
- WS_CAPTION | WS_SYSMENU
--CAPTION "Cygwin Setup"
-+CAPTION "GNU LilyPond Setup"
- FONT 8, "MS Sans Serif"
- BEGIN
- CONTROL "Create icon on &Desktop",IDC_ROOT_DESKTOP,"Button",
- BS_AUTOCHECKBOX,108,78,100,8
- CONTROL "Add icon to &Start Menu",IDC_ROOT_MENU,"Button",
- BS_AUTOCHECKBOX,108,93,100,8
-- ICON IDI_CYGWIN,IDC_STATIC,290,0,21,20
-+ ICON IDI_LILYPOND,IDC_STATIC,290,0,21,20
- CONTROL "",IDC_STATIC,"Static",SS_BLACKFRAME | SS_SUNKEN,0,28,
- 317,1
- LTEXT "Tell setup if you want it to create a few icons for convenient access to the Cygwin environment.",
-@@ -247,10 +244,10 @@ END
-
- IDD_FTP_AUTH DIALOG DISCARDABLE 0, 0, 215, 95
- STYLE DS_MODALFRAME | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU
--CAPTION "Cygwin Setup"
-+CAPTION "GNU LilyPond Setup"
- FONT 8, "MS Sans Serif"
- BEGIN
-- ICON IDI_CYGWIN,IDC_STATIC,5,5,20,20
-+ ICON IDI_LILYPOND,IDC_STATIC,5,5,20,20
- LTEXT "&User ID",IDC_STATIC,5,28,55,15,SS_CENTERIMAGE,
- WS_EX_RIGHT
- EDITTEXT IDC_NET_USER,65,28,145,12,ES_AUTOHSCROLL
-@@ -265,7 +262,7 @@ END
- IDD_CHOOSE DIALOG DISCARDABLE 0, 0, 317, 179
- STYLE DS_MODALFRAME | DS_3DLOOK | WS_CHILD | WS_VISIBLE | WS_CAPTION |
- WS_SYSMENU
--CAPTION "Cygwin Setup"
-+CAPTION "GNU LilyPond Setup"
- FONT 8, "MS Sans Serif"
- BEGIN
- CONTROL "&Prev",IDC_CHOOSE_PREV,"Button",BS_AUTORADIOBUTTON |
-@@ -279,7 +276,7 @@ BEGIN
- 317,1
- CONTROL "",IDC_LISTVIEW_POS,"Static",SS_BLACKFRAME | NOT
- WS_VISIBLE,7,41,303,134
-- ICON IDI_CYGWIN,IDC_STATIC,290,0,20,20
-+ ICON IDI_LILYPOND,IDC_STATIC,290,0,20,20
- LTEXT "Select the packages you want setup to install.",
- IDC_STATIC,21,9,239,16,NOT WS_GROUP
- LTEXT "Select Packages",IDC_STATIC_HEADER_TITLE,7,0,258,8,NOT
-@@ -323,6 +320,7 @@ END
-
- // Icon with lowest ID value placed first to ensure application icon
- // remains consistent on all systems.
-+IDI_LILYPOND ICON DISCARDABLE "LilyPond.ico"
- IDI_CYGWIN ICON DISCARDABLE "cygwin.ico"
-
- /////////////////////////////////////////////////////////////////////////////
-@@ -330,6 +328,7 @@ IDI_CYGWIN ICON DISCARDA
- // FILE
- //
-
-+LILYPOND.ICON FILE DISCARDABLE "LilyPond.ico"
- CYGWIN.ICON FILE DISCARDABLE "cygwin.ico"
-
- /////////////////////////////////////////////////////////////////////////////
-@@ -434,7 +433,7 @@ STRINGTABLE DISCARDABLE
- BEGIN
- IDS_ROOT_SLASH "Warning: we recommend you do NOT use the root of your hard drive as the cygwin root. Proceed anyway?"
- IDS_ROOT_SPACE "You should not choose a root path that include spaces in directory names. Proceed anyway?"
-- IDS_MIRROR_LST "http://sources.redhat.com/cygwin/mirrors.lst"
-+ IDS_MIRROR_LST "http://www.lilypond.org/cygwin/mirrors.lst"
- IDS_DIALOG_FAILED "Unable to create Dialog Box"
- IDS_CYGWIN_FUNC_MISSING "Error: unable to find function `%s' in %s"
- IDS_DOWNLOAD_SHORT "Download error: %s too short (%d, wanted %d)"
-@@ -443,7 +442,7 @@ BEGIN
- IDS_OLD_SETUPINI "This setup.ini is older than the one you used last time you installed cygwin. Proceed anyway?"
- IDS_ERR_RENAME "Can't rename %s to %s: %s"
- IDS_NOTHING_INSTALLED "Nothing needed to be installed"
-- IDS_INSTALL_COMPLETE "Installation Complete"
-+ IDS_INSTALL_COMPLETE "Installation Complete. See http://www.lilypond.org/cygwin/ for support."
- IDS_REBOOT_REQUIRED "In-use files have been replaced. You need to reboot as soon as possible to activate the new versions. Cygwin may operate incorrectly until you reboot."
- END
-
-diff -purN --exclude=configure ../setup/resource.h ./resource.h
---- ../setup/resource.h Fri Jun 14 12:51:55 2002
-+++ ./resource.h Fri Jun 14 18:46:40 2002
-@@ -50,13 +50,14 @@
- #define IDB_SPIN 118
- #define IDB_RTARROW 119
- #define IDI_SPIN 120
--#define IDI_CYGWIN 121
-+#define IDI_LILYPOND 121
- #define IDD_LOCAL_DIR 122
- #define IDB_CHECK_YES 123
- #define IDB_CHECK_NO 124
- #define IDB_CHECK_NA 125
- #define IDD_FTP_AUTH 126
- #define IDD_CHOOSER 127
-+#define IDI_CYGWIN 128
- #define IDC_SOURCE_DOWNLOAD 1000
- #define IDC_SOURCE_NETINST 1001
- #define IDC_SOURCE_CWD 1002
+++ /dev/null
-diff -urN ../guile-1.4/ChangeLog ./ChangeLog
---- ../guile-1.4/ChangeLog Fri Jun 2 15:17:01 2000
-+++ ./ChangeLog Mon Jun 5 15:18:32 2000
-@@ -1,3 +1,12 @@
-+2000-06-05 <janneke@gnu.org>
-+
-+ * guile-config/cross-guile-config.in: Simple shell script to
-+ take over guile-config's functionality for cross-compilation.
-+ It will be installed as ${target}-guile-config.
-+
-+ * guile-config/Makefile.am: Provide for cross-guile-config.in
-+ and its targets.
-+
- 2000-06-21 Mikael Djurfeldt <mdj@thalamus.nada.kth.se>
-
- * Guile 1.4 released.
-diff -urN ../guile-1.4/configure.in ./configure.in
---- ../guile-1.4/configure.in Fri Jun 2 08:44:27 2000
-+++ ./configure.in Mon Jun 5 15:13:58 2000
-@@ -21,6 +21,7 @@
- dnl Boston, MA 02111-1307, USA.
-
- AC_INIT(Makefile.in)
-+AC_CANONICAL_SYSTEM
- . $srcdir/GUILE-VERSION
- AM_INIT_AUTOMAKE($PACKAGE, $VERSION, no-define)
- AM_MAINTAINER_MODE
-diff -urN ../guile-1.4/guile-config/Makefile.am ./guile-config/Makefile.am
---- ../guile-1.4/guile-config/Makefile.am Wed Jan 12 22:42:41 2000
-+++ ./guile-config/Makefile.am Mon Jun 5 15:17:37 2000
-@@ -20,9 +20,9 @@
- ## to the Free Software Foundation, Inc., 59 Temple Place, Suite
- ## 330, Boston, MA 02111-1307 USA
-
--bin_SCRIPTS=guile-config
--CLEANFILES=guile-config
--EXTRA_DIST=guile-config.in guile.m4
-+bin_SCRIPTS=guile-config @target@-guile-config
-+CLEANFILES=guile-config @target@-guile-config
-+EXTRA_DIST=guile-config.in guile.m4 cross-guile-config.in
-
- ## FIXME: in the future there will be direct automake support for
- ## doing this. When that happens, switch over.
-@@ -39,6 +39,21 @@
- -e s:@-GUILE_VERSION-@:${GUILE_VERSION}:
- chmod +x guile-config.tmp
- mv guile-config.tmp guile-config
-+
-+LDFLAGS=@LDFLAGS@
-+CFLAGS=@CFLAGS@
-+CPPFLAGS=@CPPFLAGS@
-+
-+@target@-guile-config: cross-guile-config.in
-+ rm -f $<.tmp
-+ sed < ${srcdir}/$< > $<.tmp \
-+ -e s:@-SHELL-@:${SHELL}: \
-+ -e s:@-GUILE_VERSION-@:${GUILE_VERSION}:\
-+ -e s:@-PREFIX-@:${prefix}: \
-+ -e "s:@-CPPFLAGS-@:${CPPFLAGS}:" \
-+ -e "s:@-LDFLAGS-@:${LDFLAGS}:"
-+ chmod +x $<.tmp
-+ mv $<.tmp $@
-
- ## Get rid of any copies of the configuration script under the old
- ## name, so people don't end up running ancient copies of it.
-diff -urN ../guile-1.4/guile-config/cross-guile-config.in ./guile-config/cross-guile-config.in
---- ../guile-1.4/guile-config/cross-guile-config.in Thu Jan 1 01:00:00 1970
-+++ ./guile-config/cross-guile-config.in Mon Jun 5 15:13:58 2000
-@@ -0,0 +1,16 @@
-+#!@-SHELL-@
-+# target-guile-config.in
-+case $1 in
-+ --version)
-+ echo "@-GUILE_VERSION-@"
-+ exit 0
-+ ;;
-+ compile)
-+ echo "@-CPPFLAGS-@"
-+ exit 0
-+ ;;
-+ link)
-+ echo "-lguile @-LDFLAGS-@"
-+ exit 0
-+ ;;
-+esac
+++ /dev/null
-diff -purN /home/fred/usr/src/guile-1.5.6/CYGWIN-PATCHES/README ./CYGWIN-PATCHES/README
---- /home/fred/usr/src/guile-1.5.6/CYGWIN-PATCHES/README Thu Jan 1 01:00:00 1970
-+++ ./CYGWIN-PATCHES/README Thu Jul 4 12:07:01 2002
-@@ -0,0 +1,59 @@
-+Guile
-+------------------------------------------
-+The GNU extension language and Scheme interpreter.
-+
-+Runtime requirements:
-+ cygwin-1.3.10 or newer
-+ libguile14
-+
-+Build requirements:
-+ cygwin-1.3.10 or newer
-+ binutils-20011102 or newer
-+ gcc-2.95.3-5 or newer
-+ autoconf CVS (20020703) or newer,
-+ autoconf-devel-2.53a-1 should be ok.
-+ automake CVS (20020703) or newer,
-+ automake-devel-1.6.1-3 should be ok.
-+ libtool CVS (20020703) or newer,
-+ libtool-devel-20020502-2 should be ok.
-+
-+Canonical homepage:
-+ http://www.gnu.org/software/guile/
-+
-+Canonical download:
-+ ftp://ftp.gnu.org/pub/gnu/guile/
-+
-+------------------------------------
-+
-+Build instructions:
-+
-+ unpack guile-1.5.6-1-src.tar.bz2
-+ if you use setup to install this src package, it will be
-+ unpacked under /usr/src automatically
-+ cd /usr/src
-+ DISTDIR=/usr/src ./guile-1.5.6-1.sh
-+
-+This will create:
-+ $DISTDIR/guile/guile-1.5.6-1-orig.tar.bz2
-+ $DISTDIR/guile/guile-1.5.6-1-src.tar.bz2
-+ $DISTDIR/guile/guile-1.5.6-1.tar.bz2
-+ $DISTDIR/guile/guile-doc/guile-doc-1.5.6-1.tar.bz2
-+ $DISTDIR/guile/libguile14-dev/libguile14-dev-1.5.6-1.tar.bz2
-+ $DISTDIR/guile/libguile14/libguile14-1.5.6-1.tar.bz2
-+
-+------------------
-+
-+Port notes:
-+
-+ Patches with Cygwin compile fixes and cross building fixes have
-+ been sent upstream.
-+
-+ These packages were built on GNU/Linux using cross building and
-+ packaging scripts:
-+
-+ http://lilypond.org/cygwin/cygwin-cross-1.3.10.2.tar.gz
-+
-+ Jan Nieuwenhuizen
-+ janneke@gnu.org
-+
-+Cygwin port maintained by: Jan Nieuwenhuizen <janneke@gnu.org>
-diff -purN /home/fred/usr/src/guile-1.5.6/CYGWIN-PATCHES/changelog ./CYGWIN-PATCHES/changelog
---- /home/fred/usr/src/guile-1.5.6/CYGWIN-PATCHES/changelog Thu Jan 1 01:00:00 1970
-+++ ./CYGWIN-PATCHES/changelog Thu Jul 4 11:29:43 2002
-@@ -0,0 +1,9 @@
-+guile (1.5.6-1) unstable; urgency=low
-+
-+ * Initial Release.
-+
-+ -- Jan Nieuwenhuizen <janneke@gnu.org> Thu, 3 Jul 2002 04:28:07 +0200
-+
-+Local variables:
-+mode: debian-changelog
-+End:
-diff -purN /home/fred/usr/src/guile-1.5.6/CYGWIN-PATCHES/guile-doc.hint ./CYGWIN-PATCHES/guile-doc.hint
---- /home/fred/usr/src/guile-1.5.6/CYGWIN-PATCHES/guile-doc.hint Thu Jan 1 01:00:00 1970
-+++ ./CYGWIN-PATCHES/guile-doc.hint Thu Jul 4 12:19:13 2002
-@@ -0,0 +1,8 @@
-+sdesc: "The GNU extension language and Scheme interpreter (documentation)"
-+category: doc
-+requires: cygwin
-+ldesc: "The GNU extension language and Scheme interpreter (documentation)
-+This package contains the documentation for guile, including both
-+a reference manual (via `info guile'), and a tutorial (via `info
-+guile-tut')."
-+
-diff -purN /home/fred/usr/src/guile-1.5.6/CYGWIN-PATCHES/guile.hint ./CYGWIN-PATCHES/guile.hint
---- /home/fred/usr/src/guile-1.5.6/CYGWIN-PATCHES/guile.hint Thu Jan 1 01:00:00 1970
-+++ ./CYGWIN-PATCHES/guile.hint Thu Jul 4 12:11:15 2002
-@@ -0,0 +1,12 @@
-+sdesc: "The GNU extension language and Scheme interpreter (executable)"
-+category: interpreters
-+requires: cygwin libguile14
-+ldesc: "The GNU extension language and Scheme interpreter (executable)
-+Guile, the GNU Ubiquitous Intelligent Language for Extension, is a scheme
-+implementation designed for real world programming, supporting a
-+rich Unix interface, a module system, and undergoing rapid development.
-+
-+`guile' is a scheme interpreter that can execute scheme scripts (with a
-+#! line at the top of the file), or run as an inferior scheme
-+process inside Emacs."
-+
-diff -purN /home/fred/usr/src/guile-1.5.6/CYGWIN-PATCHES/libguile14-dev.hint ./CYGWIN-PATCHES/libguile14-dev.hint
---- /home/fred/usr/src/guile-1.5.6/CYGWIN-PATCHES/libguile14-dev.hint Thu Jan 1 01:00:00 1970
-+++ ./CYGWIN-PATCHES/libguile14-dev.hint Thu Jul 4 12:20:28 2002
-@@ -0,0 +1,8 @@
-+sdesc: "Development headers and static libraries for Guile."
-+category: development libs
-+requires: cygwin
-+ldesc: "Development headers and static libraries for Guile.
-+`libguile.h' etc. C headers, aclocal macros, the `guile-snarf' and
-+`guile-config' utilities, and static `libguile.a' libraries for Guile,
-+the GNU Ubiquitous Intelligent Language for Extension."
-+
-diff -purN /home/fred/usr/src/guile-1.5.6/CYGWIN-PATCHES/libguile14.hint ./CYGWIN-PATCHES/libguile14.hint
---- /home/fred/usr/src/guile-1.5.6/CYGWIN-PATCHES/libguile14.hint Thu Jan 1 01:00:00 1970
-+++ ./CYGWIN-PATCHES/libguile14.hint Thu Jul 4 12:17:19 2002
-@@ -0,0 +1,7 @@
-+sdesc: "The GNU extension language and Scheme interpreter (runtime libraries)"
-+category: libs
-+requires: cygwin
-+ldesc: "The GNU extension language and Scheme interpreter (runtime libraries)
-+Guile shared object libraries and the ice-9 scheme module. Guile is
-+the GNU Ubiquitous Intelligent Language for Extension."
-+
-diff -purN /home/fred/usr/src/guile-1.5.6/am/ChangeLog ./am/ChangeLog
---- /home/fred/usr/src/guile-1.5.6/am/ChangeLog Sun Mar 3 21:34:07 2002
-+++ ./am/ChangeLog Thu Jul 4 03:28:08 2002
-@@ -1,3 +1,8 @@
-+2002-07-03 Jan Nieuwenhuizen <janneke@gnu.org>
-+
-+ * pre-inst-guile (preinstguile): Initialize with
-+ $(GUILE_FOR_BUILD) configure parameter.
-+
- 2002-03-03 Rob Browning <rlb@defaultvalue.org>
-
- * .cvsignore: add Makefile and Makefile.in.
-diff -purN /home/fred/usr/src/guile-1.5.6/am/pre-inst-guile ./am/pre-inst-guile
---- /home/fred/usr/src/guile-1.5.6/am/pre-inst-guile Tue Feb 26 12:12:18 2002
-+++ ./am/pre-inst-guile Thu Jul 4 03:25:45 2002
-@@ -28,7 +28,7 @@
-
- ## Code:
-
--preinstguile = $(top_builddir_absolute)/pre-inst-guile
-+preinstguile = $(GUILE_FOR_BUILD)
- preinstguiletool = GUILE="$(preinstguile)" $(top_srcdir)/scripts
-
- ## am/pre-inst-guile ends here
-diff -purN /home/fred/usr/src/guile-1.5.6/configure.in ./configure.in
---- /home/fred/usr/src/guile-1.5.6/configure.in Tue Mar 5 00:24:38 2002
-+++ ./configure.in Thu Jul 4 04:05:56 2002
-@@ -20,7 +20,7 @@ dnl along with GUILE; see the file COPY
- dnl Free Software Foundation, Inc., 59 Temple Place - Suite 330,
- dnl Boston, MA 02111-1307, USA.
-
--AC_PREREQ(2.50)
-+AC_PREREQ(2.53)
-
- AC_INIT
- AC_CONFIG_SRCDIR([Makefile.in])
-@@ -51,22 +51,26 @@ AC_ARG_ENABLE(error-on-warning,
- *) AC_MSG_ERROR(bad value ${enableval} for --enable-error-on-warning) ;;
- esac])
-
-+
- AC_ARG_ENABLE(debug-freelist,
- [ --enable-debug-freelist include garbage collector freelist debugging code],
- if test "$enable_debug_freelist" = y || test "$enable_debug_freelist" = yes; then
-- AC_DEFINE(GUILE_DEBUG_FREELIST)
-+ AC_DEFINE(GUILE_DEBUG_FREELIST, 1,
-+ [Define this if you want to debug the free list (helps w/ GC bugs).])
- fi)
-
- AC_ARG_ENABLE(debug-malloc,
- [ --enable-debug-malloc include malloc debugging code],
- if test "$enable_debug_malloc" = y || test "$enable_debug_malloc" = yes; then
-- AC_DEFINE(GUILE_DEBUG_MALLOC)
-+ AC_DEFINE(GUILE_DEBUG_MALLOC, 1,
-+ [Define this if you want to debug scm_must_malloc/realloc/free calls.])
- fi)
-
- AC_ARG_ENABLE(guile-debug,
- [ --enable-guile-debug include internal debugging functions],
- if test "$enable_guile_debug" = y || test "$enable_guile_debug" = yes; then
-- AC_DEFINE(GUILE_DEBUG)
-+ AC_DEFINE(GUILE_DEBUG, 1,
-+ [Define this to include various undocumented functions used to debug.])
- fi)
-
- AC_ARG_ENABLE(arrays,
-@@ -110,6 +114,10 @@ AM_CONDITIONAL(HTMLDOC, test x$htmldoc_e
- AC_ARG_ENABLE(deprecated,
- [ --disable-deprecated omit deprecated features [no]])
-
-+
-+AH_TEMPLATE([SCM_DEBUG_DEPRECATED],
-+ [Define this if you want to exclude deprecated features.])
-+
- if test "$enable_deprecated" = no; then
- AC_DEFINE(SCM_DEBUG_DEPRECATED, 1)
- else
-@@ -121,34 +129,17 @@ else
- warn_default=$enable_deprecated
- fi
- AC_DEFINE(SCM_DEBUG_DEPRECATED, 0)
-- AC_DEFINE_UNQUOTED(SCM_WARN_DEPRECATED_DEFAULT, "$warn_default")
-+ AC_DEFINE_UNQUOTED(SCM_WARN_DEPRECATED_DEFAULT, "$warn_default",
-+ [Define this to control the default warning level for deprecated features.])
- fi
-
- dnl The --disable-debug used to control these two. But now they are
- dnl a required part of the distribution.
--AC_DEFINE(DEBUG_EXTENSIONS)
--AC_DEFINE(READER_EXTENSIONS)
-+AC_DEFINE(DEBUG_EXTENSIONS, 1,
-+ [Define if you want support for debugging Scheme programs.])
-+AC_DEFINE(READER_EXTENSIONS, 1,
-+ [Define if you want support for debugging Scheme programs.])
-
--dnl files which are destined for separate modules.
--
--if test "$enable_arrays" = yes; then
-- LIBOBJS="$LIBOBJS ramap.o unif.o"
-- AC_DEFINE(HAVE_ARRAYS)
--fi
--
--if test "$enable_posix" = yes; then
-- LIBOBJS="$LIBOBJS filesys.o posix.o"
-- AC_DEFINE(HAVE_POSIX)
--fi
--
--if test "$enable_networking" = yes; then
-- LIBOBJS="$LIBOBJS net_db.o socket.o"
-- AC_DEFINE(HAVE_NETWORKING)
--fi
--
--if test "$enable_debug_malloc" = yes; then
-- LIBOBJS="$LIBOBJS debug-malloc.o"
--fi
-
- #--------------------------------------------------------------------
-
-@@ -164,11 +155,42 @@ AC_ISC_POSIX
- AC_MINIX
-
- AM_PROG_CC_STDC
-+
-+## Needed for building DLLs on Cygwin, before AM_PROG_LIBTOOL
-+AC_LIBTOOL_WIN32_DLL
- AM_PROG_LIBTOOL
-
- AC_CHECK_PROG(have_makeinfo, makeinfo, yes, no)
- AM_CONDITIONAL(HAVE_MAKEINFO, test "$have_makeinfo" = yes)
-
-+dnl files which are destined for separate modules.
-+
-+if test "$enable_arrays" = yes; then
-+ AC_LIBOBJ([ramap])
-+ AC_LIBOBJ([unif])
-+ AC_DEFINE(HAVE_ARRAYS, 1,
-+ [Define this if you want support for arrays and uniform arrays.])
-+fi
-+
-+if test "$enable_posix" = yes; then
-+ AC_LIBOBJ([filesys])
-+ AC_LIBOBJ([posix])
-+ AC_DEFINE(HAVE_POSIX, 1,
-+ [Define this if you want support for POSIX system calls in Guile.])
-+fi
-+
-+if test "$enable_networking" = yes; then
-+ AC_LIBOBJ([net_db])
-+ AC_LIBOBJ([socket])
-+ AC_DEFINE(HAVE_NETWORKING, 1,
-+ [Define this if you want support for networking in Guile.])
-+fi
-+
-+if test "$enable_debug_malloc" = yes; then
-+ AC_LIBOBJ([debug-malloc])
-+fi
-+
-+
- AC_C_CONST
- AC_C_INLINE
- AC_C_BIGENDIAN
-@@ -190,7 +212,7 @@ AC_CACHE_CHECK([for long longs], scm_cv_
- scm_cv_long_longs=yes,
- scm_cv_long_longs=no))
- if test "$scm_cv_long_longs" = yes; then
-- AC_DEFINE(HAVE_LONG_LONGS)
-+ AC_DEFINE(HAVE_LONG_LONGS, 1, [Define if the compiler supports long longs.])
- AC_CHECK_SIZEOF(long long)
- fi
-
-@@ -230,7 +252,8 @@ use_modules="$withval")
- test -z "$use_modules" && use_modules=yes
- DLPREOPEN=
- if test "$use_modules" != no; then
-- AC_DEFINE(DYNAMIC_LINKING)
-+ AC_DEFINE(DYNAMIC_LINKING, 1,
-+ [Define if you want support for dynamic linking.])
- if test "$use_modules" = yes; then
- DLPREOPEN="-dlpreopen force"
- else
-@@ -263,7 +286,8 @@ AC_DEFUN(GUILE_FUNC_DECLARED, [
- guile_cv_func_$1_declared=yes,
- guile_cv_func_$1_declared=no))
- if test [x$guile_cv_func_]$1[_declared] = xno; then
-- AC_DEFINE([MISSING_]translit($1, [a-z], [A-Z])[_DECL])
-+ AC_DEFINE([MISSING_]translit($1, [a-z], [A-Z])[_DECL], 1,
-+ [Define if the operating system supplies $1 without declaring it.])
- fi
- ])
-
-@@ -280,13 +304,15 @@ AC_CACHE_CHECK([return type of usleep],
- [guile_cv_func_usleep_return_type=int])])
- case "$guile_cv_func_usleep_return_type" in
- "void" )
-- AC_DEFINE(USLEEP_RETURNS_VOID)
-+ AC_DEFINE(USLEEP_RETURNS_VOID, 1,
-+ [Define if the system headers declare usleep to return void.])
- ;;
- esac
-
- AC_CHECK_HEADER(sys/un.h, have_sys_un_h=1)
- if test -n "$have_sys_un_h" ; then
--AC_DEFINE(HAVE_UNIX_DOMAIN_SOCKETS)
-+ AC_DEFINE(HAVE_UNIX_DOMAIN_SOCKETS, 1,
-+ [Define if the system supports Unix-domain (file-domain) sockets.])
- fi
-
- AC_CHECK_FUNCS(socketpair getgroups setpwent pause tzset)
-@@ -309,7 +335,7 @@ AC_CACHE_VAL(guile_cv_have_h_errno,
- guile_cv_have_h_errno=yes, guile_cv_have_h_errno=no)])
- AC_MSG_RESULT($guile_cv_have_h_errno)
- if test $guile_cv_have_h_errno = yes; then
-- AC_DEFINE(HAVE_H_ERRNO)
-+ AC_DEFINE(HAVE_H_ERRNO, 1, [Define if h_errno is declared in netdb.h.])
- fi
-
- AC_MSG_CHECKING(whether uint32_t is defined)
-@@ -320,29 +346,39 @@ AC_CACHE_VAL(guile_cv_have_uint32_t,
- guile_cv_have_uint32_t=yes, guile_cv_have_uint32_t=no)])
- AC_MSG_RESULT($guile_cv_have_uint32_t)
- if test $guile_cv_have_uint32_t = yes; then
-- AC_DEFINE(HAVE_UINT32_T)
-+ AC_DEFINE(HAVE_UINT32_T, 1,
-+ [Define if uint32_t typedef is defined when netdb.h is include.])
- fi
-
- AC_MSG_CHECKING(for working IPv6 support)
- AC_CACHE_VAL(guile_cv_have_ipv6,
--[AC_TRY_COMPILE([#include <netinet/in.h>
-+[AC_TRY_COMPILE([
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+#include <netinet/in.h>
- #include <sys/socket.h>],
- [struct sockaddr_in6 a; a.sin6_family = AF_INET6;],
- guile_cv_have_ipv6=yes, guile_cv_have_ipv6=no)])
- AC_MSG_RESULT($guile_cv_have_ipv6)
- if test $guile_cv_have_ipv6 = yes; then
-- AC_DEFINE(HAVE_IPV6)
-+ AC_DEFINE(HAVE_IPV6, 1, [Define if you want support for IPv6.])
- fi
-
- # included in rfc2553 but not in older implementations, e.g., glibc 2.1.3.
- AC_MSG_CHECKING(whether sockaddr_in6 has sin6_scope_id)
- AC_CACHE_VAL(guile_cv_have_sin6_scope_id,
--[AC_TRY_COMPILE([#include <netinet/in.h>],
-+[AC_TRY_COMPILE([
-+#ifdef HAVE_SYS_TYPES_H
-+#include <sys/types.h>
-+#endif
-+#include <netinet/in.h>],
- [struct sockaddr_in6 sok; sok.sin6_scope_id = 0;],
- guile_cv_have_sin6_scope_id=yes, guile_cv_have_sin6_scope_id=no)])
- AC_MSG_RESULT($guile_cv_have_sin6_scope_id)
- if test $guile_cv_have_sin6_scope_id = yes; then
-- AC_DEFINE(HAVE_SIN6_SCOPE_ID)
-+ AC_DEFINE(HAVE_SIN6_SCOPE_ID, 1,
-+ [Define this if your IPv6 has sin6_scope_id in sockaddr_in6 struct.])
- fi
-
- AC_MSG_CHECKING(whether localtime caches TZ)
-@@ -389,7 +425,7 @@ else
- fi])dnl
- AC_MSG_RESULT($guile_cv_localtime_cache)
- if test $guile_cv_localtime_cache = yes; then
-- AC_DEFINE(LOCALTIME_CACHE)
-+ AC_DEFINE(LOCALTIME_CACHE, 1, [Define if localtime caches the TZ setting.])
- fi
-
- dnl Test whether system calls are restartable by default on the
-@@ -408,15 +444,15 @@ if test "$enable_regex" = yes; then
- if test "$ac_cv_header_regex_h" = yes ||
- test "$ac_cv_header_rxposix_h" = yes ||
- test "$ac_cv_header_rx_rxposix_h" = yes; then
-- GUILE_NAMED_CHECK_FUNC(regcomp, norx, [LIBOBJS="regex-posix.o $LIBOBJS"],
-- [AC_CHECK_LIB(rx, main)
-- GUILE_NAMED_CHECK_FUNC(regcomp, rx, [LIBOBJS="regex-posix.o $LIBOBJS"])]
-- )
-+ GUILE_NAMED_CHECK_FUNC(regcomp, norx, [AC_LIBOBJ([regex-posix])],
-+ [AC_CHECK_LIB(rx, main)
-+ GUILE_NAMED_CHECK_FUNC(regcomp, rx, [AC_LIBOBJ([regex-posix])])])
- dnl The following should not be necessary, but for some reason
- dnl autoheader misses it if we don't include it!
- if test "$ac_cv_func_regcomp_norx" = yes ||
- test "$ac_cv_func_regcomp_rx" = yes; then
-- AC_DEFINE(HAVE_REGCOMP)
-+ AC_DEFINE(HAVE_REGCOMP, 1,
-+ [This is included as part of a workaround for a autoheader bug.])
- fi
- fi
- fi
-@@ -427,7 +463,7 @@ AC_REPLACE_FUNCS(inet_aton putenv strerr
- # explicitly to LIBOBJS to make sure that it is translated to
- # `alloca.lo' for libtool later on. This can and should be done more cleanly.
- AC_FUNC_ALLOCA
--if test "$ALLOCA" = "alloca.o"; then LIBOBJS="alloca.o $LIBOBJS"; fi
-+if test "$ALLOCA" = "alloca.o"; then AC_LIBOBJ([alloca]); fi
-
- AC_CHECK_MEMBERS([struct stat.st_rdev])
- AC_CHECK_MEMBERS([struct stat.st_blksize])
-@@ -442,7 +478,8 @@ AC_CACHE_CHECK([for S_ISLNK in sys/stat.
- ac_cv_macro_S_ISLNK=yes,
- ac_cv_macro_S_ISLNK=no)])
- if test $ac_cv_macro_S_ISLNK = yes; then
-- AC_DEFINE(HAVE_S_ISLNK)
-+ AC_DEFINE(HAVE_S_ISLNK, 1,
-+ [Define this if your system defines S_ISLNK in sys/stat.h.])
- fi
-
- AC_STRUCT_TIMEZONE
-@@ -457,7 +494,16 @@ GUILE_STRUCT_UTIMBUF
- AC_TRY_RUN(aux (l) unsigned long l;
- { int x; exit (l >= ((unsigned long)&x)); }
- main () { int q; aux((unsigned long)&q); },
-- AC_DEFINE(SCM_STACK_GROWS_UP),,AC_MSG_WARN(Guessing that stack grows down -- see scmconfig.h.in))
-+ [AC_DEFINE([SCM_STACK_GROWS_UP], 1,
-+ [Define this if a callee's stack frame has a higher address
-+ than the caller's stack frame. On most machines, this is
-+ not the case.])],
-+ [],
-+ [AC_MSG_WARN(Guessing that stack grows down -- see scmconfig.h.in)])
-+
-+
-+AH_TEMPLATE([SCM_SINGLES],
-+ [Define this if floats are the same size as longs.])
-
- AC_CACHE_CHECK([whether floats fit in longs], guile_cv_type_float_fits_long,
- [AC_TRY_RUN([main () { exit (sizeof(float) > sizeof(long)); }],
-@@ -486,7 +532,9 @@ AC_CACHE_VAL(scm_cv_struct_linger,
- scm_cv_struct_linger="no"))
- AC_MSG_RESULT($scm_cv_struct_linger)
- if test $scm_cv_struct_linger = yes; then
-- AC_DEFINE(HAVE_STRUCT_LINGER)
-+ AC_DEFINE([HAVE_STRUCT_LINGER], 1,
-+ [Define this if your system defines struct linger, for use with the
-+ getsockopt and setsockopt system calls.])
- fi
-
-
-@@ -499,7 +547,8 @@ AC_CACHE_VAL(scm_cv_struct_timespec,
- scm_cv_struct_timespec="no"))
- AC_MSG_RESULT($scm_cv_struct_timespec)
- if test $scm_cv_struct_timespec = yes; then
-- AC_DEFINE(HAVE_STRUCT_TIMESPEC)
-+ AC_DEFINE(HAVE_STRUCT_TIMESPEC, 1,
-+ [Define this if your system defines struct timespec via <time.h>.])
- fi
-
- #--------------------------------------------------------------------
-@@ -541,15 +590,16 @@ esac
- ## If we're using threads, bring in some other parts of Guile which
- ## work with them.
- if test "${THREAD_PACKAGE}" != "" ; then
-- AC_DEFINE(USE_THREADS, 1)
-+ AC_DEFINE(USE_THREADS, 1, [Define if using any sort of threads.])
-
- ## Include the Guile thread interface in the library...
-- LIBOBJS="$LIBOBJS threads.o"
-+ AC_LIBOBJ([threads])
-
- ## ... and tell it which package to talk to.
- case "${THREAD_PACKAGE}" in
- "QT" )
-- AC_DEFINE(USE_COOP_THREADS, 1)
-+ AC_DEFINE(USE_COOP_THREADS, 1,
-+ [Define if using cooperative multithreading.])
- ;;
- * )
- AC_MSG_ERROR(invalid value for THREAD_PACKAGE: ${THREAD_PACKAGE})
-@@ -559,7 +609,7 @@ if test "${THREAD_PACKAGE}" != "" ; then
- ## Bring in scm_internal_select, if appropriate.
- if test $ac_cv_func_gettimeofday = yes &&
- test $ac_cv_func_select = yes; then
-- AC_DEFINE(GUILE_ISELECT, 1)
-+ AC_DEFINE(GUILE_ISELECT, 1, [Define to implement scm_internal_select.])
- fi
-
- AC_ARG_ENABLE(linuxthreads,
-@@ -568,11 +618,60 @@ if test "${THREAD_PACKAGE}" != "" ; then
-
- ## Workaround for linuxthreads (optionally disabled)
- if test $host_os = linux-gnu -a "$enable_linuxthreads" = yes; then
-- AC_DEFINE(GUILE_PTHREAD_COMPAT, 1)
-+ AC_DEFINE(GUILE_PTHREAD_COMPAT, 1,
-+ [Define to enable workaround for COOP-linuxthreads compatibility.])
- AC_CHECK_LIB(pthread, main)
- fi
- fi
-
-+## Cross building
-+if test "$cross_compiling" = "yes"; then
-+ AC_MSG_CHECKING(cc for build)
-+ ## /usr/bin/cc still uses wrong assembler
-+ ## CC_FOR_BUILD="${CC_FOR_BUILD-/usr/bincc}"
-+ CC_FOR_BUILD="${CC_FOR_BUILD-PATH=/usr/bin:$PATH cc}"
-+else
-+ CC_FOR_BUILD="${CC_FOR_BUILD-$CC}"
-+fi
-+AC_ARG_WITH(cc-for-build,
-+ [ --with-cc-for-build=CC native C compiler, to be used during build])
-+test -n "$with_cc_for_build" && CC_FOR_BUILD="$with_cc_for_build"
-+
-+## AC_MSG_CHECKING("if we are cross compiling")
-+## AC_MSG_RESULT($cross_compiling)
-+if test "$cross_compiling" = "yes"; then
-+ AC_MSG_RESULT($CC_FOR_BUILD)
-+fi
-+
-+## No need as yet to be more elaborate
-+CCLD_FOR_BUILD="$CC_FOR_BUILD"
-+
-+AC_SUBST(cross_compiling)
-+AC_SUBST(CC_FOR_BUILD)
-+AC_SUBST(CCLD_FOR_BUILD)
-+
-+## libtool erroneously calls CC_FOR_BUILD HOST_CC;
-+## --HOST is the platform that PACKAGE is compiled for.
-+HOST_CC="$CC_FOR_BUILD"
-+AC_SUBST(HOST_CC)
-+
-+if test "$cross_compiling" = "yes"; then
-+ AC_MSG_CHECKING(guile for build)
-+ GUILE_FOR_BUILD="${GUILE_FOR_BUILD-guile}"
-+else
-+ GUILE_FOR_BUILD='$(top_builddir_absolute)/pre-inst-guile'
-+fi
-+AC_ARG_WITH(guile-for-build,
-+ [ --with-guile-for-build=CC native guile executable, to be used during build])
-+test -n "$with_guile_for_build" && GUILE_FOR_BUILD="$with_cc_for_build"
-+
-+## AC_MSG_CHECKING("if we are cross compiling")
-+## AC_MSG_RESULT($cross_compiling)
-+if test "$cross_compiling" = "yes"; then
-+ AC_MSG_RESULT($GUILE_FOR_BUILD)
-+fi
-+AC_SUBST(GUILE_FOR_BUILD)
-+
- ## If we're using GCC, ask for aggressive warnings.
- case "$GCC" in
- yes )
-@@ -589,11 +688,11 @@ AC_PROG_AWK
- ## If we're creating a shared library (using libtool!), then we'll
- ## need to generate a list of .lo files corresponding to the .o files
- ## given in LIBOBJS. We'll call it LIBLOBJS.
--LIBLOBJS="`echo ${LIBOBJS} | sed 's/\.o/.lo/g'`"
-+LIBLOBJS="`echo ${LIB@&t@OBJS} | sed 's,\.[[^.]]* ,.lo ,g;s,\.[[^.]]*$,.lo,'`"
-
- ## We also need to create corresponding .doc and .x files
--EXTRA_DOT_DOC_FILES="`echo ${LIBOBJS} | sed 's/\.o/.doc/g'`"
--EXTRA_DOT_X_FILES="`echo ${LIBOBJS} | sed 's/\.o/.x/g'`"
-+EXTRA_DOT_DOC_FILES="`echo ${LIB@&t@OBJS} | sed 's,\.[[^.]]* ,.doc ,g;s,\.[[^.]]*$,.doc,'`"
-+EXTRA_DOT_X_FILES="`echo ${LIB@&t@OBJS} | sed 's,\.[[^.]]* ,.x ,g;s,\.[[^.]]*$,.x,'`"
-
- AC_SUBST(GUILE_MAJOR_VERSION)
- AC_SUBST(GUILE_MINOR_VERSION)
-@@ -617,11 +716,13 @@ AC_SUBST(LIBGUILE_SRFI_SRFI_4_INTERFACE_
- AC_SUBST(LIBGUILE_SRFI_SRFI_4_INTERFACE_REVISION)
- AC_SUBST(LIBGUILE_SRFI_SRFI_4_INTERFACE_AGE)
- AC_SUBST(LIBGUILE_SRFI_SRFI_4_INTERFACE)
-+AC_SUBST(LIBGUILE_SRFI_SRFI_4_LTHACK)
-
- AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_INTERFACE_CURRENT)
- AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_INTERFACE_REVISION)
- AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_INTERFACE_AGE)
- AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_INTERFACE)
-+AC_SUBST(LIBGUILE_SRFI_SRFI_13_14_LTHACK)
-
- #######################################################################
-
-diff -purN /home/fred/usr/src/guile-1.5.6/libguile/ChangeLog ./libguile/ChangeLog
---- /home/fred/usr/src/guile-1.5.6/libguile/ChangeLog Sun Mar 3 02:14:37 2002
-+++ ./libguile/ChangeLog Thu Jul 4 03:27:54 2002
-@@ -1,3 +1,14 @@
-+2002-07-03 Jan Nieuwenhuizen <janneke@gnu.org>
-+
-+ * Makefile.am: Override default rule for c-tokenize.$(OBJECT);
-+ this should be compiled for BUILD host.
-+ Override default rule for
-+ guile_filter_doc_snarfage$(EEXECT); this should run on BUILD host.
-+ Add missing $(EXEEXT) to guile_filter_doc_snarfage invocation.
-+
-+ * guile.c, iselect.h, net_db.c, posix.c, socket.c: Cygwin compile
-+ fixes.
-+
- 2002-03-01 Dirk Herrmann <D.Herrmann@tu-bs.de>
-
- * gc.c (SCM_HEAP_SEG_SIZE, CELL_UP, CELL_DN, DOUBLECELL_ALIGNED_P,
-diff -purN /home/fred/usr/src/guile-1.5.6/libguile/Makefile.am ./libguile/Makefile.am
---- /home/fred/usr/src/guile-1.5.6/libguile/Makefile.am Fri Mar 1 19:19:36 2002
-+++ ./libguile/Makefile.am Thu Jul 4 03:27:23 2002
-@@ -33,14 +33,33 @@ ETAGS_ARGS = --regex='/SCM_\(GLOBAL_\)?\
-
- lib_LTLIBRARIES = libguile.la
- bin_PROGRAMS = guile
-+
- noinst_PROGRAMS = guile_filter_doc_snarfage
-+guile_filter_doc_snarfage_SOURCES = c-tokenize.c
-+
-+## Override default rule; this should be compiled for BUILD host.
-+## For some reason, OBJEXT does not include the dot
-+c-tokenize.$(OBJEXT): c-tokenize.c
-+ if [ "$(cross_compiling)" = "yes" ]; then \
-+ $(CC_FOR_BUILD) -c -o $@ $<; \
-+ else \
-+ $(COMPILE) -c -o $@ $<; \
-+ fi
-+
-+## Override default rule; this should run on BUILD host.
-+guile_filter_doc_snarfage$(EXEEXT): $(guile_filter_doc_snarfage_OBJECTS) $(guile_filter_doc_snarfage_DEPENDENCIES)
-+ @rm -f guile_filter_doc_snarfage$(EXEEXT)
-+ if [ "$(cross_compiling)" = "yes" ]; then \
-+ $(CCLD_FOR_BUILD) -o $@ $(guile_filter_doc_snarfage_OBJECTS); \
-+ else \
-+ $(LINK) $(guile_filter_doc_snarfage_OBJECTS) $(LDADD) $(LIBS); \
-+ fi
-+
-
- guile_SOURCES = guile.c
- guile_LDADD = libguile.la
- guile_LDFLAGS = @DLPREOPEN@
-
--guile_filter_doc_snarfage_SOURCES = c-tokenize.c
--
- libguile_la_SOURCES = alist.c arbiters.c async.c backtrace.c boolean.c \
- chars.c continuations.c debug.c deprecation.c dynl.c dynwind.c \
- environments.c eq.c error.c eval.c evalext.c extensions.c \
-@@ -195,7 +214,7 @@ SUFFIXES = .x .doc
- .c.doc:
- -(test -n "${AWK+set}" || AWK="@AWK@"; ${AWK} -f ./guile-func-name-check $<)
- (./guile-snarf-docs $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< | \
-- ./guile_filter_doc_snarfage --filter-snarfage) > $@ || { rm $@; false; }
-+ ./guile_filter_doc_snarfage$(EXEEXT) --filter-snarfage) > $@ || { rm $@; false; }
-
- $(DOT_X_FILES) $(EXTRA_DOT_DOC_FILES): snarf.h guile-snarf.in
-
-diff -purN /home/fred/usr/src/guile-1.5.6/libguile/guile.c ./libguile/guile.c
---- /home/fred/usr/src/guile-1.5.6/libguile/guile.c Wed Jun 27 21:30:20 2001
-+++ ./libguile/guile.c Thu Jul 4 03:25:46 2002
-@@ -55,7 +55,8 @@
- #include <libltdl/ltdl.h>
- #endif
-
--#ifdef HAVE_WINSOCK2_H
-+#if defined (HAVE_WINSOCK2_H) \
-+ && !(defined (__CYGWIN32__) || defined (__CYGWIN__))
- #include <winsock2.h>
- #endif
-
-diff -purN /home/fred/usr/src/guile-1.5.6/libguile/iselect.h ./libguile/iselect.h
---- /home/fred/usr/src/guile-1.5.6/libguile/iselect.h Mon Jul 23 22:48:44 2001
-+++ ./libguile/iselect.h Thu Jul 4 03:25:46 2002
-@@ -67,7 +67,8 @@
- #include <sys/select.h>
- #endif
-
--#ifdef HAVE_WINSOCK2_H
-+#if defined (HAVE_WINSOCK2_H) \
-+ && !(defined (__CYGWIN32__) || defined (__CYGWIN__))
- #include <winsock2.h>
- #endif
-
-diff -purN /home/fred/usr/src/guile-1.5.6/libguile/net_db.c ./libguile/net_db.c
---- /home/fred/usr/src/guile-1.5.6/libguile/net_db.c Mon Jul 9 16:24:40 2001
-+++ ./libguile/net_db.c Thu Jul 4 03:25:46 2002
-@@ -65,7 +65,8 @@
-
- #include <sys/types.h>
-
--#ifdef HAVE_WINSOCK2_H
-+#if defined (HAVE_WINSOCK2_H) \
-+ && !(defined (__CYGWIN32__) || defined (__CYGWIN__))
- #include <winsock2.h>
- #else
- #include <sys/socket.h>
-diff -purN /home/fred/usr/src/guile-1.5.6/libguile/posix.c ./libguile/posix.c
---- /home/fred/usr/src/guile-1.5.6/libguile/posix.c Sat Nov 17 20:03:43 2001
-+++ ./libguile/posix.c Thu Jul 4 03:25:46 2002
-@@ -95,7 +95,8 @@ extern char *ttyname();
- #ifdef HAVE_IO_H
- #include <io.h>
- #endif
--#ifdef HAVE_WINSOCK2_H
-+#if defined (HAVE_WINSOCK2_H) \
-+ && !(defined (__CYGWIN32__) || defined (__CYGWIN__))
- #include <winsock2.h>
- #endif
-
-diff -purN /home/fred/usr/src/guile-1.5.6/libguile/socket.c ./libguile/socket.c
---- /home/fred/usr/src/guile-1.5.6/libguile/socket.c Mon Jul 9 16:24:40 2001
-+++ ./libguile/socket.c Thu Jul 4 03:25:46 2002
-@@ -61,7 +61,8 @@
- #include <unistd.h>
- #endif
- #include <sys/types.h>
--#ifdef HAVE_WINSOCK2_H
-+#if defined (HAVE_WINSOCK2_H) \
-+ && !(defined (__CYGWIN32__) || defined (__CYGWIN__))
- #include <winsock2.h>
- #else
- #include <sys/socket.h>
-diff -purN /home/fred/usr/src/guile-1.5.6/qt/Makefile.am ./qt/Makefile.am
---- /home/fred/usr/src/guile-1.5.6/qt/Makefile.am Fri Feb 15 23:11:29 2002
-+++ ./qt/Makefile.am Thu Jul 4 03:53:53 2002
-@@ -24,7 +24,7 @@ AUTOMAKE_OPTIONS = gnu
- ## subdirs are for making distributions only.
- SUBDIRS = md time
-
--lib_LTLIBRARIES = @QTHREAD_LTLIBS@
-+lib_LTLIBRARIES =
- EXTRA_LTLIBRARIES = libqthreads.la
-
- ## Prevent automake from adding extra -I options
-diff -purN /home/fred/usr/src/guile-1.5.6/qt/Makefile.in ./qt/Makefile.in
---- /home/fred/usr/src/guile-1.5.6/qt/Makefile.in Tue Mar 5 00:43:37 2002
-+++ ./qt/Makefile.in Thu Jul 4 04:02:33 2002
-@@ -124,7 +124,7 @@ AUTOMAKE_OPTIONS = gnu
-
- SUBDIRS = md time
-
--lib_LTLIBRARIES = @QTHREAD_LTLIBS@
-+lib_LTLIBRARIES =
- EXTRA_LTLIBRARIES = libqthreads.la
-
- DEFS = @DEFS@
-diff -purN /home/fred/usr/src/guile-1.5.6/srfi/Makefile.am ./srfi/Makefile.am
---- /home/fred/usr/src/guile-1.5.6/srfi/Makefile.am Sat Feb 23 23:10:04 2002
-+++ ./srfi/Makefile.am Tue Apr 9 19:26:37 2002
-@@ -29,19 +29,21 @@ DEFS = @DEFS@
- INCLUDES = -I.. -I$(srcdir)/..
-
-
--lib_LTLIBRARIES = libguile-srfi-srfi-13-14.la libguile-srfi-srfi-4.la
-+lib_LTLIBRARIES = \
-+ libguile-srfi-srfi-4-lt-@LIBGUILE_SRFI_SRFI_4_LTHACK@.la \
-+ libguile-srfi-srfi-13-14-lt-@LIBGUILE_SRFI_SRFI_13_14_LTHACK@.la
-
- BUILT_SOURCES = srfi-13.x srfi-14.x srfi-4.x
-
--libguile_srfi_srfi_4_la_SOURCES = srfi-4.x srfi-4.c srfi-4.h
--libguile_srfi_srfi_4_la_LIBADD = ../libguile/libguile.la
--libguile_srfi_srfi_4_la_LDFLAGS = -export-dynamic \
-+libguile_srfi_srfi_4_lt_@LIBGUILE_SRFI_SRFI_4_LTHACK@_la_SOURCES = srfi-4.x srfi-4.c srfi-4.h
-+libguile_srfi_srfi_4_lt_@LIBGUILE_SRFI_SRFI_4_LTHACK@_la_LIBADD = ../libguile/libguile.la
-+libguile_srfi_srfi_4_lt_@LIBGUILE_SRFI_SRFI_4_LTHACK@_la_LDFLAGS = -export-dynamic \
- -version-info @LIBGUILE_SRFI_SRFI_4_INTERFACE@
-
--libguile_srfi_srfi_13_14_la_SOURCES = srfi-13.x srfi-13.c srfi-14.x srfi-14.c\
-+libguile_srfi_srfi_13_14_lt_@LIBGUILE_SRFI_SRFI_13_14_LTHACK@_la_SOURCES = srfi-13.x srfi-13.c srfi-14.x srfi-14.c\
- srfi-13.h srfi-14.h
--libguile_srfi_srfi_13_14_la_LIBADD = ../libguile/libguile.la
--libguile_srfi_srfi_13_14_la_LDFLAGS = -export-dynamic \
-+libguile_srfi_srfi_13_14_lt_@LIBGUILE_SRFI_SRFI_13_14_LTHACK@_la_LIBADD = ../libguile/libguile.la
-+libguile_srfi_srfi_13_14_lt_@LIBGUILE_SRFI_SRFI_13_14_LTHACK@_la_LDFLAGS = -export-dynamic \
- -version-info @LIBGUILE_SRFI_SRFI_13_14_INTERFACE@
-
- srfidir = $(datadir)/guile/$(VERSION)/srfi
-@@ -65,9 +67,10 @@ GUILE_SNARF = ../libguile/guile-snarf
-
- MKDEP = gcc -M -MG $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-
-+snarfcppopts = $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS)
-+
- SUFFIXES = .x
- .c.x:
-- $(GUILE_SNARF) $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@ \
-- || { rm $@; false; }
-+ $(GUILE_SNARF) -o $@ $< $(snarfcppopts)
-
- CLEANFILES = *.x
+++ /dev/null
-\input texinfo @c -*-texinfo-*-
-@setfilename installing.info
-@settitle LilyPond on Windows
-
-@html
-<!--- @@WEB-TITLE@@=Windows Installation --->
-@end html
-
-@node Top
-@top
-
-@chapter WINDOWS - Installing GNU LilyPond on Windows
-
-This document explains how to install the binary release for windows
-on a Microsoft Windows 95, 98, ME, NT, 2000 or XP machine. Please
-follow the instructions carefully. If it doesn't work for you, please
-send a bugreport, following the guidelines in the section on
-bugreports below.
-
-@section QuickInstall
-
-Click @uref{http://cygwin.com/setup.exe, Install Lily now}, run the
-installer (@file{setup.exe}), and in the Package View dialogue, select
-LilyPond, found in the Publishing section.
-
-If you have any problems, please read the rest of this page.
-
-@section Windows binary setup
-
-The binary LilyPond setup for Windows is in fact a
-@uref{http://cygwin.com, Cygwin} installation, including the LilyPond
-package for Cygwin.
-
-If you run Windows NT, 2000 or XP, please become administrator first;
-installing as an ordinary user does not seem to work on certain
-Windows-NT variants. Download and run
-@uref{http://cygwin.com/setup.exe, setup.exe}. You will be asked some
-questions. If you are unsure just click "Next". Do not change the
-default install directory @file{c:/cygwin}. Do not change the default
-text type @samp{UNIX}, i.e., do not use @samp{DOS} mounts.
-
-In the Package View dialogue window, click on the Publishing section
-to view the available publishing software for Cygwin. Make sure that
-LilyPond is selected. If this is a new or first installation, click
-on @emph{Skip} to select.
-
-This installs LilyPond, and Cygwin, GUILE, Python, teTeX (MikTeX is not
-supported). If you already have some of that software under
-@file{c:/cygwin}, then don't worry: nothing will be installed twice.
-
-@subsection Additional software
-
-If you install the Cygwin's XFree86 X11 window system, tetex-x11 and
-ghostscript-x11 packages too, you can view the @code{dvi} output doing
-@code{xdvi test.dvi}.
-
-LilyPond needs a PostScript/PDF viewer to be really useful. At this
-time (Sun Aug 11 2002), such software is not available in Cygwin, so
-you must use native Windows software instead.
-
-@table @samp
-@item Ghostview.
-
-You can use GSView-2.6. This old package has two advantages. It has
-gsview and ghostscript bundeled, and it doesn't popup @emph{Register
-Now|Cancel} windows all the time.
-
-Install
-@uref{ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/aladdin/gs550/gsv27550.exe,GSView-2.7}
-(GhostView for Windows), or visit
-@uref{ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum,ftp://mirror.cs.wisc.edu/}.
-
-@c check/update versions
-If you need to view PDFs, or want to create PDFs using GSView, you can
-install the newer versions GSView-3.6 and GhostScript-6.50. You get
-annoying @emph{Register Now|Cancel} popups, though.
-
-Install
-@uref{ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/ghostgum/gsv36w32.exe,GSview-3.6}
-and
-@uref{ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/AFPL/gs650/gs650w32.exe,
-GhostScript-6.50}, or visit the @uref{http://www.cs.wisc.edu/~ghost/,
-Ghostview and GSview site}.
-@end table
-
-Note: @uref{ftp://ftp.cs.wisc.edu/pub/ghost/README,ftp.cs.wisc.edu}
-has moved the ghostscript/ghostview distribution to a
-@uref{ftp://mirror.cs.wisc.edu/pub/mirrors/ghost/,rather unreliable
-server}.
-
-@section Testing LilyPond
-
-Open a LilyPond shell (To open a a lilypond shell, click the "GNU
-LilyPond" or "Cygwin" icon), and type
-
-
-@example
-lilypond --help
-@end example
-
-
-You should see something similar to
-
-
-@example
-GNU LilyPond 1.6.0
-Usage: lilypond [OPTION]... FILE...
-
-Typeset music and or play MIDI from FILE
-
-LilyPond is a music typesetter. It produces beautiful sheet music
-using a high level description file as input. LilyPond is part of
-the GNU Project.
-
-Options:
- -h,--help this help
-[..]
-@end example
-
-
-Then, prepare a file called @file{foo.ly}, by issuing
-
-@example
-notepad foo.ly
-@end example
-
-Enter the following into the file
-
-@example
-
-\score @{ \notes @{ c4 ( ) c4 @} @}
-
-@end example
-
-Close the editor and save the file. Then run the following command.
-
-@example
-ly2dvi -p foo
-@end example
-
-At the end, it should say
-
-@example
-DVI output to `foo.dvi'...
-PS output to `foo.ps'...
-PDF output to `foo.pdf'...
-@end example
-
-If you install the Cygwin's XFree86 X11 window system, tetex-x11 and
-ghostscript-x11 packages too, you can view the @code{dvi} output
-@c copied from tutorial, where xdvi command has been explained above
-@c doing @code{xdvi test.dvi}.
-doing:
-
-@example
-startx
-xdvi test.dvi
-@end example
-
-If you have installed a PostScript/PDF viewer,
-such as @code{GSView} from @uref{http://www.cs.wisc.edu/~ghost},
-viewing the PS file can be done with:
-
-@example
-gsview32 foo.ps
-@end example
-
-
-If this works, then you can head to the
-@uref{../../user/out-www/lilypond/Tutorial.html,Tutorial}
-@c Hmm, this only works for 1.6.5-1 installs.
-@c Cygwin does not have a proper html documentation index such as dwww
-@c Should add for debian and red hat packages too.
-(@uref{file:///c/cygwin/usr/doc/lilypond-1.6.5-1/html/Documentation/user/out-www/Tutorial.html,
-local copy})
-to start using LilyPond.
-
-@section Removing LilyPond
-
-Start @file{setup.exe}, click Next, select "Install from Local
-Directory". Then click next until you reach "Select packages to
-install". Click "View". Now, for every package, click on the recycle
-icon until it says "Uninstall". Then, click Next.
-
-(If you find this too tedious, you can also simply remove
-@file{c:/cygwin}. This also removes the @file{/home/} directories under
-cygwin (i.e. @file{C:\CYGWIN\HOME}, so make sure that you bring
-important files in safety first.)
-
-@section Troubleshooting
-
-For problems and solutions see
-@uref{http://lilypond.org/wiki?TroubleshootingWindows,Troubleshooting
-Windows}
-
-If you have a problem running LilyPond, you should first make sure
-that you are running the latest version. Chances are, that your
-problem was already reported and fixed in a newer release. Click
-@uref{http://cygwin.com/setup.exe, Update Lily now} to check if
-new software is available.
-
-If you subscribe to the @uref{http://cygwin.com/ml/cygwin-announce/,
-cygwin-announce (archives)} mailing list, see
-@uref{http://sources.redhat.com/cygwin/lists.html, Cygwin mailing
-lists}, bottom of page. You'll be notified of new and updated
-software for Cygwin, including LilyPond.
-
-Chances are, that a problem you experience has been noted by others.
-Cygwin specific problems will be reported to the
-@uref{http://cygwin.com/ml/cygwin, cygwin-user (archives)} mailing
-list (@uref{http://sources.redhat.com/cygwin/lists.html, Cygwin mailing
-lists}, bottom of page).
-
-LilyPond specific problems, also concering Cygwin/Windows, are
-reported and discussed on the
-@uref{http://mail.gnu.org/pipermail/lilypond-user, lilypond-user
-(archives)} mailing list.
-
-@subsection Setup.exe does not run at all
-
-Make sure that you run @uref{http://cygwin.com/setup.exe, this latest
-setup.exe}.
-This will also work if you were using a setup.exe you donwloaded
-before from lilypond.org before.
-
-If you're sure that you have the very latest version, and it doesn't
-work, and the @uref{http://cygwin.com/ml/cygwin, cygwin-user archives}
-do not mention the problem, write to @email{cygwin@@cygwin.com}.
-Setup is under heavy development, so you may have been unlucky and
-have dowloaded a buggy version.
-
-@subsection ly2dvi:error: filename should not contain spaces
-
-@quotation
-@emph{I don't seem to be able to either change this "default" or to point
-Lilypond to another directory which does not have the space.}
-
-@example
-ly2dvi:error: filename should not contain spaces: `/usr/bin/Ralph Whedon/foo'
-@end example
-
-@emph{Any ideas what I should do?}
-@end quotation
-Best is to create a new home directory. Start the Cygwin or LilyPond
-shell, and do:
-
-@example
-HOME=/home/ralph
-mkdir -p $HOME
-cd
-@end example
-
-To go there automatically, each time you log in, edit the file
-
-@example
-/etc/passwd # windows name: c:\cygwin\etc\passwd
-@end example
-
-
-using vim or wordpad, and change the `/usr/bin/Ralph Whedon/' to
-`/home/ralph'.
-
-@subsection What's this Bash/Cygwin shell?
-
-The bash shell is a basic UNIX-like console that we use for the
-Windows release. Using such an intercompatible shell makes it easier
-to maintain the Windows release reasonably, notably because it works
-the same as the normal UNIX setup. Keep in mind that none of the
-developers are using Windows.
-
-Also it is possible to build LilyPond from source with a complete
-Cygwin install, see @uref{compiling.html,Compiling LilyPond on Windows}.
-
-Bash is not very different from the MS-DOS shell, you'll just have to
-(re-)learn a few commands needed to browse through your hard-drive.
-Here are some commands you'll definitely be needing.
-
-To change folders, the usual @code{cd}
-
-
-@example
-cd ../.. # If you type this at startup, you should be in the root
- # directory. Better do:
-cd /
-@end example
-
-
-You'll notice that file names in Bash are written with the slash (/),
-and not the backslash (\) bar as in MS-DOS and Windows.
-
-
-@example
-C:\Win98\Bureau\ ---> /cygdrive/c/Win98/Bureau
-@end example
-
-The equivalent of the MS-DOS dir command is ls -l :
-
-@example
-ls -l #You'll get the listing of the current folder.
-@end example
-
-To copy a file, use the cp command:
-
-@example
-cp srcfile destfile
-@end example
-
-For more information, see the
-@uref{http://www.linuxdoc.org/HOWTO/DOS-Win-to-Linux-HOWTO.html,DOS/Windows
-to Linux HOWTO}.
-
-
-
-@subsection Requirements and DLLs
-
-TeTeX and LilyPond depend on a number of library packages, but as it
-seems, they sometimes do not get selected automagically.
-
-@itemize @samp
-@item teTeX
- requires: ash cygwin ed grep jpeg libkpathsea3 libncurses6 libpng12 tiff
- sed termcap zlib
-
-@item LilyPond
- requires: bash libguile12 libiconv2 libintl2 libkpathsea3 python
- tetex-bin, tetex-tiny or tetex-base
-@end itemize
-
-@multitable @columnfractions .40 .40
-@item DLL @tab Package
-@item cygguile-12.dll @tab libguile12
-@item cygintl-2.dll @tab libintl2
-@item cygiconv-2.dll @tab libiconv2
-@item cygltdl-3.dll @tab libltdl3
-@item cygpcre.dll @tab pcre
-@item cygpng12.dll @tab libpng12
-@item cygtiff3.dll @tab tiff
-@end multitable
-
-Also, the more general info on missing DLLs may be helpful:
-@example
- @uref{http://cygwin.com/faq/faq_4.html#SEC32}
- @uref{http://cygwin.com/ml/cygwin/2002-01/msg01619.html}
-@end example
-
-@subsection Why don't you fix this?
-
-Well, we've tried several times, but we can't reproduce the problem
-('It works for me'). If you're experiencing DLL problems, you're much
-invited to help us find the bug and fix it. You can install the
-binutils package, and use objdump to find which executable depends on
-the missing dll.
-
-@example
-objdump -x <path to download dir>/setup.exe | grep -i dll
-objdump -x /usr/bin/awk.exe | grep -i dll
-objdump -x /usr/bin/python.exe | grep -i dll
-@end example
-
-Of course, you should check what version of the offending package you
-have installed (see @file{/var/log/setup.log} and
-@file{/var/log/setup.log.full)}.
-
-@subsection Check your TeX installation
-
-Start a LilyPond shell and run
-
-@example
-latex sample2e
-@end example
-
-This should print a few lines of information and produce a file
-@file{sample2e.dvi}. Then run
-
-@example
-dvips sample2e
-@end example
-
-
-which produces a sample2e.ps, which you can view using @code{gsview32}.
-
-When this works correctly, you could resume your attempts with
-LilyPond.
-
-
-@subsection Bugreports
-
-So you have checked by running @uref{http://cygwin.com/setup.exe,
-Update Lily now} that you run the latest version, and
-@uref{http://lilypond.org/wiki?TroubleshootingWindows,Troubleshooting
-Windows} nor @uref{http://cygwin.com/ml/cygwin, cygwin-user
-(archives)} or @uref{http://mail.gnu.org/pipermail/lilypond-user,
-lilypond-user (archives)} mentions your problem. It looks like you
-found a bug.
-
-We can only help you with a problem if you give a full, detailed
-bugreport. A bugreport includes
-
-@itemize @bullet
-@item A @emph{precise} description of the problem.
-@item A full description of your platform (machine type, operating
-system)
-@item All version numbers of relevant software you run.
- The best way to this is to run
-
- @example
- sh -x /usr/bin/bug-lilypond-cygwin >& bug.txt
- @end example
-
- and include the file @file{bug.txt}. (If you are running
- lilypond 1.5.73 or earlier, download
- @uref{http://lilypond.org/cygwin/bug-lilypond-cygwin,
- bug-lilypond-cygwin here}.
-@end itemize
-
-If you have trouble using bug-lilypond-cygwin, you must gather this
-information by hand. Specifically, we want to see the output of the
-following commands:
-@itemize @bullet
-@item Version info
-
-@example
- python -V
- lilypond --version
- ly2dvi --version
-@end example
-
-@item If ly2dvi fails, then please run it as follows and include the
- output in the
-
-@example
- ly2dvi --verbose MY-FILE
-@end example
-
-@end itemize
-
-The file @file{bug.txt} should contain information on your system
-(check that). Send your problem together with @file{bug.txt} to
-@email{lilypond-user@@gnu.org}.
-
-Be sure to turn off HTML email. It is very annoying. For reasons
-unknown to man, most Windows email clients have that turned on by
-default.
-
-If you are using Microsoft Outlook (Express), you can send normal
-plain text messages by clicking through the menus
-Tools/Options/Send/Mail Sending Format/Plain Text, with options:
-
-@example
-Set Message format as MIME, set "Encode text using:" to None. Set
-Automatically wrap text at 70, and > is used to indent original text.
-@end example
-
-Easy instructions for various email clients can be found at
-@uref{http://helpdesk.rootsweb.com/listadmins/plaintext.html,
-helpdesk.rootsweb.com}.
-
+++ /dev/null
-\input texinfo @c -*-texinfo-*-
-@setfilename lily-wins.info
-@settitle LilyPond for Windows.
-
-@node Top
-@top
-
-@chapter Lily Wins on Windows
-
-
-@subsubsection ---FOR-IMMEDIATE-RELEASE---
-
-
-Until now, installing LilyPond on Windows was
-@uref{http://mail.gnu.org/pipermail/help-gnu-music/2001-April/000620.html,
-almost} a dull process that could easily be @uref{
-ftp://appel.lilypond.org/pub/gnu-windows/cygwin-1.1.7/bin/tar/lily-install-0.7-1.tar.gz,
-automated} and scripted. This meant that you would have more time left
-for actual work, and we all know that's not what computers were designed
-for.
-
-Well, that kind of scary automating is no longer necessary!
-Also, it's no longer needed to @uref{http://www.gnu.org/software/wget,
-download}
-@uref{http://appel.lilypond.org/gnu-windows/tar/lilypond/lilypond-1.3.147-1.tar.gz,tarballs}
-or move @uref{http://www.gnu.org/software/guile, all sorts of files}
-@uref{http://www.mail-archive.com/gnu-music-discuss@@gnu.org/msg04380.html,
-around}. Sometimes, the @uref{http://www.winzip.com,automagical
-breaking while unpacking} process would even install flawlessly, and you
-had to
-@uref{http://mail.gnu.org/pipermail/gnu-music-discuss/2000-October/000517.html,
-break it yourself by flattening} the
-@uref{http://www.lilypond.org,LilyPond} tarball.
-
-Our specially formed Windows support task force has, after thoroughly
-investigating your particular needs as an individual user, formuled the
-revolutionary new concept of one-size-fits-all software, and delivered
-@uref{http://www.mail-archive.com/gnu-music-discuss%40gnu.org/msg03647.html,
-way before schedule}.
-
-With the upcoming @uref{
-http://mail.gnu.org/pipermail/info-gnu-music/2001-April/000060.html,
-LilyPond-1.4} release, we have innovated agressively, by copying and
-@uref{ftp://ftp.lilypond.org/pub/LilyPond/gnu-windows/latest/cygwin-installer.patch,
-mutilating } @uref{http://sources.redhat.com/cygwin,Cygwin}'s
-@uref{
-ftp://ftp.franken.de/pub/win32/develop/gnuwin32/cygwin/mirrors/cygnus/snapshots/cygwin-src-20010410.tar.bz2,
-Windows installer}.
-No
-@uref{http://www.lilypond.org/gnu-windows/tar/lilypond/md5.sum,
-difficult checksums} or signatures. Enjoy the the thrills of running
-@uref{http://www.lilypond.org/gnu-windows/latest/setup.exe,
-untrusted binaries} with adminstrator rights, on your painfully
-firewalled intranet.
-
-We proudly present our @emph{Gourmet-click-de-luxe} install: offering at
-least @uref{babysit.html, 32 totally unnecessary clicks}, before you can
-actually run LilyPond. This includes a nice and warm welcome click:
-@example
-GNU LilyPond Setup
-
- Version x.y
- (C) Red Hat and us
-
- [N]ext->
-@end example
-and of course, especially for all people with an exceptionally fine
-developed Windows taste, the maybe even more hollow message that tells
-us there's nothing to be told, really:
-@example
-GNU LilyPond Setup
-
- Installation completed.
-
- [O]k
-@end example
-Yes, that's right. Farewell @uref{http://www.lilypond.org/auto, smooth
-nightly upgrades}. Even a click at the @emph{very end} is required, so
-that you actually feel very useful babysitting the whole process. Try
-it. You will agree that with this new innovative installer we have
-truly reached the holy grail of user friendliness.
-
-
-@bye
projects / lilypond.git / commitdiff