version 0.5.2

[fw/sdcc] / sim / ucsim / configure.in

diff --git a/sim/ucsim/configure.in b/sim/ucsim/configure.in
index eb113efcd7b88d26f0d948b0c396beda4e8ed268..600d53cb28ab7f0956442462fe6dddfaffe8abda 100644 (file)
--- a/sim/ucsim/configure.in
+++ b/sim/ucsim/configure.in
@@ -27,6 +27,13 @@ AC_DEFINE_UNQUOTED(VERSIONP, $VERSIONP)
 
 # Some options
 #==============
+# *nix default: "${datadir}/sdcc/doc"
+AC_ARG_VAR(docdir, documentation installation directory)
+if test "${docdir}" = ""; then
+    docdir="\${datadir}"/sdcc/doc
+fi
+AC_SUBST(docdir)
+
 AC_ARG_ENABLE(ucsim,
 [  --enable-ucsim          compile ucsim frontend],
 if test $enable_ucsim != "no"; then
@@ -59,7 +66,7 @@ if test $enable_z80 != "no"; then
 fi,
 enable_z80="no")
 AC_ARG_ENABLE(hc08,
-[  --enable-hc08            compile simulator for hc08],
+[  --enable-hc08           compile simulator for hc08],
 if test $enable_hc08 != "no"; then
     enable_hc08="yes"
 fi,
@@ -109,6 +116,14 @@ dnl AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
 
+AC_PROG_LEX
+if test ${LEX} = "flex"; then
+       AC_DEFINE(HAVE_FLEX)
+fi
+AC_PROG_YACC
+AC_CHECK_PROG(BISON_PLUS_PLUS, bison++, bison++, :)
+
+
 AC_LANG_CPLUSPLUS
 
 # Checking for header files.
@@ -204,7 +219,8 @@ AC_SUBST(curses_ok)
 AC_SUBST(CURSES_LIBS)
 
 AC_FUNC_VPRINTF
-AC_CHECK_FUNCS(vsnprintf vasprintf)
+AC_CHECK_FUNCS(vsnprintf)
+AC_CHECK_FUNCS(vasprintf)
 AC_CHECK_FUNCS(strlen strcpy strcat strstr strcmp strerror strtok strdup)
 AC_CHECK_FUNCS(strchr memcpy)
 dnl AC_CHECK_FUNCS(getline)
@@ -346,11 +362,14 @@ AC_SUBST(M_OR_MM)
 
 DD_COPT(CXX, ggdb)
 if test "$ucsim_cv_CXXggdb" = "yes"; then
-    if test "$CXXFLAGS"x = x ;then
-       CXXFLAGS="-ggdb"
-    else
-       CXXFLAGS="$CXXFLAGS -ggdb"
-    fi
+       gopt="-ggdb"
+else
+       gopt="-g"
+fi
+if test "$CXXFLAGS"x = x ;then
+       CXXFLAGS="$gopt"
+else
+       CXXFLAGS="$CXXFLAGS $gopt"
 fi
 
 DD_COPT(CXX, pipe)
@@ -466,13 +485,6 @@ fi
 AC_DEFINE_UNQUOTED(_A_, "${A}")
 AC_DEFINE_UNQUOTED(_M_, "${M}")
 
-# *nix default: "${datadir}/sdcc/doc"
-AC_ARG_VAR(docdir, documentation installation directory)
-if test "${docdir}" = ""; then
-    docdir="\${datadir}"/sdcc/doc
-fi
-AC_SUBST(docdir)
-
 # Generating output files
 # ===========================================================================