X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Fconfigure;h=b7dfc4ddc3735e3b8582624696ce4325fcb99b3b;hb=546cefdbf177b7da323f71e41197983b7174d7d1;hp=efa10adb72d60efb63366650a9e0cdb2d501d829;hpb=4fabc68182cab7149d2a4b52502e180f57199831;p=lilypond.git

diff --git a/stepmake/configure b/stepmake/configure
index efa10adb72..b7dfc4ddc3 100755
--- a/stepmake/configure
+++ b/stepmake/configure
@@ -1,62 +1,5 @@
 #! /bin/sh
 
-ac_help="$ac_help
-  --with-gtkmm-prefix=PREFIX
-                          Prefix where GTK-- is installed (optional)"
-# Check whether --with-gtkmm-prefix or --without-gtkmm-prefix was given.
-if test "${with_gtkmm_prefix+set}" = set; then
-  withval="$with_gtkmm_prefix"
-  gtkmm_config_prefix="$withval"
-else
-  gtkmm_config_prefix=""
-fi
-
-ac_help="$ac_help
-  --with-gtkmm-exec-prefix=PREFIX
-                          Exec prefix where GTK-- is installed (optional)"
-# Check whether --with-gtkmm-exec-prefix or --without-gtkmm-exec-prefix was given.
-if test "${with_gtkmm_exec_prefix+set}" = set; then
-  withval="$with_gtkmm_exec_prefix"
-  gtkmm_config_exec_prefix="$withval"
-else
-  gtkmm_config_exec_prefix=""
-fi
-
-ac_help="$ac_help
-  --disable-gtkmmtest     Do not try to compile and run a test GTK-- program"
-# Check whether --enable-gtkmmtest or --disable-gtkmmtest was given.
-if test "${enable_gtkmmtest+set}" = set; then
-  enableval="$enable_gtkmmtest"
-  :
-else
-  enable_gtkmmtest=yes
-fi
-
-
-  if test x$gtkmm_config_exec_prefix != x ; then
-     gtkmm_config_args="$gtkmm_config_args --exec-prefix=$gtkmm_config_exec_prefix"
-     if test x${GTKMM_CONFIG+set} != xset ; then
-        GTKMM_CONFIG=$gtkmm_config_exec_prefix/bin/gtkmm-config
-     fi
-  fi
-  if test x$gtkmm_config_prefix != x ; then
-     gtkmm_config_args="$gtkmm_config_args --prefix=$gtkmm_config_prefix"
-     if test x${GTKMM_CONFIG+set} != xset ; then
-        GTKMM_CONFIG=$gtkmm_config_prefix/bin/gtkmm-config
-     fi
-  fi
-
-
-
-
-# Configure paths for GTK--DRAW
-# Derek Quinn Wyatt   98-08-21  (adapted from Jan Nieuwenhuizen's code)
-
-
-
-
-
-
 # Guess values for system-dependent variables and create Makefiles.
 # Generated automatically using autoconf version 2.13 
 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc.
@@ -69,11 +12,13 @@ ac_help=
 ac_default_prefix=/usr/local
 # Any additions from configure.in:
 ac_help="$ac_help
-  enable-config=FILE      put configure settings in config-FILE.make"
+  --enable-config=CONF    put settings in config-CONF.make and config-CONF.h;
+                            do \`make conf=CONF' to get output in ./out-CONF"
 ac_help="$ac_help
-  with-localedir=LOCALE   use LOCALE as locale dir. Default: PREFIX/share/locale "
+  --with-localedir=LOCALE use LOCALE as locale dir.  Default:
+                            PREFIX/share/locale "
 ac_help="$ac_help
-  with-lang=LANG          use LANG as language to emit messages"
+  --with-lang=LANG        use LANG as language to emit messages"
 
 # Initialize some variables set by options.
 # The variables have the same names as the options, with
@@ -608,12 +553,33 @@ fi
     fi
     stepmake=`echo ${stepmake} | sed "s!\\\${prefix}!$presome!"`
 
+    # urg, how is this supposed to work?
+    if test "$program_prefix" = "NONE"; then
+	  program_prefix=
+    fi
+    if test "$program_suffix" = "NONE"; then
+	  program_suffix=
+    fi
+
     echo $ac_n "checking Package""... $ac_c" 1>&6
-echo "configure:613: checking Package" >&5
+echo "configure:566: checking Package" >&5
     if test "x$PACKAGE" = "xSTEPMAKE"; then
 	echo "$ac_t""Stepmake package!" 1>&6
-	(cd stepmake; rm -f stepmake; ln -s ../stepmake .)
-	(cd stepmake; rm -f bin; ln -s ../bin .)
+
+	echo $ac_n "checking builddir""... $ac_c" 1>&6
+echo "configure:571: checking builddir" >&5
+	if test "$srcdir" = "."; then
+	    builddir=.
+	else
+	    absolute_builddir="`pwd`"
+	    package_absolute_builddir="`dirname $absolute_builddir`"
+	    package_srcdir="`dirname  $srcdir`"
+	    builddir="`dirname $package_srcdir`/`basename $package_absolute_builddir`/`basename $absolute_builddir`"
+	fi
+	echo "$ac_t""$builddir" 1>&6
+
+	(cd stepmake 2>/dev/null || mkdir stepmake)
+	(cd stepmake; rm -f bin; ln -s ../$srcdir/bin .)
 	ac_aux_dir=
 for ac_dir in bin $srcdir/bin; do
   if test -f $ac_dir/install-sh; then
@@ -636,15 +602,41 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
 	stepmake=stepmake
     else
         echo "$ac_t""$PACKAGE" 1>&6
+
+	echo $ac_n "checking builddir""... $ac_c" 1>&6
+echo "configure:608: checking builddir" >&5
+	if test "$srcdir" = "."; then
+	    builddir=.
+	    srcdir_build=no
+	else
+	    absolute_builddir="`pwd`"
+#	    builddir="`dirname  $srcdir`/`basename $absolute_builddir`"
+	    builddir="`bash $srcdir/buildscripts/walk.sh \"$srcdir\"`"
+	    srcdir_build=yes
+	fi
+	echo "$ac_t""$builddir" 1>&6
+	if expr "$srcdir" : '/' > /dev/null 2>&1; then
+	    absolute_srcdir=yes
+	    
+    echo "configure: warning: Absolute --srcdir specified: $srcdir" 1>&2
+    warn_b=yes
+
+	fi
+
 	echo $ac_n "checking for stepmake""... $ac_c" 1>&6
-echo "configure:641: checking for stepmake" >&5
+echo "configure:628: checking for stepmake" >&5
 	# Check for installed stepmake
 	if test -d $stepmake; then
 	    echo "$ac_t""$stepmake" 1>&6
 	else
-	    stepmake='$(depth)'/stepmake
-	    echo "$ac_t""./stepmake  ($datadir/stepmake not found)" 1>&6
+	    if test "$absolute_srcdir" != "yes"; then
+		stepmake='$(depth)'/$srcdir/stepmake
+	    else
+		stepmake=$srcdir/stepmake
+	    fi
+	    echo "$ac_t""$srcdir/stepmake  ($datadir/stepmake not found)" 1>&6
 	fi
+
 	ac_aux_dir=
 for ac_dir in \
 	  $HOME/usr/local/share/stepmake/bin\
@@ -656,6 +648,7 @@ for ac_dir in \
 	  /usr/share/stepmake/bin\
 	  /usr/lib/stepmake/bin\
 	  stepmake/bin\
+	  $srcdir/stepmake/bin\
 	 $srcdir/\
 	  $HOME/usr/local/share/stepmake/bin\
 	  $HOME/usr/local/lib/stepmake/bin\
@@ -666,6 +659,7 @@ for ac_dir in \
 	  /usr/share/stepmake/bin\
 	  /usr/lib/stepmake/bin\
 	  stepmake/bin\
+	  $srcdir/stepmake/bin\
 	; do
   if test -f $ac_dir/install-sh; then
     ac_aux_dir=$ac_dir
@@ -688,6 +682,7 @@ if test -z "$ac_aux_dir"; then
 	  /usr/share/stepmake/bin\
 	  /usr/lib/stepmake/bin\
 	  stepmake/bin\
+	  $srcdir/stepmake/bin\
 	 $srcdir/\
 	  $HOME/usr/local/share/stepmake/bin\
 	  $HOME/usr/local/lib/stepmake/bin\
@@ -698,6 +693,7 @@ if test -z "$ac_aux_dir"; then
 	  /usr/share/stepmake/bin\
 	  /usr/lib/stepmake/bin\
 	  stepmake/bin\
+	  $srcdir/stepmake/bin\
 	" 1>&2; exit 1; }
 fi
 ac_config_guess=$ac_aux_dir/config.guess
@@ -710,6 +706,7 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure.
     
     
     
+    
     cat >> confdefs.h <<EOF
 #define PACKAGE "${PACKAGE_NAME}"
 EOF
@@ -729,28 +726,19 @@ EOF
 
     AUTOGENERATE="This file was automatically generated by configure"
     
-    absolute_builddir="`pwd`"
-    
-
-    STATE_VECTOR=`ls make/STATE-VECTOR 2>/dev/null`
-    if test "x$STATE_VECTOR" != "x"; then
-    	STATE_VECTOR="\$(depth)/$STATE_VECTOR"
-    fi
-    
 
     CONFIGSUFFIX=
     # Check whether --enable-config or --disable-config was given.
 if test "${enable_config+set}" = set; then
   enableval="$enable_config"
-  CONFIGSUFFIX=$enableval
+  CONFIGURATION=$enableval
 fi
 
 
-    if test "$CONFIGSUFFIX" != "" ; then
-	CONFIGFILE=config-$CONFIGSUFFIX
-    else
-	CONFIGFILE=config
-    fi
+    ##'
+
+    test -n "$CONFIGURATION" && CONFIGSUFFIX="-$CONFIGURATION"
+    CONFIGFILE=config$CONFIGSUFFIX
     
      
     
@@ -760,7 +748,7 @@ else { echo "configure: error: can not run $ac_config_sub" 1>&2; exit 1; }
 fi
 
 echo $ac_n "checking host system type""... $ac_c" 1>&6
-echo "configure:764: checking host system type" >&5
+echo "configure:752: checking host system type" >&5
 
 host_alias=$host
 case "$host_alias" in
@@ -780,12 +768,13 @@ host_vendor=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'`
 host_os=`echo $host | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
 echo "$ac_t""$host" 1>&6
 
+    
     for ac_prog in gmake make
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:789: checking for $ac_word" >&5
+echo "configure:778: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MAKE'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -813,14 +802,77 @@ fi
 
 test -n "$MAKE" && break
 done
-test -n "$MAKE" || MAKE="error"
+test -n "$MAKE" || MAKE="no"
+
+    
+    
+    r="`eval echo '$'"MAKE"`"
+    if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"MAKE"`' : '.*\(echo\)' > /dev/null; then
+	##STEPMAKE_WARN(cannot find . )
+	false
+    else
+	true
+    fi
+
+    if test $? -ne 0; then
+	
+    eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"gmake make\"`\"
+
+	if test "REQUIRED" = "REQUIRED"; then
+	    command="echo ERROR: gmake make not found"
+	    # abort configure process here?
+	else
+	    command="- echo gmake make not found"
+	fi
+	eval "MAKE"='$command'
+	false
+    else
+	true
+    fi
+
+    if test $? -eq 0 -a -n ""; then
+	
+    r="`eval echo '$'"MAKE"`"
+    echo $ac_n "checking "$r version"""... $ac_c" 1>&6
+echo "configure:838: checking "$r version"" >&5
+    exe=`
+    type -p "$r" 2>&1 | awk '{print $NF}'
+`
+    ver=`
+    "$exe" --version 2>&1 | grep -v '^$' | head -1 | awk '{print $NF}'
+`
+    num=`
+    echo "$ver" | awk -F. '
+    {
+      if ($3) {last = $3}
+      else {last =0}
+    }
+    {printf "%s%s%s\n",$1*100, $2*10,last}'
+`
+    req=`
+    echo "" | awk -F. '
+    {
+      if ($3) {last = $3}
+      else {last =0}
+    }
+    {printf "%s%s%s\n",$1*100, $2*10,last}'
+`
+    echo "$ac_t"""$ver"" 1>&6
+    if test "$num" -lt "$req"; then
+	
+    eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r  (installed: $ver)"\"`\"
+
+    fi
+
+    fi
 
+    
     for ac_prog in find
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:824: checking for $ac_word" >&5
+echo "configure:876: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_FIND'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -848,16 +900,78 @@ fi
 
 test -n "$FIND" && break
 done
-test -n "$FIND" || FIND="error"
+test -n "$FIND" || FIND="no"
+
+    
+    
+    r="`eval echo '$'"FIND"`"
+    if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"FIND"`' : '.*\(echo\)' > /dev/null; then
+	##STEPMAKE_WARN(cannot find . )
+	false
+    else
+	true
+    fi
+
+    if test $? -ne 0; then
+	
+    eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"find\"`\"
+
+	if test "REQUIRED" = "REQUIRED"; then
+	    command="echo ERROR: find not found"
+	    # abort configure process here?
+	else
+	    command="- echo find not found"
+	fi
+	eval "FIND"='$command'
+	false
+    else
+	true
+    fi
+
+    if test $? -eq 0 -a -n ""; then
+	
+    r="`eval echo '$'"FIND"`"
+    echo $ac_n "checking "$r version"""... $ac_c" 1>&6
+echo "configure:936: checking "$r version"" >&5
+    exe=`
+    type -p "$r" 2>&1 | awk '{print $NF}'
+`
+    ver=`
+    "$exe" --version 2>&1 | grep -v '^$' | head -1 | awk '{print $NF}'
+`
+    num=`
+    echo "$ver" | awk -F. '
+    {
+      if ($3) {last = $3}
+      else {last =0}
+    }
+    {printf "%s%s%s\n",$1*100, $2*10,last}'
+`
+    req=`
+    echo "" | awk -F. '
+    {
+      if ($3) {last = $3}
+      else {last =0}
+    }
+    {printf "%s%s%s\n",$1*100, $2*10,last}'
+`
+    echo "$ac_t"""$ver"" 1>&6
+    if test "$num" -lt "$req"; then
+	
+    eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r  (installed: $ver)"\"`\"
+
+    fi
 
+    fi
 
 
+    
     for ac_prog in tar
 do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:861: checking for $ac_word" >&5
+echo "configure:975: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_TAR'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -885,14 +999,76 @@ fi
 
 test -n "$TAR" && break
 done
-test -n "$TAR" || TAR="error"
+test -n "$TAR" || TAR="no"
+
+    
+    
+    r="`eval echo '$'"TAR"`"
+    if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"TAR"`' : '.*\(echo\)' > /dev/null; then
+	##STEPMAKE_WARN(cannot find . )
+	false
+    else
+	true
+    fi
+
+    if test $? -ne 0; then
+	
+    eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"tar\"`\"
+
+	if test "REQUIRED" = "REQUIRED"; then
+	    command="echo ERROR: tar not found"
+	    # abort configure process here?
+	else
+	    command="- echo tar not found"
+	fi
+	eval "TAR"='$command'
+	false
+    else
+	true
+    fi
+
+    if test $? -eq 0 -a -n ""; then
+	
+    r="`eval echo '$'"TAR"`"
+    echo $ac_n "checking "$r version"""... $ac_c" 1>&6
+echo "configure:1035: checking "$r version"" >&5
+    exe=`
+    type -p "$r" 2>&1 | awk '{print $NF}'
+`
+    ver=`
+    "$exe" --version 2>&1 | grep -v '^$' | head -1 | awk '{print $NF}'
+`
+    num=`
+    echo "$ver" | awk -F. '
+    {
+      if ($3) {last = $3}
+      else {last =0}
+    }
+    {printf "%s%s%s\n",$1*100, $2*10,last}'
+`
+    req=`
+    echo "" | awk -F. '
+    {
+      if ($3) {last = $3}
+      else {last =0}
+    }
+    {printf "%s%s%s\n",$1*100, $2*10,last}'
+`
+    echo "$ac_t"""$ver"" 1>&6
+    if test "$num" -lt "$req"; then
+	
+    eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r  (installed: $ver)"\"`\"
+
+    fi
+
+    fi
 
 
     if test "x`uname`" = "xHP-UX"; then
 	# Extract the first word of "bash", so it can be a program name with args.
 set dummy bash; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:896: checking for $ac_word" >&5
+echo "configure:1072: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -932,7 +1108,7 @@ fi
 	# Extract the first word of "bash", so it can be a program name with args.
 set dummy bash; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:936: checking for $ac_word" >&5
+echo "configure:1112: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_SHELL'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -969,7 +1145,7 @@ fi
 	# Extract the first word of "bash", so it can be a program name with args.
 set dummy bash; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:973: checking for $ac_word" >&5
+echo "configure:1149: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_BASH'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1006,11 +1182,73 @@ fi
 	
     fi
 
+    
+    for ac_prog in python
+do
+# Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
+echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
+echo "configure:1192: checking for $ac_word" >&5
+if eval "test \"`echo '$''{'ac_cv_prog_PYTHON'+set}'`\" = set"; then
+  echo $ac_n "(cached) $ac_c" 1>&6
+else
+  if test -n "$PYTHON"; then
+  ac_cv_prog_PYTHON="$PYTHON" # Let the user override the test.
+else
+  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
+  ac_dummy="$PATH"
+  for ac_dir in $ac_dummy; do
+    test -z "$ac_dir" && ac_dir=.
+    if test -f $ac_dir/$ac_word; then
+      ac_cv_prog_PYTHON="$ac_prog"
+      break
+    fi
+  done
+  IFS="$ac_save_ifs"
+fi
+fi
+PYTHON="$ac_cv_prog_PYTHON"
+if test -n "$PYTHON"; then
+  echo "$ac_t""$PYTHON" 1>&6
+else
+  echo "$ac_t""no" 1>&6
+fi
+
+test -n "$PYTHON" && break
+done
+test -n "$PYTHON" || PYTHON="no"
+
+    
+    
+    r="`eval echo '$'"PYTHON"`"
+    if test -n "$r" -a "$r" != "error" -a "$r" != "no" && ! expr '`eval echo '$'"PYTHON"`' : '.*\(echo\)' > /dev/null; then
+	##STEPMAKE_WARN(cannot find . )
+	false
+    else
+	true
+    fi
+
+    if test $? -ne 0; then
+	
+    eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"python\"`\"
 
-    # Extract the first word of "${PYTHON:-python}", so it can be a program name with args.
-set dummy ${PYTHON:-python}; ac_word=$2
+	if test "REQUIRED" = "REQUIRED"; then
+	    command="echo ERROR: python not found"
+	    # abort configure process here?
+	else
+	    command="- echo python not found"
+	fi
+	eval "PYTHON"='$command'
+	false
+    else
+	true
+    fi
+
+    if test $? -eq 0; then
+	# Extract the first word of "python", so it can be a program name with args.
+set dummy python; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1014: checking for $ac_word" >&5
+echo "configure:1252: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_path_PYTHON'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1032,7 +1270,6 @@ else
     fi
   done
   IFS="$ac_save_ifs"
-  test -z "$ac_cv_path_PYTHON" && ac_cv_path_PYTHON="-echo no python"
   ;;
 esac
 fi
@@ -1043,61 +1280,69 @@ else
   echo "$ac_t""no" 1>&6
 fi
 
-    
+	if test -n ""; then
+	    
+    r="`eval echo '$'"PYTHON"`"
+    echo $ac_n "checking "$r version"""... $ac_c" 1>&6
+echo "configure:1288: checking "$r version"" >&5
+    exe=`
+    type -p "$r" 2>&1 | awk '{print $NF}'
+`
+    ver=`
+    "$exe" --version 2>&1 | grep -v '^$' | head -1 | awk '{print $NF}'
+`
+    num=`
+    echo "$ver" | awk -F. '
+    {
+      if ($3) {last = $3}
+      else {last =0}
+    }
+    {printf "%s%s%s\n",$1*100, $2*10,last}'
+`
+    req=`
+    echo "" | awk -F. '
+    {
+      if ($3) {last = $3}
+      else {last =0}
+    }
+    {printf "%s%s%s\n",$1*100, $2*10,last}'
+`
+    echo "$ac_t"""$ver"" 1>&6
+    if test "$num" -lt "$req"; then
+	
+    eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \""$r  (installed: $ver)"\"`\"
+
+    fi
 
-    if test $MAKE != "error" ; then
-	$MAKE -v 2> /dev/null | grep GNU > /dev/null
-	if test "$?" = 1
-	then
-		
-    echo "configure: warning: Please install *GNU* make" 1>&2
-    warn_b=yes
- 
 	fi
-    fi 
+    fi
 
-    
-	result="`echo \"$PYTHON\" | grep echo`"
-	if test "x$PYTHON" = "xerror" -o "x$result" != "x"; then
-		
-    echo "configure: warning: can\'t find python. You should install Python" 1>&2
+
+    if expr "$MAKE" : '.*\(echo\)' >/dev/null; then
+ 	$MAKE -v 2> /dev/null | grep GNU > /dev/null
+	if test "$?" = 1; then
+	    warn='make (Please install *GNU* make)'
+	    
+    echo "configure: warning: $warn" 1>&2
     warn_b=yes
 
-	fi
+	    
+    eval "REQUIRED"=\"`eval echo \"'$'REQUIRED\" \"$warn\"`\"
 
+        fi
+    fi 
 
-    if test "x$OSTYPE" = "xcygwin32" || test "x$OSTYPE" = "xWindows_NT"; then
+    if test "$OSTYPE" = "cygwin" -o "$OSTYPE" = "cygwin32" -o "$OSTYPE" = "Windows_NT"; then
 	LN=cp # hard link does not work under cygnus-nt
 	LN_S='cp -r' # symbolic link does not work for native nt
 	ZIP="zip -r -9" #
-	DOTEXE=.exe
-	# urg
-        # DIRSEP='\\'
- 	# PATHSEP=';'
-	#
-	# cygwin fixes all these things.  
-	# it seems these were used because of dos-style TEXINPUTS and
-	# MFINPUTS needed for miktex.
-	# but this breaks parsing of all other cygwin/unix style paths.
-	#
-	# if your (mik)tex breaks, make a:
-	#    /usr/local/bin/tex:
-	#    #!/bin/sh
-	#    TEXINPUTS=`cygpath -pw $TEXINPUTS` /texmf/miktex/bin/tex 
-	#
-	# and
-	#
-	#    /usr/local/bin/mf:
-	#    #!/bin/sh
-	#    MFINPUTS=`cygpath -pw $MFINPUTS` /texmf/miktex/bin/mf 
-	#
-	# this way, you may have buildscripts/out/lilypond-profile 
-	# 'automatically' sourced from /usr/etc/profile.d/ too.
-	#
+	program_suffix=.exe
+ 	ROOTSEP=':'
         DIRSEP='/'
  	PATHSEP=':'
 	INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c"
     else
+	ROOTSEP=':'
 	DIRSEP='/'
 	PATHSEP=':'
 	LN=ln
@@ -1110,6 +1355,7 @@ fi
     
     
     
+    
     cat >> confdefs.h <<EOF
 #define DIRSEP '${DIRSEP}'
 EOF
@@ -1121,7 +1367,6 @@ EOF
     
     
   
-   
     
     if test "$datadir" = "\${prefix}/share"; then
 	    datadir='${prefix}/share/'$package
@@ -1132,8 +1377,11 @@ EOF
 	    presome=${ac_default_prefix}
     fi
     DIR_DATADIR=`echo ${DIR_DATADIR} | sed "s!\\\${prefix}!$presome!"`
+
     
     
+    
+                        
     cat >> confdefs.h <<EOF
 #define DIR_DATADIR "${DIR_DATADIR}"
 EOF
@@ -1145,14 +1393,14 @@ EOF
 # AC_CONFIG_SUBDIRS(stepmake)
 
 # Uncomment the configuration options your package needs.
-# AC_STEPMAKE_COMPILE
+# STEPMAKE_COMPILE
 # AC_HAVE_HEADERS(limits.h malloc.h string.h unistd.h values.h)
-# AC_STEPMAKE_CXX
-# AC_STEPMAKE_GXX
-# AC_STEPMAKE_CXXTEMPLATE
-# AC_STEPMAKE_LEXYACC
-# AC_STEPMAKE_LIB
-# AC_STEPMAKE_LIBTOOL
+# STEPMAKE_CXX
+# STEPMAKE_GXX
+# STEPMAKE_CXXTEMPLATE
+# STEPMAKE_LEXYACC
+# STEPMAKE_LIB
+# STEPMAKE_LIBTOOL
 
     lang=English
     ALL_LINGUAS="en nl"
@@ -1177,7 +1425,7 @@ fi
 
 
     echo $ac_n "checking language""... $ac_c" 1>&6
-echo "configure:1181: checking language" >&5    
+echo "configure:1429: checking language" >&5    
     case "$language" in
       En* | en* | Am* | am* | US* | us*)
 	    lang=English;;
@@ -1198,312 +1446,11 @@ echo "configure:1181: checking language" >&5
     fi
 
 
-# AC_STEPMAKE_GETTEXT
-# AC_STEPMAKE_MAN
-# AC_STEPMAKE_MSGFMT
-# AC_STEPMAKE_TEXMF
-# AC_STEPMAKE_TEXMF_DIRS
-
-    if test "x$YODL" = "x"; then 
-	for ac_prog in striproff
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1214: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_STRIPROFF'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$STRIPROFF"; then
-  ac_cv_prog_STRIPROFF="$STRIPROFF" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_STRIPROFF="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-STRIPROFF="$ac_cv_prog_STRIPROFF"
-if test -n "$STRIPROFF"; then
-  echo "$ac_t""$STRIPROFF" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$STRIPROFF" && break
-done
-test -n "$STRIPROFF" || STRIPROFF="-echo no striproff"
-
-	for ac_prog in yodl
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1249: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_YODL'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$YODL"; then
-  ac_cv_prog_YODL="$YODL" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_YODL="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-YODL="$ac_cv_prog_YODL"
-if test -n "$YODL"; then
-  echo "$ac_t""$YODL" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$YODL" && break
-done
-test -n "$YODL" || YODL="-echo no yodl"
-
-	for ac_prog in yodl2html
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1284: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_YODL2HTML'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$YODL2HTML"; then
-  ac_cv_prog_YODL2HTML="$YODL2HTML" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_YODL2HTML="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-YODL2HTML="$ac_cv_prog_YODL2HTML"
-if test -n "$YODL2HTML"; then
-  echo "$ac_t""$YODL2HTML" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$YODL2HTML" && break
-done
-test -n "$YODL2HTML" || YODL2HTML="-echo no yodl"
-
-	for ac_prog in yodl2latex
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1319: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_YODL2LATEX'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$YODL2LATEX"; then
-  ac_cv_prog_YODL2LATEX="$YODL2LATEX" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_YODL2LATEX="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-YODL2LATEX="$ac_cv_prog_YODL2LATEX"
-if test -n "$YODL2LATEX"; then
-  echo "$ac_t""$YODL2LATEX" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$YODL2LATEX" && break
-done
-
-	for ac_prog in yodl2man
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1353: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_YODL2MAN'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$YODL2MAN"; then
-  ac_cv_prog_YODL2MAN="$YODL2MAN" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_YODL2MAN="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-YODL2MAN="$ac_cv_prog_YODL2MAN"
-if test -n "$YODL2MAN"; then
-  echo "$ac_t""$YODL2MAN" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$YODL2MAN" && break
-done
-test -n "$YODL2MAN" || YODL2MAN="-echo no yodl"
-
-	for ac_prog in yodl2msless
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1388: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_YODL2MSLESS'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$YODL2MSLESS"; then
-  ac_cv_prog_YODL2MSLESS="$YODL2MSLESS" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_YODL2MSLESS="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-YODL2MSLESS="$ac_cv_prog_YODL2MSLESS"
-if test -n "$YODL2MSLESS"; then
-  echo "$ac_t""$YODL2MSLESS" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$YODL2MSLESS" && break
-done
-test -n "$YODL2MSLESS" || YODL2MSLESS="-echo no yodl"
-
-	for ac_prog in yodl2texinfo
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1423: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_YODL2TEXINFO'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$YODL2TEXINFO"; then
-  ac_cv_prog_YODL2TEXINFO="$YODL2TEXINFO" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_YODL2TEXINFO="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-YODL2TEXINFO="$ac_cv_prog_YODL2TEXINFO"
-if test -n "$YODL2TEXINFO"; then
-  echo "$ac_t""$YODL2TEXINFO" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$YODL2TEXINFO" && break
-done
-test -n "$YODL2TEXINFO" || YODL2TEXINFO="-echo no yodl"
-
-	for ac_prog in yodl2txt
-do
-# Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1458: checking for $ac_word" >&5
-if eval "test \"`echo '$''{'ac_cv_prog_YODL2TXT'+set}'`\" = set"; then
-  echo $ac_n "(cached) $ac_c" 1>&6
-else
-  if test -n "$YODL2TXT"; then
-  ac_cv_prog_YODL2TXT="$YODL2TXT" # Let the user override the test.
-else
-  IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=":"
-  ac_dummy="$PATH"
-  for ac_dir in $ac_dummy; do
-    test -z "$ac_dir" && ac_dir=.
-    if test -f $ac_dir/$ac_word; then
-      ac_cv_prog_YODL2TXT="$ac_prog"
-      break
-    fi
-  done
-  IFS="$ac_save_ifs"
-fi
-fi
-YODL2TXT="$ac_cv_prog_YODL2TXT"
-if test -n "$YODL2TXT"; then
-  echo "$ac_t""$YODL2TXT" 1>&6
-else
-  echo "$ac_t""no" 1>&6
-fi
-
-test -n "$YODL2TXT" && break
-done
-test -n "$YODL2TXT" || YODL2TXT="-echo no yodl"
-
-	YODL2LESS_DIR='$(bindir)/'
-    else
-	
-	
-	
-	
-	
-	
-	
-	
-	
-	export STRIPROFF YODL YODL2HTML YODL2LATEX YODL2MAN YODL2MSLESS YODL2TEXINFO YODL2TXT
-    fi
-    if test "x$YODL" = "-echo no yodl"; then
-	
-    echo "configure: warning: Did not find YODL (Yodl is Yet Oneother Document Language, see http://www.cs.uu.nl/~hanwen/yodl)" 1>&2
-    warn_b=yes
-
-    fi    
-
+# STEPMAKE_GETTEXT
+# STEPMAKE_MAN
+# STEPMAKE_MSGFMT
+# STEPMAKE_TEXMF
+# STEPMAKE_TEXMF_DIRS
 
 # AM_PATH_GTK(1.0.0,,AC_MSG_ERROR([please install proper version of gtk]))
 # AM_PATH_GTK__(0.9.4,,AC_MSG_ERROR([please install proper version of gtk--]))
@@ -1513,7 +1460,7 @@ do
 # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:1517: checking for $ac_word" >&5
+echo "configure:1464: checking for $ac_word" >&5
 if eval "test \"`echo '$''{'ac_cv_prog_MAKEINFO'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
@@ -1543,10 +1490,11 @@ test -n "$MAKEINFO" && break
 done
 test -n "$MAKEINFO" || MAKEINFO="error"
 
-# AC_CHECK_SEARCH_RESULT($YODL2TEXINFO, yodl,  
-#    You should install Yodl 1.30.pre6 or better)
 
 
+    
+    
+    
     trap '' 1 2 15
 cat > confcache <<\EOF
 # This file is a shell script that caches the results of configure
@@ -1647,7 +1595,7 @@ done
 
 ac_given_srcdir=$srcdir
 
-trap 'rm -fr `echo "$CONFIGFILE.make:config.make.in $CONFIGFILE.hh:config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
+trap 'rm -fr `echo "$CONFIGFILE.make:config.make.in $CONFIGFILE.h:config.hh.in" | sed "s/:[^ ]*//g"` conftest*; exit 1' 1 2 15
 EOF
 cat >> $CONFIG_STATUS <<EOF
 
@@ -1679,14 +1627,13 @@ s%@includedir@%$includedir%g
 s%@oldincludedir@%$oldincludedir%g
 s%@infodir@%$infodir%g
 s%@mandir@%$mandir%g
+s%@builddir@%$builddir%g
 s%@stepmake@%$stepmake%g
 s%@package@%$package%g
 s%@PACKAGE@%$PACKAGE%g
 s%@PACKAGE_NAME@%$PACKAGE_NAME%g
 s%@package_depth@%$package_depth%g
 s%@AUTOGENERATE@%$AUTOGENERATE%g
-s%@absolute_builddir@%$absolute_builddir%g
-s%@STATE_VECTOR@%$STATE_VECTOR%g
 s%@CONFIGSUFFIX@%$CONFIGSUFFIX%g
 s%@host@%$host%g
 s%@host_alias@%$host_alias%g
@@ -1698,7 +1645,8 @@ s%@FIND@%$FIND%g
 s%@TAR@%$TAR%g
 s%@BASH@%$BASH%g
 s%@PYTHON@%$PYTHON%g
-s%@DOTEXE@%$DOTEXE%g
+s%@program_prefix@%$program_prefix%g
+s%@program_suffix@%$program_suffix%g
 s%@ZIP@%$ZIP%g
 s%@LN@%$LN%g
 s%@LN_S@%$LN_S%g
@@ -1706,16 +1654,9 @@ s%@INSTALL@%$INSTALL%g
 s%@PATHSEP@%$PATHSEP%g
 s%@DIRSEP@%$DIRSEP%g
 s%@DIR_DATADIR@%$DIR_DATADIR%g
-s%@STRIPROFF@%$STRIPROFF%g
-s%@YODL@%$YODL%g
-s%@YODL2HTML@%$YODL2HTML%g
-s%@YODL2LATEX@%$YODL2LATEX%g
-s%@YODL2MAN@%$YODL2MAN%g
-s%@YODL2MSLESS@%$YODL2MSLESS%g
-s%@YODL2TEXINFO@%$YODL2TEXINFO%g
-s%@YODL2TXT@%$YODL2TXT%g
-s%@YODL2LESS_DIR@%$YODL2LESS_DIR%g
 s%@MAKEINFO@%$MAKEINFO%g
+s%@OPTIONAL@%$OPTIONAL%g
+s%@REQUIRED@%$REQUIRED%g
 
 CEOF
 EOF
@@ -1833,7 +1774,7 @@ ac_eD='%g'
 if test "${CONFIG_HEADERS+set}" != set; then
 EOF
 cat >> $CONFIG_STATUS <<EOF
-  CONFIG_HEADERS="$CONFIGFILE.hh:config.hh.in"
+  CONFIG_HEADERS="$CONFIGFILE.h:config.hh.in"
 EOF
 cat >> $CONFIG_STATUS <<\EOF
 fi
@@ -1931,7 +1872,37 @@ rm -fr confdefs* $ac_clean_files
 test "$no_create" = yes || ${CONFIG_SHELL-/bin/sh} $CONFIG_STATUS || exit 1
 
 
-    rm -f GNUmakefile
-    cp make/toplevel.make.in ./GNUmakefile
-    chmod 444 GNUmakefile
+    
+    if test -n "$OPTIONAL"; then
+	echo
+        echo "WARNING: Please consider installing optional programs: $OPTIONAL"
+    fi
+
+    if test -n "$REQUIRED"; then
+	echo
+        echo "ERROR: Please install required programs: $REQUIRED"
+    fi
+    
+    if test -n "$OPTIONAL$REQUIRED"; then
+	echo
+	echo "See INSTALL.txt for more information on how to build $PACKAGE_NAME"
+	echo "Remove config.cache before rerunning ./configure"
+    fi
+    
+    if test -n "$REQUIRED"; then
+	rm -f $srcdir/GNUmakefile
+        exit 1
+    fi
+
+    # regular in-place build
+    # test for srcdir_build = yes ?
+    if test "$builddir" = "."; then
+	rm -f $srcdir/GNUmakefile
+	cp $srcdir/GNUmakefile.in $srcdir/GNUmakefile
+	chmod 444 $srcdir/GNUmakefile
+    else # --srcdir build
+        rm -f GNUmakefile
+    	cp $srcdir/make/srcdir.make.in GNUmakefile
+    	chmod 444 GNUmakefile
+    fi