* sim/ucsim/*.*, sim/ucsim/configure, sim/ucsim/configure.in:
[fw/sdcc] / sim / ucsim / configure.in
index f40b6138a65804ad9d3aa6ac1de574eee4a818ba..339cdc0acafa61b5314b5aa11109cd3336c4d0d0 100644 (file)
@@ -1,13 +1,14 @@
 #!/bin/sh
 
+AC_PREREQ(2.60)
 AC_INIT(.version)
 AC_CONFIG_HEADER(ddconfig.h:ddconfig_in.h)
 
 AC_PROG_AWK
 
 AC_MSG_CHECKING(version of the package)
-if test -f .version; then
-  VERSION=`cat .version`
+if test -f ${srcdir}/.version; then
+  { read VERSION; } < ${srcdir}/.version
   AC_MSG_RESULT($VERSION)
 else
   VERSION="0.0.0"
@@ -25,6 +26,81 @@ AC_DEFINE_UNQUOTED(VERSIONHI, $VERSIONHI)
 AC_DEFINE_UNQUOTED(VERSIONLO, $VERSIONLO)
 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
+    enable_ucsim="yes"
+fi,
+#default
+enable_ucsim="no")
+AC_ARG_ENABLE(dlso,
+[  --enable-dlso           compile dynamically loadable shared libraries],
+if test $enable_dlso != "no"; then
+    enable_dlso="yes"
+fi,
+enable_dlso="no")
+AC_ARG_ENABLE(51,
+[  --disable-51            do not compile simulator for MCS51],
+if test $enable_51 != "no"; then
+    enable_51="yes"
+fi,
+enable_51="yes")
+AC_ARG_ENABLE(avr,
+[  --disable-avr           do not compile simulator for AVR],
+if test $enable_avr != "no"; then
+    enable_avr="yes"
+fi,
+enable_avr="yes")
+AC_ARG_ENABLE(z80,
+[  --disable-z80           do not compile simulator for Z80],
+if test $enable_z80 != "no"; then
+    enable_z80="yes"
+fi,
+enable_z80="yes")
+AC_ARG_ENABLE(hc08,
+[  --disable-hc08          do not compile simulator for hc08],
+if test $enable_hc08 != "no"; then
+    enable_hc08="yes"
+fi,
+enable_hc08="yes")
+AC_ARG_ENABLE(xa,
+[  --enable-xa             compile simulator for XA],
+if test $enable_xa != "no"; then
+    enable_xa="yes"
+fi,
+enable_xa="no")
+AC_ARG_ENABLE(portmon,
+[  --enable-serio          compile serio GUI tool (needs curses)],
+if test $enable_serio != "no"; then
+    enable_serio="yes"
+fi,
+enable_serio="no")
+AC_SUBST(enable_ucsim)
+AC_SUBST(enable_dlso)
+AC_SUBST(enable_51)
+AC_SUBST(enable_avr)
+AC_SUBST(enable_z80)
+AC_SUBST(enable_hc08)
+AC_SUBST(enable_xa)
+AC_SUBST(enable_serio)
+
+AC_ARG_ENABLE(statistic,
+[  --enable-statistic      compile statistical features (slower simulation)],
+if test $enable_statistic != "no"; then
+   enable_statistic="yes"
+fi,
+enable_statistic="no")
+AC_DEFINE_UNQUOTED(STATISTIC, $enable_statistic)
+
 
 # Required programs
 #-------------------
@@ -32,8 +108,24 @@ AC_PROG_CXX
 AC_PROG_CXXCPP
 AC_PROG_INSTALL
 AC_PROG_RANLIB
-AC_LANG_CPLUSPLUS
+dnl AC_LANG_CPLUSPLUS
+
+AC_CHECK_PROG(STRIP, strip, strip, :)
+
+AC_LIBTOOL_DLOPEN
+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.
 # ===========================================================================
@@ -43,132 +135,174 @@ if test -d /stuff/include; then
 fi
 
 AC_HEADER_STDC
-AC_CHECK_HEADERS(getopt.h)
-AC_CHECK_HEADERS(unistd.h)
+AC_CHECK_HEADERS(getopt.h unistd.h termios.h)
+
+AC_CHECK_HEADER(curses.h,
+  AC_DEFINE(HAVE_CURSES_H)
+  curses_h_ok=yes,
+  curses_h_ok=no
+)
+
+ucsim_cv_socket="unknown"
 AC_CHECK_HEADER(sys/socket.h,
+  AC_DEFINE(HAVE_SYS_SOCKET_H)
   AC_DEFINE(SOCKET_AVAIL)
-  AC_DEFINE(HAVE_SYS_SOCKET_H))
+  AC_DEFINE_UNQUOTED(UCSOCKET_T, int)
+  ucsim_cv_socket="<sys/socket.h>"
+)
+
+WINSOCK_AVAIL=0
+if test $ucsim_cv_socket = unknown; then
+  AC_CHECK_HEADER(winsock2.h,
+    AC_DEFINE(HAVE_WINSOCK2_H)
+    AC_DEFINE(SOCKET_AVAIL)
+    AC_DEFINE_UNQUOTED(UCSOCKET_T, SOCKET)
+    ucsim_cv_socket="<winsock2.h>"
+    WINSOCK_AVAIL=1
+  )
+fi
+AC_SUBST(WINSOCK_AVAIL)
+
+if test $ucsim_cv_socket != unknown; then
+  AC_EGREP_HEADER(socklen_t,
+    $ucsim_cv_socket,
+    AC_DEFINE_UNQUOTED(SOCKLEN_T, socklen_t),
+    AC_DEFINE_UNQUOTED(SOCKLEN_T, uint))
+fi
+AC_DEFINE_UNQUOTED(HEADER_SOCKET, ${ucsim_cv_socket})
+
+AC_CHECK_HEADER(dlfcn.h)
 AC_HEADER_DIRENT
 
 # This must be after CXXCPP
 
-AC_CACHE_CHECK(which header file defines FD_ macros, s51_cv_fd,
-[s51_cv_fd="unknown"
+AC_CACHE_CHECK(which header file defines FD_ macros, ucsim_cv_fd,
+[ucsim_cv_fd="unknown"
+AC_EGREP_CPP(yes, [
+#include <winsock2.h>
+#ifdef FD_ZERO
+yes
+#endif], ucsim_cv_fd="<winsock2.h>")
 AC_EGREP_CPP(yes, [
 #include <sys/time.h>
 #ifdef FD_ZERO
 yes
-#endif], s51_cv_fd="<sys/time.h>")
+#endif], ucsim_cv_fd="<sys/time.h>")
 AC_EGREP_CPP(yes, [
 #include <sys/types.h>
 #ifdef FD_ZERO
 yes
-#endif], s51_cv_fd="<sys/types.h>")
+#endif], ucsim_cv_fd="<sys/types.h>")
 AC_EGREP_CPP(yes, [
 #include <sys/select.h>
 #ifdef FD_ZERO
 yes
-#endif], s51_cv_fd="<sys/types.h>")])
+#endif], ucsim_cv_fd="<sys/select.h>")])
 
-AC_DEFINE(FD_HEADER_OK, 0)
-if echo $s51_cv_fd|grep time >/dev/null 2>&1; then
+ucsim_cv_header_ok=0
+if echo $ucsim_cv_fd|grep time >/dev/null 2>&1; then
 AC_DEFINE(FD_NEED_TIME_H, 1)
-AC_DEFINE(FD_HEADER_OK, 1)
+ucsim_cv_header_ok=1
 else
 AC_DEFINE(FD_NEED_TIME_H, 0)
 fi
-if echo $s51_cv_fd|grep types >/dev/null 2>&1; then
+if echo $ucsim_cv_fd|grep types >/dev/null 2>&1; then
 AC_DEFINE(FD_NEED_TYPES_H, 1)
-AC_DEFINE(FD_HEADER_OK, 1)
+ucsim_cv_header_ok=1
 else
 AC_DEFINE(FD_NEED_TYPES_H, 0)
 fi
-if echo $s51_cv_fd|grep select >/dev/null 2>&1; then
+if echo $ucsim_cv_fd|grep select >/dev/null 2>&1; then
 AC_DEFINE(FD_NEED_SELECT_H, 1)
-AC_DEFINE(FD_HEADER_OK, 1)
+ucsim_cv_header_ok=1
 else
 AC_DEFINE(FD_NEED_SELECT_H, 0)
 fi
+if echo $ucsim_cv_fd|grep winsock2 >/dev/null 2>&1; then
+AC_DEFINE(FD_NEED_WINSOCK2_H, 1)
+ucsim_cv_header_ok=1
+else
+AC_DEFINE(FD_NEED_WINSOCK2_H, 0)
+fi
 
-AC_DEFINE_UNQUOTED(HEADER_FD, ${s51_cv_fd})
+AC_DEFINE_UNQUOTED(FD_HEADER_OK, ${ucsim_cv_header_ok})
+AC_DEFINE_UNQUOTED(HEADER_FD, ${ucsim_cv_fd})
 
 
 # Checking for functions/libs
 # ===========================================================================
+if echo $ucsim_cv_socket|grep winsock2 >/dev/null 2>&1; then
+  LIBS="-lws2_32 $LIBS"
+else
+  AC_CHECK_LIB(socket,socket)
+  AC_CHECK_LIB(nsl,xdr_short)
+fi
 
-AC_DEFUN(AC_CHECK_FUNC_NOCACHE,
-[AC_MSG_CHECKING([for $1])
-AC_TRY_LINK(
-dnl Don't include <ctype.h> because on OSF/1 3.0 it includes <sys/types.h>
-dnl which includes <sys/select.h> which contains a prototype for
-dnl select.  Similarly for bzero.
-[/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $1(); below.  */
-#include <assert.h>
-/* Override any gcc2 internal prototype to avoid an error.  */
-]ifelse(AC_LANG, CPLUSPLUS, [#ifdef __cplusplus
-extern "C"
-#endif
-])dnl
-[/* We use char because int might match the return type of a gcc2
-    builtin and then its argument prototype would still apply.  */
-char $1();
-], [
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$1) || defined (__stub___$1)
-choke me
-#else
-$1();
-#endif
-], eval "ac_cv_func_$1=yes", eval "ac_cv_func_$1=no")
-if eval "test \"`echo '$ac_cv_func_'$1`\" = yes"; then
-  AC_MSG_RESULT(yes)
-  ifelse([$2], , :, [$2])
+AC_CHECK_LIB(dl,dlopen,
+dl_ok="yes"
+DL="-ldl",
+dl_ok="no"
+DL="")
+AC_SUBST(dl_ok)
+AC_SUBST(DL)
+
+#AC_CHECK_LIB(panel,panel_above,
+#panel_ok="yes"
+#curses_ok="yes"
+#CURSES_LIBS="-lpanel -lcurses"
+#,
+#panel_ok="no"
+#AC_CHECK_LIB(curses,nl,
+#curses_ok="yes"
+#CURSES_LIBS="-lcurses"
+#,
+#curses_ok="no")
+#,
+#-lcurses)
+
+if test $curses_h_ok != yes; then
+  panel_ok="no"
+  curses_ok="no"
 else
-  AC_MSG_RESULT(no)
-ifelse([$3], , , [$3
-])dnl
+  AC_CHECK_LIB(panel,panel_above,
+    panel_ok="yes"
+    curses_ok="yes"
+    CURSES_LIBS="-lpanel",
+    panel_ok="no"
+    curses_ok="no"
+  )
+
+  if test $curses_ok != yes; then
+    AC_CHECK_LIB(curses,nl,
+      curses_ok="yes"
+      CURSES_LIBS="-lcurses",
+      curses_ok="no")
+  fi
+
+  if test $curses_ok != yes; then
+    AC_CHECK_LIB(ncurses,nl,
+      curses_ok="yes"
+      CURSES_LIBS="-lncurses",
+      curses_ok="no")
+  fi
 fi
-])
 
-AC_CHECK_LIB(socket,socket)
-AC_CHECK_LIB(nsl,xdr_short)
-AC_CHECK_LIB(panel,panel_above,
-panel_ok="yes"
-curses_ok="yes"
-CURSES_LIBS="-lpanel -lcurses"
-,
-panel_ok="no"
-AC_CHECK_LIB(curses,nl,
-curses_ok="yes"
-CURSES_LIBS="-lcurses"
-,
-ncurses_ok="no")
-,
--lcurses)
 AC_SUBST(panel_ok)
 AC_SUBST(curses_ok)
 AC_SUBST(CURSES_LIBS)
 
 AC_FUNC_VPRINTF
-dnl Do not cache the result of the vasprintf test.
-dnl This is because vasprintf is defined in the C++ runtime 
-dnl for egcs, but not in the C runtime. Thus, caching the result
-dnl of this test (which is done with C++) will cause later C
-dnl based tests to falsely conclude that vasprintf is available
-dnl to C programs.
-dnl It's a bloody stupid function anyway. 
-AC_CHECK_FUNC_NOCACHE(vasprintf)
+AC_CHECK_FUNCS(vsnprintf)
+AC_CHECK_FUNCS(_vsnprintf)
+AC_CHECK_FUNCS(vasprintf)
 AC_CHECK_FUNCS(strlen strcpy strcat strstr strcmp strerror strtok strdup)
-AC_CHECK_FUNCS(vsnprintf strchr memcpy)
+AC_CHECK_FUNCS(strchr memcpy)
 dnl AC_CHECK_FUNCS(getline)
 dnl AC_CHECK_FUNCS(getdelim)
 AC_CHECK_FUNCS(fgets)
 AC_CHECK_FUNCS(yylex)
 
-AC_CACHE_CHECK(whether scanf knows %a, s51_cv_scanf_a,
+AC_CACHE_CHECK(whether scanf knows %a, ucsim_cv_scanf_a,
 [echo "a b" >conftest.data
 AC_TRY_RUN([
 #include <stdio.h>
@@ -187,15 +321,15 @@ void main(void)
     exit(0);
   exit(3);
 }],
-s51_cv_scanf_a="yes",
-s51_cv_scanf_a="no",
-s51_cv_scanf_a="unknown")
+ucsim_cv_scanf_a="yes",
+ucsim_cv_scanf_a="no",
+ucsim_cv_scanf_a="unknown")
 ])
-if test "$s51_cv_scanf_a" = "yes"; then
+if test "$ucsim_cv_scanf_a" = "yes"; then
   AC_DEFINE(SCANF_A)
 fi
 
-AC_CACHE_CHECK(whether getcwd is GNUish, s51_cv_getcwd,
+AC_CACHE_CHECK(whether getcwd is GNUish, ucsim_cv_getcwd,
 [AC_TRY_RUN([
 #include <unistd.h>
 void main(void)
@@ -204,33 +338,78 @@ void main(void)
     exit(1);
   exit(0);
 }],
-s51_cv_getcwd="yes",
-s51_cv_getcwd="no",
-s51_cv_getcwd="unknown")
+ucsim_cv_getcwd="yes",
+ucsim_cv_getcwd="no",
+ucsim_cv_getcwd="unknown")
 ])
-if test "$s51_cv_getcwd" = "yes"; then
+if test "$ucsim_cv_getcwd" = "yes"; then
   AC_DEFINE(GNU_GETCWD)
 fi
 
+AC_DEFUN(ucsim_ACCEPT_LENGTH_T,
+ [AC_CACHE_CHECK([for type of length pointer parameter of accept],
+   ucsim_cv_accept_length_type,
+   [ac_save_CPPFLAGS="$CPPFLAGS"
+    ucsim_cv_accept_length_type=no
+    for ac_val in int size_t socklen_t; do
+      CPPFLAGS="$ac_save_CPPFLAGS -DACCEPT_SOCKLEN_T=$ac_val"
+      AC_TRY_COMPILE([#include <sys/types.h>
+#include ${ucsim_cv_socket}],
+        [struct sockaddr a; $ac_val len; accept (0, &a, &len);],
+        [ucsim_cv_accept_length_type=$ac_val; break])
+    done
+    CPPFLAGS="$ac_save_CPPFLAGS"])
+  if test "$ucsim_cv_accept_length_type" != no; then
+    AC_DEFINE_UNQUOTED(ACCEPT_SOCKLEN_T, $ucsim_cv_accept_length_type,
+      [Define to be the type of length parameter of accept (without the \*').])
+  fi
+ ]
+)
+#'
+
+ucsim_ACCEPT_LENGTH_T
 
 # Macro definitions
 ###################
 
 # DD_COPT macro checks if the compiler specified as the 1st parameter
 # supports option specified as the 2nd parameter
-# For example: DD_CPORT(CXX, fPIC)
+# For example: DD_COPT(CXX, fPIC)
 
 AC_DEFUN(DD_COPT, [
-AC_CACHE_CHECK(whether $$1 accepts -$2,s51_cv_$1$2,
+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
-  s51_cv_$1$2="yes"
+  ucsim_cv_$1$2="yes"
+else
+  ucsim_cv_$1$2="no"
+fi
+rm -f _test_.* a.out)
+])
+
+# DD_COPT_NO_IGNORE macro checks if the compiler specified as the
+# 1st parameter supports and doesn't ignore option specified as the
+# 2nd parameter
+# For example: DD_COPT_NO_IGNORE(CXX, fPIC)
+
+AC_DEFUN(DD_COPT_NO_IGNORE, [
+AC_CACHE_CHECK(whether $$1 accepts and doesn't ignore -$2,ucsim_cv_$1$2,
+cat >_test_.c <<EOF
+int main(void) {return(0);}
+EOF
+ucsim_cv_$1$2=$($$1 -v -$2 -c _test_.c 2>&1 1>&5)
+if test "$?" = "0"; then
+  expr "$ucsim_cv_$1$2" : '.*'-$2'.*ignored' 1>&5 2>&5
+  if test "$?" = "0"; then
+    ucsim_cv_$1$2="no"
+  else
+    ucsim_cv_$1$2="yes"
+  fi
 else
-  s51_cv_$1$2="no"
+  ucsim_cv_$1$2="no"
 fi
 rm -f _test_.* a.out)
 ])
@@ -238,68 +417,133 @@ rm -f _test_.* a.out)
 
 # Checking characteristics of compilers and other programs
 # --------------------------------------------------------
-AC_C_BIGENDIAN
-AC_CACHE_CHECK(whether preprocessor accepts -MM or -M,s51_cv_MM,
+
+# Cross compiling overrides
+# FIXME
+if test "$CC" = "i586-mingw32msvc-gcc"; then
+  ac_cv_c_bigendian=no
+  ac_cv_sizeof_char=1
+  ac_cv_sizeof_short=2
+  ac_cv_sizeof_int=4
+  ac_cv_sizeof_long=4
+  ac_cv_sizeof_long_long=4
+fi
+
+if test "$cross_compiling" = "no"
+then
+    AC_C_BIGENDIAN
+else
+#echo "CROSS ENDIAN"
+    if $CXX -v 2>&1|grep "mingw" >/dev/null 2>&1; then
+        ac_cv_c_bigendian=no
+    else
+        : # FIXME
+    fi
+#echo "CROSS ENDIAN DONE"
+fi
+
+AC_CACHE_CHECK(whether preprocessor accepts -MM or -M,ucsim_cv_MM,
 echo "#include <stdio.h>" >_test_.c
 echo "" >>_test_.c
 $CXXCPP -v -MM _test_.c 1>&5 2>&5
 if test "$?" = "0"; then
-  s51_cv_MM="-MM"
+  ucsim_cv_MM="-MM"
 else
-  s51_cv_MM="-M"
+  ucsim_cv_MM="-M"
 fi
 rm -f _test_.*)
-M_OR_MM=$s51_cv_MM
+M_OR_MM=$ucsim_cv_MM
 AC_SUBST(M_OR_MM)
 
 # This is the first time when CFLAGS are set/modified!!
 
 DD_COPT(CXX, ggdb)
-if test "$s51_cv_CXXggdb" = "yes"; then
-    if test "$CXXFLAGS"x = x ;then
-       CXXFLAGS="-ggdb -O"
-    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)
-if test "$s51_cv_CXXpipe" = "yes"; then
+if test "$ucsim_cv_CXXpipe" = "yes"; then
   CXXFLAGS="$CXXFLAGS -pipe"
 fi
 
+PICOPT=""
+SHAREDLIB="no"
+DD_COPT_NO_IGNORE(CXX, fPIC)
+if test "$ucsim_cv_CXXfPIC" = "yes"; then
+    PICOPT="-fPIC"
+else
+    DD_COPT_NO_IGNORE(CXX, fpic)
+    if test "$ucsim_cv_CXXfpic" = "yes"; then
+        PICOPT="-fpic"
+    fi
+fi
+if test "$PICOPT"x != "x"; then
+    SHAREDLIB="yes"
+fi
+AC_SUBST(SHAREDLIB)
+AC_SUBST(PICOPT)
+
+dlso_ok="no"
+if test $SHAREDLIB = "yes" -a $dl_ok = "yes" -a $enable_dlso = "yes"; then
+    dlso_ok="yes"
+fi
+AC_SUBST(dlso_ok)
 
 # Checks for typedefs, structures, and compiler characteristics.
 # ===========================================================================
 
 AC_TYPE_SIGNAL
+if test "$cross_compiling" = "no"; then
 AC_CHECK_SIZEOF(char)
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(int)
 AC_CHECK_SIZEOF(long)
 AC_CHECK_SIZEOF(long long)
+else
+    if $CXX -v 2>&1|grep "mingw" >/dev/null 2>&1; then
+        ac_cv_sizeof_char=1
+        ac_cv_sizeof_short=2
+        ac_cv_sizeof_int=4
+        ac_cv_sizeof_long=4
+        ac_cv_sizeof_long_long=4
+    else
+        : # FIXME
+    fi
+#echo
+fi
 
 type_name()
 {
     if expr "$ac_cv_sizeof_char" '>=' "$1" >/dev/null; then
-       echo "char"
-       exit
+        echo "char"
+        exit
     fi
     if expr "$ac_cv_sizeof_short" '>=' "$1" >/dev/null; then
-       echo "short"
-       exit
+        echo "short"
+        exit
     fi
     if expr "$ac_cv_sizeof_int" '>=' "$1" >/dev/null; then
-       echo "int"
-       exit
+        echo "int"
+        exit
     fi
     if expr "$ac_cv_sizeof_long" '>=' "$1" >/dev/null; then
-       echo "long"
-       exit
+        echo "long"
+        exit
     fi
     if expr "$ac_cv_sizeof_long_long" '>=' "$1" >/dev/null; then
-       echo "long long"
-       exit
+        echo "long long"
+        exit
     fi
     echo "long long"
 }
@@ -317,20 +561,41 @@ AC_DEFINE_UNQUOTED(TYPE_BYTE, $TYPE_BYTE)
 AC_DEFINE_UNQUOTED(TYPE_WORD, $TYPE_WORD)
 AC_DEFINE_UNQUOTED(TYPE_DWORD, $TYPE_DWORD)
 
+if echo $TYPE_DWORD|grep short >/dev/null; then
+    A="h"
+elif echo $TYPE_DWORD|grep long >/dev/null; then
+    A="l"
+else
+    A=""
+fi
+
+if echo $TYPE_WORD|grep short >/dev/null; then M="h"
+elif echo $TYPE_WORD|grep long >/dev/null; then M="l"
+else M=""
+fi
+
+AC_DEFINE_UNQUOTED(_A_, "${A}")
+AC_DEFINE_UNQUOTED(_M_, "${M}")
+
 # Generating output files
 # ===========================================================================
 
-AC_OUTPUT(main.mk:main_in.mk
+AC_OUTPUT(Makefile
+main.mk:main_in.mk
+packages.mk:packages_in.mk
 sim.src/Makefile
 cmd.src/Makefile
 s51.src/Makefile
 avr.src/Makefile
 z80.src/Makefile
+hc08.src/Makefile
+xa.src/Makefile
 gui.src/Makefile
 gui.src/serio.src/Makefile
-gui.src/portmon.src/Makefile
 doc/Makefile
 )
 
+#gui.src/portmon.src/Makefile
+
 
 # End of configure/configure.in