X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Faclocal.m4;h=cf2176ed43c98f550145abd95d35086654e0813a;hb=e63ea5ba4dfc0ecf69e0211dc0327503dfc05037;hp=17c80f15f983961a51c28755475f5ea2b16ac23d;hpb=546cefdbf177b7da323f71e41197983b7174d7d1;p=lilypond.git

diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4
index 17c80f15f9..cf2176ed43 100644
--- a/stepmake/aclocal.m4
+++ b/stepmake/aclocal.m4
@@ -106,7 +106,6 @@ AC_DEFUN(STEPMAKE_BISON, [
 	STEPMAKE_CHECK_VERSION(BISON, $1, $2)
     fi
 ])
-    
 
 
 AC_DEFUN(STEPMAKE_COMPILE, [
@@ -192,9 +191,6 @@ AC_DEFUN(STEPMAKE_CXX, [
     AC_PROG_CXX
     STEPMAKE_OPTIONAL_REQUIRED(CXX, c++, $1)
 
-    AC_CHECK_HEADER(FlexLexer.h, true,
-	STEPMAKE_WARN(cannot find flex header.  Please install Flex headers correctly))
-
     CPPFLAGS="$CPPFLAGS $DEFINES"
     CXXFLAGS="$CXXFLAGS $OPTIMIZE"
     LDFLAGS="$LDFLAGS $EXTRA_LIBES"
@@ -299,6 +295,24 @@ AC_DEFUN(STEPMAKE_FLEX, [
 ])
 
 
+AC_DEFUN(STEPMAKE_FLEXLEXER, [
+    AC_HAVE_HEADERS(FlexLexer.h, true, false)
+    if test $? -ne 0; then
+	warn='FlexLexer.h (flex package)'
+	STEPMAKE_ADD_ENTRY($1, $warn)
+    fi
+])
+
+
+AC_DEFUN(STEPMAKE_GCC, [
+    if test "$GCC" = "yes"; then
+        STEPMAKE_CHECK_VERSION(CC, $1, $2)
+    else
+	warn="$CC (Please install *GNU* cc)"
+	STEPMAKE_ADD_ENTRY($1, $warn)
+    fi
+])
+
 
 AC_DEFUN(STEPMAKE_GETTEXT, [
     DIR_LOCALEDIR=${localedir}
@@ -369,7 +383,6 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
 	fi
     done
     STEPMAKE_OPTIONAL_REQUIRED(GUILE_CONFIG, $guile_config, $1)
-    #if expr "$GUILE_CONFIG" : '.*\(echo\)' >/dev/null; then
     if test $? -ne 0; then
         STEPMAKE_ADD_ENTRY($1, 'guile-config (guile-devel, guile-dev or libguile-dev package)')
     fi 
@@ -394,25 +407,15 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [
 
 
 AC_DEFUN(STEPMAKE_GXX, [
-    AC_MSG_CHECKING("g++ version")
-    cxx_version=`$CXX --version`
-    AC_MSG_RESULT("$cxx_version")
-    changequote(<<, >>)dnl
-    # urg, egcs: how to check for egcs >= 1.1?
-    if expr "$cxx_version" : '.*2\.[89]' > /dev/null ||
-	expr "$cxx_version" : '.*egcs' > /dev/null ||
-	expr "$cxx_version" : '3\.[0-9]' > /dev/null
-    changequote([, ])dnl
-    then
-	    true
+    if test "$GXX" = "yes"; then
+        STEPMAKE_CHECK_VERSION(CXX, $1, $2)
     else
-	STEPMAKE_WARN(cannot find g++ 2.8, 2.9, 3.x or egcs 1.1)
-        STEPMAKE_ADD_ENTRY($1, 'g++ >= 2.95 (gcc package)')
+	warn="$CXX (Please install *GNU* c++)"
+	STEPMAKE_ADD_ENTRY($1, $warn)
     fi
 ])
 
 
-
 AC_DEFUN(STEPMAKE_INIT, [
 
     . $srcdir/VERSION
@@ -562,7 +565,7 @@ AC_DEFUN(STEPMAKE_INIT, [
  	$MAKE -v 2> /dev/null | grep GNU > /dev/null
 	if test "$?" = 1; then
 	    warn='make (Please install *GNU* make)'
-	    STEPMAKE_WARN($warn)
+	    # STEPMAKE_WARN($warn)
 	    STEPMAKE_ADD_ENTRY(REQUIRED, $warn)
         fi
     fi 
@@ -763,9 +766,10 @@ AC_DEFUN(STEPMAKE_PERL, [
 
 
 AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [
-    AC_HAVE_HEADERS(python2.2/Python.h python2.1/Python.h python2.0/Python.h python2/Python.h python/Python.h python1.5/Python.h Python.h)
-    if test $? -ne 0; then
-	STEPMAKE_ADD_ENTRY($1, 'python.h (python-devel, python-dev or libpython-dev package)')
+    AC_HAVE_HEADERS(python2.2/Python.h python2.1/Python.h python2.0/Python.h python2/Python.h python/Python.h python1.5/Python.h Python.h, PYTHON_HEADER=yes)
+    if test -z "$PYTHON_HEADER"; then
+	warn='python.h (python-devel, python-dev or libpython-dev package)'
+	STEPMAKE_ADD_ENTRY($1, $warn)
     fi
 ])