projects
/
fw
/
sdcc
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
I was too fast: this breaks regression test bug-221220.c
[fw/sdcc]
/
sim
/
ucsim
/
configure.in
diff --git
a/sim/ucsim/configure.in
b/sim/ucsim/configure.in
index 9f25ae00e102ba942a50faec9914ab0b65f0963c..1c9e059299a83df2a3f4ff4688785e890b7edbb4 100644
(file)
--- a/
sim/ucsim/configure.in
+++ b/
sim/ucsim/configure.in
@@
-27,6
+27,13
@@
AC_DEFINE_UNQUOTED(VERSIONP, $VERSIONP)
# Some options
#==============
# 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
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,
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,
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_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.
AC_LANG_CPLUSPLUS
# Checking for header files.
@@
-204,7
+219,8
@@
AC_SUBST(curses_ok)
AC_SUBST(CURSES_LIBS)
AC_FUNC_VPRINTF
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)
AC_CHECK_FUNCS(strlen strcpy strcat strstr strcmp strerror strtok strdup)
AC_CHECK_FUNCS(strchr memcpy)
dnl AC_CHECK_FUNCS(getline)
@@
-290,7
+306,7
@@
AC_DEFUN(DD_COPT, [
AC_CACHE_CHECK(whether $$1 accepts -$2,ucsim_cv_$1$2,
cat >_test_.c <<EOF
#include <stdio.h>
AC_CACHE_CHECK(whether $$1 accepts -$2,ucsim_cv_$1$2,
cat >_test_.c <<EOF
#include <stdio.h>
-
void main(void) {
}
+
int main(void) {return(0);
}
EOF
$$1 -v -$2 -c _test_.c 1>&5 2>&5
if test "$?" = "0"; then
EOF
$$1 -v -$2 -c _test_.c 1>&5 2>&5
if test "$?" = "0"; then
@@
-345,12
+361,18
@@
AC_SUBST(M_OR_MM)
# This is the first time when CFLAGS are set/modified!!
DD_COPT(CXX, ggdb)
# This is the first time when CFLAGS are set/modified!!
DD_COPT(CXX, ggdb)
-if test "$ucsim_cv_CXXggdb" = "yes"; then
- if test "$CXXFLAGS"x = x ;then
- CXXFLAGS="-ggdb"
- else
- CXXFLAGS="$CXXFLAGS -ggdb"
- fi
+DD_COPT(CXX, gstabs)
+if test "$ucsim_cv_CXXgstabs" = "yes"; then
+ gopt="-gstabs+ -g3"
+elif test "$ucsim_cv_CXXggdb" = "yes"; then
+ gopt="-ggdb -g3"
+else
+ gopt="-g"
+fi
+if test "$CXXFLAGS"x = x ;then
+ CXXFLAGS="$gopt"
+else
+ CXXFLAGS="$CXXFLAGS $gopt"
fi
DD_COPT(CXX, pipe)
fi
DD_COPT(CXX, pipe)
@@
-466,7
+488,6
@@
fi
AC_DEFINE_UNQUOTED(_A_, "${A}")
AC_DEFINE_UNQUOTED(_M_, "${M}")
AC_DEFINE_UNQUOTED(_A_, "${A}")
AC_DEFINE_UNQUOTED(_M_, "${M}")
-
# Generating output files
# ===========================================================================
# Generating output files
# ===========================================================================