diff options
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 36 |
1 files changed, 26 insertions, 10 deletions
diff --git a/configure.in b/configure.in index 21f9a640ff..d0879c6291 100644 --- a/configure.in +++ b/configure.in @@ -97,7 +97,7 @@ fi TARGET=$host AC_SUBST(TARGET) -if test X$cross_compiling = Xyes; then +if test "$cross_compiling" = "yes"; then CROSS_COMPILING=yes else CROSS_COMPILING=no @@ -182,19 +182,23 @@ AC_PROG_RANLIB # Get erts version and otp release from erts/vsn.mk # AC_MSG_CHECKING([ERTS version]) -[ERTS=erts-`sed -n "s/^VSN[ ]*=[ ]*\(.*\)/\1/p" < $ERL_TOP/erts/vsn.mk`] -AC_MSG_RESULT([$ERTS]) -AC_SUBST(ERTS) +[ERTS_VSN=`sed -n "s/^VSN[ ]*=[ ]*\(.*\)/\1/p" < $ERL_TOP/erts/vsn.mk`] +AC_MSG_RESULT([$ERTS_VSN]) +AC_SUBST(ERTS_VSN) AC_MSG_CHECKING([OTP release]) -[OTP=OTP-`sed -n "s/^SYSTEM_VSN[ ]*=[ ]*\(.*\)/\1/p" < $ERL_TOP/erts/vsn.mk`] -AC_MSG_RESULT([$OTP]) -AC_SUBST(OTP) +[OTP_REL=`sed -n "s/^SYSTEM_VSN[ ]*=[ ]*\(.*\)/\1/p" < $ERL_TOP/erts/vsn.mk`] +AC_MSG_RESULT([$OTP_REL]) +AC_SUBST(OTP_REL) AC_ARG_ENABLE(threads, [ --enable-threads enable async thread support --disable-threads disable async thread support]) +AC_ARG_ENABLE(halfword-emulator, +[ --enable-halfword-emulator enable halfword emulator (only for 64bit builds) + --disable-halfword-emulator disable halfword emulator (only for 64bit builds)]) + AC_ARG_ENABLE(smp-support, [ --enable-smp-support enable smp support --disable-smp-support disable smp support]) @@ -343,7 +347,10 @@ fi export ERL_TOP AC_CONFIG_SUBDIRS(lib erts) -AC_OUTPUT(Makefile) +AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([make/emd2exml], [chmod +x make/emd2exml]) + +AC_OUTPUT pattern="lib/*/SKIP" files=`echo $pattern` @@ -361,11 +368,12 @@ if test "$files" != "$pattern"; then fi pattern="lib/*/CONF_INFO" files=`echo $pattern` -if test "$files" != "$pattern"; then +if test "$files" != "$pattern" || test -f erts/CONF_INFO; then echo '*********************************************************************' echo '********************** APPLICATIONS INFORMATION *******************' echo '*********************************************************************' echo + test ! -f erts/CONF_INFO || files="$files erts/CONF_INFO" for infofile in $files; do app=`dirname $infofile`; app=`basename $app` printf "%-15s: " $app; cat $infofile @@ -379,10 +387,18 @@ if test -f "erts/doc/CONF_INFO"; then echo '*********************************************************************' echo printf "%-15s: \n" documentation; + havexsltproc="yes" for cmd in `cat erts/doc/CONF_INFO`; do echo " $cmd is missing." + if test $cmd = "xsltproc"; then + havexsltproc="no" + fi done - echo ' The documentation can not be built.' + if test $havexsltproc = "no"; then + echo ' The documentation can not be built.' + else + echo ' Using fakefop to generate placeholder PDF files.' + fi echo echo '*********************************************************************' fi |