X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=configure.in;h=dc4bab5b88fd57579cba9c02aba3656fa34a5bd5;hb=5a1d5e778e85664f4e6657019348b4756b16eacb;hp=fb1485f50c7716cfbf0dba8e1a5270b606ecba2d;hpb=00caa86200a63e411e2ac3ac968faa5dc1dd9506;p=fw%2Fsdcc diff --git a/configure.in b/configure.in index fb1485f5..dc4bab5b 100644 --- a/configure.in +++ b/configure.in @@ -3,7 +3,7 @@ AC_PREREQ(2.60) AC_INIT(.version) AC_CONFIG_SRCDIR([Makefile.in]) -AC_CONFIG_HEADER(sdccconf.h:sdccconf_in.h) +AC_CONFIG_HEADER([sdccconf.h:sdccconf_in.h as/link/asxxxx_config.h]) AC_PROG_AWK @@ -22,7 +22,7 @@ VERSIONHI=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $1}'` VERSIONLO=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $2}'` VERSIONP=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $3}'` -AC_MSG_RESULT(${VERSION}) +AC_SUBST(PACKAGE, [sdcc]) AC_SUBST(VERSION) AC_SUBST(VERSIONHI) AC_SUBST(VERSIONLO) @@ -56,7 +56,7 @@ AC_CHECK_PROGS(LEX, flex lex, :) dnl Don't use AC_PROG_YACC AC_CHECK_PROGS(YACC, 'bison -y' byacc yacc, :) -AC_DEFUN(SDCC_REQUIRE_PROG, +AC_DEFUN([SDCC_REQUIRE_PROG], [if test "$1" = ":"; then AC_MSG_ERROR([Cannot find required program $2.]) fi @@ -67,6 +67,15 @@ SDCC_REQUIRE_PROG($LEX, flex) AC_LANG_C +AC_ARG_WITH([ccache], + AC_HELP_STRING([--without-ccache], [do not use ccache even if available]), + [], []) +case x${with_ccache-yes} in + xyes) AC_CHECK_PROG([CCACHE], [ccache], [ccache], []) ;; + xno) AC_SUBST([CCACHE], []) ;; + *) AC_SUBST([CCACHE], [$with_ccache]) ;; +esac + # Checking for functions # =========================================================================== @@ -81,7 +90,7 @@ AC_CHECK_FUNCS(vsnprintf snprintf vsprintf mkstemp) # supports option specified as the 2nd parameter # For example: DD_CPORT(CXX, fPIC) -AC_DEFUN(adl_DD_COPT, [ +AC_DEFUN([adl_DD_COPT], [ AC_CACHE_CHECK(whether $$1 accepts -$2,sdcc_cv_$1$2, cat >_test_.c < @@ -396,7 +405,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include #include ], [#if ! (defined BYTE_ORDER && defined BIG_ENDIAN && defined LITTLE_ENDIAN \ - && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN) + && BYTE_ORDER && BIG_ENDIAN && LITTLE_ENDIAN) bogus endian macros #endif ])], @@ -419,8 +428,8 @@ AC_RUN_IFELSE( u.l = 1; return u.c[sizeof (long int) - 1] == 1; ]])], - [sdcc_cv_build_bigendian=no], - [sdcc_cv_build_bigendian=yes], + [sdcc_cv_build_bigendian=no], + [sdcc_cv_build_bigendian=yes], [# try to guess the endianness by grepping values into an object file sdcc_cv_build_bigendian=unknown AC_COMPILE_IFELSE([AC_LANG_PROGRAM( @@ -446,8 +455,8 @@ case $sdcc_cv_build_bigendian in yes) m4_default([$1], [AC_DEFINE([BUILD_WORDS_BIGENDIAN], 1, - [Define to 1 if your processor stores words with the most significant - byte first (like Motorola and SPARC, unlike Intel and VAX).])]) ;; + [Define to 1 if your processor stores words with the most significant + byte first (like Motorola and SPARC, unlike Intel and VAX).])]) ;; no) $2 ;; *) @@ -472,7 +481,7 @@ SDCC_BUILD_BIGENDIAN # The macros are expanded for the header. # The variables in the header are replaced by AC_*DEFINE*() # sdccconf_h_dir_separator contains a backslash. -AC_ARG_VAR(sdccconf_h_dir_separator, needed in sdccconf.h: either "/" (default) or "\\") +AC_ARG_VAR([sdccconf_h_dir_separator], [needed in sdccconf.h: either "/" (default) or "\\"]) if test "x${sdccconf_h_dir_separator}" = "x"; then sdccconf_h_dir_separator="/" fi @@ -480,30 +489,35 @@ fi # Makefiles ########### +# LIB_TYPE: +# *nix default: "RANLIB" + +AC_ARG_VAR([LIB_TYPE], [library type: LIB, SDCCLIB, AR or RANLIB (default)]) +if test "${LIB_TYPE}" = ""; then + LIB_TYPE="RANLIB" +fi + # include_dir_suffix: # *nix default: "sdcc/include" -AC_ARG_VAR(include_dir_suffix, appended to datadir to define SDCC's include directory) +AC_ARG_VAR([include_dir_suffix], [appended to datadir to define SDCC's include directory]) if test "${include_dir_suffix}" = ""; then include_dir_suffix="sdcc/include" fi -AC_SUBST(include_dir_suffix) # lib_dir_suffix: # *nix default: "sdcc/lib" -AC_ARG_VAR(lib_dir_suffix, appended to datadir to define SDCC's library root directory) +AC_ARG_VAR([lib_dir_suffix], [appended to datadir to define SDCC's library root directory]) if test "${lib_dir_suffix}" = ""; then lib_dir_suffix="sdcc/lib" fi -AC_SUBST(lib_dir_suffix) # docdir: # *nix default: "${datadir}/sdcc/doc" -AC_ARG_VAR(docdir, documentation installation directory) +AC_ARG_VAR([docdir], [documentation installation directory]) if test "${docdir}" = ""; then docdir="\${datadir}"/sdcc/doc fi -AC_SUBST(docdir) AC_SUBST(EXEEXT) @@ -511,7 +525,7 @@ AC_SUBST(EXEEXT) ############ AC_DEFINE_UNQUOTED(DIR_SEPARATOR_STRING, "${sdccconf_h_dir_separator}") -AC_DEFINE_UNQUOTED(DIR_SEPARATOR_CHAR , '${sdccconf_h_dir_separator}') +AC_DEFINE_UNQUOTED(DIR_SEPARATOR_CHAR, '${sdccconf_h_dir_separator}') # prefix: # default: "NONE", ${ac_default_prefix}: "/usr/local" @@ -586,7 +600,7 @@ AC_DEFINE_UNQUOTED(SDCC_LIB_NAME, "${sdcc_lib_name}") # Port selection helper # =========================================================================== # macro AC_DO_ENABLER() -# $1 used to access enable_$1, e.g. enable-doc +# $1 used to access enable_$1, e.g. enable_doc # $2 OPT_DISABLE_$2, normally uppercase of $1, e.g. DOC # $3 help string AC_DEFUN([AC_DO_ENABLER], [ @@ -670,13 +684,13 @@ AC_DO_DISABLER(sdcpp, SDCPP, [Disables building sdcpp]) AC_DO_DISABLER(sdcdb, SDCDB, [Disables building sdcdb]) AC_DO_ENABLER(doc, DOC, [Enables building the documentation]) -if test $OPT_ENABLE_DOC = 1; then - AC_CHECK_PROG(LYX, lyx, lyx, :) - AC_CHECK_PROG(LATEX2HTML, latex2html, latex2html, :) - AC_CHECK_PROG(PDFLATEX, pdflatex, pdflatex, :) - AC_CHECK_PROG(PDFOPT, pdfopt, pdfopt, :) - AC_CHECK_PROG(MAKEINDEX, makeindex, makeindex, :) +AC_CHECK_PROG([LYX], [lyx], [lyx], [:]) +AC_CHECK_PROG([LATEX2HTML], [latex2html], [latex2html], [:]) +AC_CHECK_PROG([PDFLATEX], [pdflatex], [pdflatex], [:]) +AC_CHECK_PROG([PDFOPT], [pdfopt], [pdfopt], [:]) +AC_CHECK_PROG([MAKEINDEX], [makeindex], [makeindex], [:]) +if test $OPT_ENABLE_DOC = 1; then SDCC_REQUIRE_PROG($LYX, lyx) SDCC_REQUIRE_PROG($LATEX2HTML, latex2html) SDCC_REQUIRE_PROG($PDFLATEX, pdflatex) @@ -761,6 +775,7 @@ test $OPT_DISABLE_DEVICE_LIB = 0 && AC_CONFIG_FILES([device/lib/Makefile]) AC_CONFIG_FILES([main.mk:main_in.mk src/Makefile device/include/Makefile +as/asranlib/Makefile support/librarian/Makefile support/makebin/Makefile support/regression/Makefile