fi
if test $profile_b = yes; then
- EXTRA_LIBES="-pg"
+ EXTRA_LIBS="-pg"
OPTIMIZE="$OPTIMIZE -pg"
fi
AC_SUBST(CFLAGS)
AC_SUBST(CPPFLAGS)
AC_SUBST(LDFLAGS)
- AC_SUBST(ICFLAGS)
- AC_SUBST(ILDFLAGS)
AC_SUBST(DEFINES)
- AC_SUBST(EXTRA_LIBES)
+ AC_SUBST(EXTRA_LIBS)
])
AC_DEFUN(STEPMAKE_CXX, [
AC_PROG_CXX
STEPMAKE_OPTIONAL_REQUIRED(CXX, c++, $1)
- CPPFLAGS="$CPPFLAGS $DEFINES"
CXXFLAGS="$CXXFLAGS $OPTIMIZE"
- LDFLAGS="$LDFLAGS $EXTRA_LIBES"
+ LD='$(CXX)'
- AC_SUBST(CXXFLAGS)
AC_SUBST(CXX)
- LD='$(CXX)'
+ AC_SUBST(CXXFLAGS)
AC_SUBST(LD)
])
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
+ else
+ if test -f $srcdir/GNUmakefile; then
+ cat <<EOF
+Source directory already configured. Please clean the source directory
+
+ make -C $srcdir distclean
+
+and rerun configure.
+EOF
+ exit 2
+ fi
+ rm -f GNUmakefile
+ cp $srcdir/GNUmakefile.in GNUmakefile
+ ## (cd $srcdir && find . -name GNUmakefile -o -name '*.make' | grep -v config.make | xargs tar -cf-) | tar -xf-
+ for i in $(cd $srcdir && find . -name GNUmakefile -o -name '*.make' | grep -v config.make); do
+ mkdir -p $(dirname $i)
+ ln -sf $srcdir/$i $i
+ done
+ ln -sf $srcdir/VERSION .
+ AC_SUBST(VPATH)
fi
])
])
+
+AC_DEFUN(STEPMAKE_FLEXLEXER_LOCATION, [
+ AC_MSG_CHECKING([FlexLexer.h path])
+
+ # ugh.
+ cat <<EOF > conftest.cc
+using namespace std;
+#include <FlexLexer.h>
+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)
AC_PREREQ(2.50)
. $srcdir/VERSION
FULL_VERSION=$MAJOR_VERSION.$MINOR_VERSION.$PATCH_LEVEL
+ MICRO_VERSION=$PATCH_LEVEL
+ TOPLEVEL_VERSION=$FULL_VERSION
if test x$MY_PATCH_LEVEL != x; then
FULL_VERSION=$FULL_VERSION.$MY_PATCH_LEVEL
fi
+ VERSION=$FULL_VERSION
export MAJOR_VERSION MINOR_VERSION PATCH_LEVEL
# urg: don't "fix" this: irix doesn't know about [:lower:] and [:upper:]
changequote(<<, >>)#dnl
fi
AC_SUBST(ugh_ugh_autoconf250_builddir)
+ AC_SUBST(srcdir)
AC_SUBST(stepmake)
AC_SUBST(package)
AC_SUBST(PACKAGE)
AC_SUBST(PACKAGE_NAME)
+ AC_SUBST(VERSION)
AC_SUBST(MAJOR_VERSION)
AC_SUBST(MINOR_VERSION)
+ AC_SUBST(MICRO_VERSION)
+
+ # stepmake nonstandard names
+ AC_SUBST(PATCH_LEVEL)
+ AC_SUBST(TOPLEVEL_VERSION)
# We don't need the upper case variant,
# so stick to macros are uppercase convention.
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
PKG_CHECK_MODULES(FREETYPE2, $1 >= $3, have_freetype2=yes, true)
if test "$have_freetype2" = yes; then
AC_DEFINE(HAVE_FREETYPE2)
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"
+ CPPFLAGS="$FREETYPE2_CFLAGS $CPPFLAGS"
+ LIBS="$FREETYPE2_LIBS $LIBS"
AC_SUBST(FREETYPE2_CFLAGS)
AC_SUBST(FREETYPE2_LIBS)
+ CPPFLAGS="$save_CPPFLAGS"
+ LIBS="$save_LIBS"
else
# UGR
#r="lib$1-dev or $1-devel"
PKG_CHECK_MODULES(GTK2, $1 >= $3, have_gtk2=yes, true)
if test "$have_gtk2" = yes ; then
AC_DEFINE(HAVE_GTK2)
+ # Do not pollute user-CPPFLAGS with configure-CPPFLAGS
+ save_CPPFLAGS="$CPPFLAGS"
+ save_LIBS="$LIBS"
+ CPPFLAGS="$GTK2_CFLAGS $CPPFLAGS"
+ LIBS="$GTK2_LIBS $LIBS"
AC_SUBST(GTK2_CFLAGS)
AC_SUBST(GTK2_LIBS)
+ CPPFLAGS="$save_CPPFLAGS"
+ LIBS="$save_LIBS"
else
# UGR
# r="lib$1-dev or $1-devel"
PKG_CHECK_MODULES(PANGO, $1 >= $3, have_pango16=yes, true)
if test "$have_pango16" = yes ; then
AC_DEFINE(HAVE_PANGO16)
- PANGO_CFLAGS="$PANGO_CFLAGS $GTK2_CFLAGS"
- PANGO_LIBS="$PANGO_LIBS $GTK2_LIBS"
# Do not pollute user-CPPFLAGS with configure-CPPFLAGS
save_CPPFLAGS="$CPPFLAGS"
save_LIBS="$LIBS"
+ CPPFLAGS="$PANGO_CFLAGS $CPPFLAGS"
+ LIBS="$PANGO_LIBS $LIBS"
AC_CHECK_HEADERS([pango/pangofc-fontmap.h])
AC_CHECK_FUNCS([pango_fc_font_map_add_decoder_find_func])
AC_SUBST(PANGO_CFLAGS)
if test "$have_pangoft2" = yes ; then
AC_DEFINE(HAVE_PANGO16)
AC_DEFINE(HAVE_PANGO_FT2)
- PANGO_FT2_CFLAGS="$PANGO_FT2_CFLAGS $GTK2_CFLAGS"
- PANGO_FT2_LIBS="$PANGO_FT2_LIBS $GTK2_LIBS"
# Do not pollute user-CPPFLAGS with configure-CPPFLAGS
save_CPPFLAGS="$CPPFLAGS"
save_LIBS="$LIBS"
PKG_CHECK_MODULES(FONTCONFIG, $1 >= $3, have_fontconfig=yes, true)
if test "$have_fontconfig" = yes ; then
AC_DEFINE(HAVE_FONTCONFIG)
- FONTCONFIG_CFLAGS="$FONTCONFIG_CFLAGS"
- FONTCONFIG_LIBS="$FONTCONFIG_LIBS"
# Do not pollute user-CPPFLAGS with configure-CPPFLAGS
save_CPPFLAGS="$CPPFLAGS"
save_LIBS="$LIBS"
- CPPFLAGS="$CPPFLAGS $FONTCONFIG_CFLAGS"
+ CPPFLAGS="$FONTCONFIG_CFLAGS $CPPFLAGS"
LIBS="$FONTCONFIG_LIBS $LIBS"
AC_SUBST(FONTCONFIG_CFLAGS)
AC_SUBST(FONTCONFIG_LIBS)
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 "$MINGW" == "yes"; then
+ 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
projects / lilypond.git / blobdiff