* aclocal.m4: Regenerate.

* stepmake/aclocal.m4: Add --with-kpathsea-include,
--with-kpathsea-lib options.

diff --git a/ChangeLog b/ChangeLog
index a8528d145274f184fea970dd816dea71f49e608c..eaf343dedead9fc6f97ac9a8302e249a0f8d6089 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2002-07-18  Jan Nieuwenhuizen  <janneke@gnu.org>
 
+       * aclocal.m4: Regenerate.
+       
+       * stepmake/aclocal.m4: Add --with-kpathsea-include,
+       --with-kpathsea-lib options.
+
        * scripts/mup2ly.py: Cut-n-paste include missing lilylib.
 
        * stepmake/stepmake/compile-vars.make: 

diff --git a/aclocal.m4 b/aclocal.m4
index fcfa277b89555ebe2cd022cf1223597a45bec0eb..f4da81dd40f4b27c101b65a74fa018459a3ebfd5 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -147,7 +147,7 @@ AC_DEFUN(STEPMAKE_COMPILE, [
     [debug_b=$enableval])
 
     AC_ARG_ENABLE(optimising,
-    [  --enable-optimising      compile with optimising.  Default: on],
+    [  --enable-optimising     compile with optimising.  Default: on],
     [optimise_b=$enableval])
 
     AC_ARG_ENABLE(profiling, 
@@ -611,9 +611,28 @@ AC_DEFUN(STEPMAKE_INIT, [
     STEPMAKE_DATADIR
 ])
 
-
+    
 AC_DEFUN(STEPMAKE_KPATHSEA, [
-
+       
+    AC_ARG_WITH(kpathsea-include,
+       [  --with-kpathsea-include=DIR
+                         location of the kpathsea include dir],[
+           if test "$withval" = "yes" -o "$withval" = "no"; then
+               AC_MSG_WARN(Usage: --with-kpathsea-include=includedir)
+           else
+               CPPFLAGS="$CPPFLAGS -I${withval}"
+           fi
+           ])
+    
+    AC_ARG_WITH(kpathsea-lib,
+       [  --with-kpathsea-lib=DIR location of the kpathsea lib dir],[
+           if test "$withval" = "yes" -o "$withval" = "no"; then
+               AC_MSG_WARN(Usage: --with-kpathsea-lib=libdir)
+           else
+               LDFLAGS="$LDFLAGS -L${withval}"
+           fi
+           ])
+    
     kpathsea_b=yes
     #FIXME --with-xxx is meant for specifying a PATH too,
     # so this should read: --enable-kpathsea,
@@ -625,7 +644,16 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [
     if test "$kpathsea_b" != "no"; then        
        AC_HAVE_HEADERS(kpathsea/kpathsea.h)
        AC_CHECK_LIB(kpathsea, kpse_find_file)
-       AC_CHECK_FUNCS(kpse_find_file,, AC_ERROR(Cannot find kpathsea functions.  You should install kpathsea; see INSTALL.txt.  Rerun ./configure --without-kpathsea only if kpathsea is not available for your platform.))
+       AC_CHECK_FUNCS(kpse_find_file,,kpathsea_b=no)
+       if test "$kpathsea_b" = "no"; then
+           warn='kpathsea (libkpathsea-dev or kpathsea-devel package)
+   Else, please specify the location of your kpathsea using
+   --with-kpathea-include and --with-kpathsea-lib options.  You should
+   install kpathsea; see INSTALL.txt.  Rerun ./configure
+   --without-kpathsea only if kpathsea is not available for your
+   platform.'
+           STEPMAKE_ADD_ENTRY(REQUIRED, $warn)
+       fi
     fi
     AC_MSG_CHECKING(whether to use kpathsea)
     if test "$kpathsea_b" != no; then

diff --git a/cygwin/lilypond.hint b/cygwin/lilypond.hint
index 9ca8c00c2aff22eb8590a01e7f5841ee1a83005a..989520f9842be86414d12e99a5ee2bf41679d97d 100644 (file)
--- a/cygwin/lilypond.hint
+++ b/cygwin/lilypond.hint
@@ -1,7 +1,7 @@
 sdesc: "A program for printing sheet music"
 category: Publishing
-requires: ash bash libguile14 libiconv2 libintl2 python tetex-beta texmf-tiny
-#suggests: emacs gsview lilypond-doc rxvt xdvi texmf-base
+requires: bash libguile14 libiconv2 libintl2 libkpathsea3 python tetex-bin tetex-base
+#suggests: emacs gsview lilypond-doc rxvt XFree86
 ldesc: "A program for printing sheet music.
 LilyPond prints beautiful sheet music.  It produces music notation
 from a description file. It excels at typesetting classical music, but

diff --git a/cygwin/mknetrel b/cygwin/mknetrel
index 9c55cdd930932af8fba4c0323efb7040e5e32a59..df8099c002764ce7b34e47aef00d24b4c982ebc0 100644 (file)
--- a/cygwin/mknetrel
+++ b/cygwin/mknetrel
@@ -26,7 +26,12 @@ BUILD=1
 # sover=14
 
 patch=$mknetrel_root/patch
-iscygwin || (uploads=$here/uploads/$base && mkdir -p $uploads)
+if iscygwin; then
+    true
+else    
+    uploads=$here/uploads/$base && mkdir -p $uploads
+    tarstem=$uploads/$package
+fi
 
 sub_packages="doc"
 old_path=$PATH
@@ -45,6 +50,8 @@ old_path=$PATH
 # Patching and configuring
 #
 
+presplit () { true; }
+
 # Maybe add to mknetrel or pimport.
 dopatchsrc () {
     cd $src
@@ -161,6 +168,13 @@ doc_split () {
     true
 }
 
+prebuild () {
+    for i in $sub_packages; do
+       rm -rf $inst-$i
+       mkdir -p $inst-$i || exit 1
+    done
+}
+    
 domkdist() {
     #
     # Fix up installation slightly
@@ -186,9 +200,7 @@ domkdist() {
 
     for i in $sub_packages; do
        subname=$(${i}_name)
-        rm -rf $inst-$i
-       mkdir -p $inst-$i || exit 1
-       cd $inst-$i
+       cd $inst-$i || exit 1
        ${i}_split || exit 1
     done
     
@@ -272,6 +284,11 @@ postconfig () {
 }
 
 prebuild () {
+    for i in $sub_packages; do
+       rm -rf $inst-$i
+       mkdir -p $inst-$i || exit 1
+    done
+    
     # Build for build, generating doc
     cd $build || exit 1
     
@@ -285,18 +302,20 @@ prebuild () {
     done
 
     addmakeflags LDFLAGS="$cygwin_prefix/bin/libpython2.2.dll"
+
 }
 
 postinstall () {
     mkdir -p $inst-doc/$prefix
     cd $build || exit 1
-    make conf=for-build prefix=$inst-doc/$prefix install-html-doc
+    docdir=$prefix/share/doc/$base-$ver
+    
+    make conf=for-build docdir=$inst-doc/$docdir install-html-doc
 
 
     ## copy READMEs etc
 
     cd $src || exit 1
-    docdir=$prefix/share/doc/$name-$version
     
     mkdir -p $inst/$docdir
 
@@ -304,26 +323,26 @@ postinstall () {
     find . -maxdepth 1 -type f -exec cp -pv \{\} $inst/$docdir \;
 
     ## Windows readmes
-    cd Documentation/windows || exit 1
+    cd cygwin || exit 1
     cp -p README $inst/$docdir/README.Cygwin
     cp -p changelog $inst/$docdir/changelog.Cygwin
     mkdir -p $inst/$prefix/doc/Cygwin
-    cp -p README $inst/$prefix/doc/Cygwin/$cygpack.README
+    cp -p README $inst/$prefix/doc/Cygwin/$base-$ver.README
 
     ## copy examples
     cd $src || exit 1
     cp -prv input $inst/$docdir
 
-    cd $inst-doc/$prefix/share/doc/$name-$version &&
+    cd $inst-doc/$prefix/share/doc/$base-$ver &&
     ln -s $(find html/Documentation -name '*.ps.gz') .
 
     ## Cygwin doesn't adhere to FHS (and why should they?)
-    cd $inst/$prefix && mv share/doc .
-    cd $inst-doc/$prefix && mv share/doc .
+    cd $inst/$prefix/share && tar cf - doc | (cd ..; tar xf -) && rm -rf doc
+    cd $inst-doc/$prefix/share && tar cf - doc | (cd ..; tar xf -) && rm -rf doc
 }
 
 #presplit () {
-#    docdir=$prefix/share/doc/$name-$version
+#    docdir=$prefix/share/doc/$base-$ver
 #    mkdir -p $inst-doc/$docdir || exit 1
 #}
 

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 33babcc409c9d4b35cfb04ddd90cf2508e7e0b72..d18bec5c54011e8866e1ceffd42df2af87caedf5 100644 (file)
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -144,7 +144,7 @@ AC_DEFUN(STEPMAKE_COMPILE, [
     [debug_b=$enableval])
 
     AC_ARG_ENABLE(optimising,
-    [  --enable-optimising      compile with optimising.  Default: on],
+    [  --enable-optimising     compile with optimising.  Default: on],
     [optimise_b=$enableval])
 
     AC_ARG_ENABLE(profiling, 
@@ -608,9 +608,28 @@ AC_DEFUN(STEPMAKE_INIT, [
     STEPMAKE_DATADIR
 ])
 
-
+    
 AC_DEFUN(STEPMAKE_KPATHSEA, [
-
+       
+    AC_ARG_WITH(kpathsea-include,
+       [  --with-kpathsea-include=DIR
+                         location of the kpathsea include dir],[
+           if test "$withval" = "yes" -o "$withval" = "no"; then
+               AC_MSG_WARN(Usage: --with-kpathsea-include=includedir)
+           else
+               CPPFLAGS="$CPPFLAGS -I${withval}"
+           fi
+           ])
+    
+    AC_ARG_WITH(kpathsea-lib,
+       [  --with-kpathsea-lib=DIR location of the kpathsea lib dir],[
+           if test "$withval" = "yes" -o "$withval" = "no"; then
+               AC_MSG_WARN(Usage: --with-kpathsea-lib=libdir)
+           else
+               LDFLAGS="$LDFLAGS -L${withval}"
+           fi
+           ])
+    
     kpathsea_b=yes
     #FIXME --with-xxx is meant for specifying a PATH too,
     # so this should read: --enable-kpathsea,
@@ -622,7 +641,16 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [
     if test "$kpathsea_b" != "no"; then        
        AC_HAVE_HEADERS(kpathsea/kpathsea.h)
        AC_CHECK_LIB(kpathsea, kpse_find_file)
-       AC_CHECK_FUNCS(kpse_find_file,, AC_ERROR(Cannot find kpathsea functions.  You should install kpathsea; see INSTALL.txt.  Rerun ./configure --without-kpathsea only if kpathsea is not available for your platform.))
+       AC_CHECK_FUNCS(kpse_find_file,,kpathsea_b=no)
+       if test "$kpathsea_b" = "no"; then
+           warn='kpathsea (libkpathsea-dev or kpathsea-devel package)
+   Else, please specify the location of your kpathsea using
+   --with-kpathea-include and --with-kpathsea-lib options.  You should
+   install kpathsea; see INSTALL.txt.  Rerun ./configure
+   --without-kpathsea only if kpathsea is not available for your
+   platform.'
+           STEPMAKE_ADD_ENTRY(REQUIRED, $warn)
+       fi
     fi
     AC_MSG_CHECKING(whether to use kpathsea)
     if test "$kpathsea_b" != no; then