X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=stepmake%2Faclocal.m4;h=e249e98a67f2149c26711bd62652ec57edf7e8e0;hb=adc7c4f282bd67ef79502c1561444efacaa063d8;hp=4e5758a7220b6c890b82f3d2796217bbb8555cb8;hpb=b223cddb11343dd7321154dfe7c2b3fea7aafee0;p=lilypond.git diff --git a/stepmake/aclocal.m4 b/stepmake/aclocal.m4 index 4e5758a722..e249e98a67 100644 --- a/stepmake/aclocal.m4 +++ b/stepmake/aclocal.m4 @@ -11,7 +11,7 @@ AC_DEFUN(STEPMAKE_GET_EXECUTABLE, [ ## command -v doesn't work in zsh ## command -v "$1" 2>&1 ## this test should work in ash, bash, pdksh (ksh), zsh - type -p "$1" 2>/dev/null | tail -n 1 | awk '{print $NF}' + type -p $1 2>/dev/null | tail -n 1 | awk '{print $NF}' ]) @@ -25,8 +25,7 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [ ## ## -V: Workaround for python - changequote(<<, >>)dnl - ##set -x + changequote(<<, >>)#dnl ## Assume and hunt for dotted version multiplet. ## use eval trickery, because we cannot use multi-level $() instead of `` ## for compatibility reasons. @@ -42,8 +41,7 @@ AC_DEFUN(STEPMAKE_GET_VERSION, [ | sed -e 's/^[^.0-9]*//' -e 's/[^.0-9]*$//'\`\" fi echo "$_ver" - ##set +x - changequote([, ])dnl + changequote([, ])#dnl ]) # Calculate simplistic numeric version from version string ($1) @@ -412,6 +410,23 @@ class yy_flex_lexer: public yyFlexLexer ]) + +AC_DEFUN(STEPMAKE_FLEXLEXER_LOCATION, [ + AC_MSG_CHECKING([FlexLexer.h path]) + + # ugh. + cat < conftest.cc +using namespace std; +#include +EOF + FLEXLEXER_PATH=`$CXX -E conftest.cc | \ + sed 's!# 1 "\(.*\)FlexLexer.h"!@FLEXLEXER@\1@@!g' | grep '@@' | \ + sed 's!.*@FLEXLEXER@\(.*\)@@.*$!\1!g' ` >& /dev/null + rm conftest.cc + AC_SUBST(FLEXLEXER_PATH) + AC_MSG_RESULT($FLEXLEXER_PATH) +]) + AC_DEFUN(STEPMAKE_GCC, [ if test "$GCC" = "yes"; then STEPMAKE_CHECK_VERSION(CC, $1, $2) @@ -519,11 +534,11 @@ AC_DEFUN(STEPMAKE_GUILE_DEVEL, [ AC_SUBST(GUILE_CONFIG) guile_version="$ver" - changequote(<<, >>)dnl + changequote(<<, >>)#dnl GUILE_MAJOR_VERSION=`expr $guile_version : '\([0-9]*\)'` GUILE_MINOR_VERSION=`expr $guile_version : '[0-9]*\.\([0-9]*\)'` GUILE_PATCH_LEVEL=`expr $guile_version : '[0-9]*\.[0-9]*\.\([0-9]*\)'` - changequote([, ])dnl + changequote([, ])#dnl STEPMAKE_GUILE_FLAGS save_CPPFLAGS="$CPPFLAGS" save_LIBS="$LIBS" @@ -570,10 +585,10 @@ AC_DEFUN(STEPMAKE_INIT, [ fi export MAJOR_VERSION MINOR_VERSION PATCH_LEVEL # urg: don't "fix" this: irix doesn't know about [:lower:] and [:upper:] - changequote(<<, >>)dnl + changequote(<<, >>)#dnl PACKAGE=`echo $PACKAGE_NAME | tr '[a-z]' '[A-Z]'` package=`echo $PACKAGE_NAME | tr '[A-Z]' '[a-z]'` - changequote([, ])dnl + changequote([, ])#dnl # No versioning on directory names of sub-packages # urg, urg @@ -708,26 +723,16 @@ AC_DEFUN(STEPMAKE_INIT, [ # STEPMAKE_WARN($warn) STEPMAKE_ADD_ENTRY(REQUIRED, $warn) fi - fi - - 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" # - program_suffix=.exe - ROOTSEP=':' - DIRSEP='/' - PATHSEP=':' - INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" - else - ROOTSEP=':' - DIRSEP='/' - PATHSEP=':' - LN=ln - LN_S='ln -s' - ZIP="zip -r -9" - INSTALL="\$(SHELL) \$(stepdir)/../bin/install-sh -c" fi + + ROOTSEP=':' + DIRSEP='/' + PATHSEP=':' + LN=ln + LN_S='ln -s' + ZIP="zip -r -9" + INSTALL="\$(SHELL) \$(stepdir)/../bin/install-sh -c" + AC_SUBST(program_prefix) AC_SUBST(program_suffix) AC_SUBST(ZIP) @@ -780,14 +785,7 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [ AC_CHECK_LIB(kpathsea, kpse_find_file) AC_CHECK_FUNCS(kpse_find_file,,kpathsea_b=no) if test "$kpathsea_b" = "no"; then - warn='kpathsea (libkpathsea-dev, kpathsea-devel or tetex-devel - package). - Else, please specify the directories where kpathsea/kpathsea.h and - libkpathsea.a are installed using --with-kpathsea-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) + STEPMAKE_ADD_ENTRY(OPTIONAL, $warn) fi fi @@ -797,12 +795,12 @@ AC_DEFUN(STEPMAKE_KPATHSEA, [ AC_TRY_LINK([#include ], [kpse_var_expand ("\$TEXMF");], [have_libkpathsea_so=maybe; - shared_size=`wc -c conftest`; + shared_size=`wc -c conftest$ac_exeext`; shared_size=`echo $shared_size | sed -e 's/ .*//g'`], [have_libkpathsea_so=no]) if test "$have_libkpathsea_so" = "maybe"; then - if test $shared_size -lt 40000 ; then + if test "$shared_size" -lt 40000 ; then have_libkpathsea_so=yes else have_libkpathsea_so=no @@ -971,11 +969,11 @@ AC_DEFUN(STEPMAKE_PYTHON, [ AC_DEFUN(STEPMAKE_PYTHON_DEVEL, [ unset PYTHON_HEADER PYTHON_INCLUDE if test -n "$PYTHON"; then - changequote(<<, >>)dnl + changequote(<<, >>)#dnl # alternatively, for python >= 2.0 # 'import sys, distutils.sysconfig; sys.stdout.write (distutils.sysconfig.get_python_inc ())' PYTHON_INCLUDE=`$PYTHON -c 'import sys; sys.stdout.write ("%s/include/python%s" % (sys.prefix, sys.version[:3]))'` - changequote([, ])dnl + changequote([, ])#dnl fi ##AC_CHECK_HEADERS([Python.h],[PYTHON_HEADER=yes]) @@ -1083,7 +1081,9 @@ AC_DEFUN(STEPMAKE_FREETYPE2, [ AC_SUBST(FREETYPE2_CFLAGS) AC_SUBST(FREETYPE2_LIBS) else - r="lib$1-dev or $1-devel" + # UGR + #r="lib$1-dev or $1-devel" + r="libfreetype6-dev or freetype?-devel" ver="$(pkg-config --modversion $1)" STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"]) fi @@ -1098,7 +1098,7 @@ AC_DEFUN(STEPMAKE_GTK2, [ else # UGR # r="lib$1-dev or $1-devel" - r="libgtk+2.0-dev or gtk2-devel" + r="libgtk2.0-dev or gtk2-devel" ver="$(pkg-config --modversion $1)" STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"]) fi @@ -1148,8 +1148,8 @@ AC_DEFUN(STEPMAKE_PANGO_FT2, [ LIBS="$save_LIBS" else # UGR - #r="lib$1-dev or $1-devel" - r="libpango1.0-dev or pango1.0-devel" + #r="lib$1-dev or $1-devel"e + r="libpango1.0-dev or pango?-devel" ver="$(pkg-config --modversion $1)" STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"]) fi @@ -1176,3 +1176,40 @@ AC_DEFUN(STEPMAKE_FONTCONFIG, [ STEPMAKE_ADD_ENTRY($2, ["$r >= $3 (installed: $ver)"]) fi ]) + +AC_DEFUN(STEPMAKE_WINDOWS, [ + AC_CYGWIN + AC_MINGW32 + + if test "$CYGWIN" == "yes"; then + LN_S='cp -r' # Cygwin symbolic links do not work for native apps. + program_suffix=.exe + INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" + elif test "$MINGW32" == "yes"; then + LN='cp -r' + LN_S='cp -r' + program_suffix=.exe + INSTALL="\$(SHELL) \$(stepdir)/../bin/install-dot-exe.sh -c" + PATHSEP=';' + fi + + AC_SUBST(LN) + AC_SUBST(LN_S) + AC_SUBST(INSTALL) + AC_DEFINE_UNQUOTED(DIRSEP, ['${DIRSEP}']) + AC_DEFINE_UNQUOTED(PATHSEP, ['${PATHSEP}']) + AC_SUBST(DIRSEP) + AC_SUBST(PATHSEP) + AC_SUBST(program_suffix) + + AC_MSG_CHECKING([for some flavor of Windows]) + if test "$CYGWIN$MINGW32" == "nono"; then + PLATFORM_WINDOWS=no + else + PLATFORM_WINDOWS=yes + fi + AC_MSG_RESULT([$PLATFORM_WINDOWS]) + AC_SUBST(PLATFORM_WINDOWS) + STEPMAKE_PROGS(WINDRES, $target-windres windres, x) + AC_SUBST(WINDRES) +])