Merged 230 back into the main tree

[fw/sdcc] / configure.in

diff --git a/configure.in b/configure.in
index 78100ce26ae73c22a78d8bb1cd3ee7c77799eb45..340e9c1d0d2ed38c18b596ed946a5fae414d19e8 100755 (executable)
--- a/configure.in
+++ b/configure.in
@@ -16,6 +16,9 @@ fi
 VERSIONHI=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $1}'`
 VERSIONLO=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $2}'`
 VERSIONP=`echo $VERSION|$AWK 'BEGIN {FS="."} {print $3}'`
+# Assume no special extension
+EXEEXT=`echo $EXEEXT`
+
 AC_MSG_RESULT(${VERSION})
 AC_SUBST(VERSION)
 AC_SUBST(VERSIONHI)
@@ -25,6 +28,7 @@ AC_DEFINE_UNQUOTED(SDCC_VERSION_LO, ${VERSIONLO})
 AC_DEFINE_UNQUOTED(SDCC_VERSION_HI, ${VERSIONHI})
 AC_DEFINE_UNQUOTED(SDCC_VERSION_P, ${VERSIONP})
 AC_DEFINE_UNQUOTED(SDCC_VERSION_STR, "${VERSION}")
+AC_ARG_PROGRAM
 sdcc_cv_version=$VERSION
 sdcc_cv_versionhi=$VERSIONHI
 sdcc_cv_versionlo=$VERSIONLO
@@ -40,6 +44,7 @@ AC_PROG_RANLIB
 AC_PROG_LEX(flex, :)
 AC_CHECK_PROG(YACC, bison, bison -y, :)
 AC_CHECK_PROG(AUTOCONF, autoconf, autoconf, :)
+AC_CHECK_PROG(STRIP, strip, strip, :)
 AC_CHECK_PROG(AS, as, as, :)
 AC_CHECK_PROG(CP, cp, cp, :)
 
@@ -286,6 +291,18 @@ else
     AC_DEFINE_UNQUOTED(OPT_DISABLE_TLCS900H, 0)
 fi
 
+AC_ARG_ENABLE(ucsim,[  --disable-ucsim         Disables configuring and building of ucsim])
+OPT_ENABLE_UCSIM=$enable_ucsim
+AC_SUBST(OPT_ENABLE_UCSIM)
+
+AC_ARG_ENABLE(device-lib-build,[  --disable-device-lib-build Disables automatically building device libraries])
+OPT_ENABLE_DEVICE_LIB_BUILD=$enable_device_lib_build
+AC_SUBST(OPT_ENABLE_DEVICE_LIB_BUILD)
+
+AC_ARG_ENABLE(packihx,[  -disable-packihx     Disables building packihx])
+OPT_ENABLE_PACKIHX=$enable_packihx
+AC_SUBST(OPT_ENABLE_PACKIHX)
+
 #remove duplicates
 cat ports.all | uniq >ports
 mv ports ports.all
@@ -294,11 +311,13 @@ mv ports ports.build
 
 # Generating output files
 # ===========================================================================
-AC_CONFIG_SUBDIRS(sim/ucsim)
+AC_CONFIG_SUBDIRS(support/cpp2)
 AC_CONFIG_SUBDIRS(packihx)
+AC_CONFIG_SUBDIRS(sim/ucsim)
 # MLH: removed as the rules are already in Makefile.common
 #as/z80/Makefile
 #link/z80/Makefile
+AC_CONFIG_SUBDIRS(sim/ucsim)
 AC_OUTPUT(main.mk:main_in.mk
 src/Makefile
 as/mcs51/Makefile