small bugfix

10 files changed, 73 insertions, 121 deletions

diff --git a/Makefile.am b/Makefile.am
index 65463c3..bbb7412 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,7 @@ build_date = "\"`date +%m/%d/%Y`\""
 ## Core Libraries ##
 core_libs     = -lm -lrose -lrt -lutil -lomega -lcodegen -ldl
 core_libs    += -lboost_date_time -lboost_filesystem -lboost_program_options
-core_libs    += -lboost_regex -lboost_system -lboost_thread -lboost_wave
+core_libs    += -lboost_regex -lboost_system -lboost_wave -lboost_iostreams
 
 core_libdirs  = -Lomega/code_gen/obj -Lomega/omega_lib/obj
 core_libdirs += -L$(ROSEHOME)/lib -L$(BOOSTHOME)/lib
@@ -12,7 +12,8 @@ core_libdirs += -L$(ROSEHOME)/lib -L$(BOOSTHOME)/lib
 
 
 ## Core Includes ##
-core_includes  = -Iomega/include -I$(ROSEHOME)/include
+core_includes  = -Iomega/include
+core_includes += -I$(ROSEHOME)/include/rose
 core_includes += -I$(BOOSTHOME)/include
 
 
diff --git a/Makefile.in b/Makefile.in
index 444d53d..796ef49 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -315,7 +315,6 @@ LEX_OUTPUT_ROOT = @LEX_OUTPUT_ROOT@
 LIBOBJS = @LIBOBJS@
 LIBS = @LIBS@
 LTLIBOBJS = @LTLIBOBJS@
-LUAHOME = @LUAHOME@
 MAKEINFO = @MAKEINFO@
 MKDIR_P = @MKDIR_P@
 OBJEXT = @OBJEXT@
@@ -369,7 +368,6 @@ htmldir = @htmldir@
 includedir = @includedir@
 infodir = @infodir@
 install_sh = @install_sh@
-interface_lang = @interface_lang@
 libdir = @libdir@
 libexecdir = @libexecdir@
 localedir = @localedir@
@@ -395,16 +393,14 @@ target_alias = @target_alias@
 top_build_prefix = @top_build_prefix@
 top_builddir = @top_builddir@
 top_srcdir = @top_srcdir@
-use_lua = @use_lua@
-use_python = @use_python@
 SUBDIRS = omega/omega_lib/obj omega/code_gen/obj
 build_date = "\"`date +%m/%d/%Y`\""
 core_libs = -lm -lrose -lrt -lutil -lomega -lcodegen -ldl \
 	-lboost_date_time -lboost_filesystem -lboost_program_options \
-	-lboost_regex -lboost_system -lboost_thread -lboost_wave
+	-lboost_regex -lboost_system -lboost_wave -lboost_iostreams
 core_libdirs = -Lomega/code_gen/obj -Lomega/omega_lib/obj \
 	-L$(ROSEHOME)/lib -L$(BOOSTHOME)/lib
-core_includes = -Iomega/include -I$(ROSEHOME)/include \
+core_includes = -Iomega/include -I$(ROSEHOME)/include/rose \
 	-I$(BOOSTHOME)/include
 
 # Core #
diff --git a/aclocal.m4 b/aclocal.m4
index 1f1b272..6acbc5f 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -573,8 +573,7 @@ to "yes", and re-run configure.
 END
     AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
   fi
-fi
-])
+fi])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
diff --git a/chill_run.cc b/chill_run.cc
index d33819b..59cd6e5 100644
--- a/chill_run.cc
+++ b/chill_run.cc
@@ -12,7 +12,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "chill_env.hh"
+//#include "chill_env.hh"
 
 #include "loop.hh"
 #include <omega.h>
diff --git a/configure b/configure
index 79b947a..df8d785 100755
--- a/configure
+++ b/configure
@@ -591,10 +591,6 @@ LUA_OPT_FALSE
 LUA_OPT_TRUE
 PYTHON_OPT_FALSE
 PYTHON_OPT_TRUE
-use_lua
-use_python
-LUAHOME
-interface_lang
 OMEGAHOME
 BOOSTHOME
 ROSEHOME
@@ -720,8 +716,6 @@ enable_coverage
 with_rose
 with_boost
 with_omega
-with_python
-with_lua
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1376,11 +1370,6 @@ Optional Packages:
 
       --with-omega            set omega home
 
-      --with-python           set python as the interface languge
-
-
-      --with-lua              set lua as the interface langauge.
-
 Some influential environment variables:
   CC          C compiler command
   CFLAGS      C compiler flags
@@ -2560,7 +2549,6 @@ END
   fi
 fi
 
-
 #AC_SUBST([prefix],["$(pwd)/bin"])
 
 ### Use the C++ compiler for linking (C is default) ###
@@ -5378,75 +5366,43 @@ else
 fi
 
 
+#AC_ARG_WITH([python],[
+#    AS_HELP_STRING([--with-python],[set python as the interface languge])
+#    ],[
+#    AC_SUBST([interface_lang],[python])
+#    ],[
+#    AC_SUBST([interface_lang],[python])])
 
-# Check whether --with-python was given.
-if test "${with_python+set}" = set; then :
-  withval=$with_python;
-    interface_lang=python
-
-
-else
-
-    interface_lang=default
-
-fi
-
-
-
-# Check whether --with-lua was given.
-if test "${with_lua+set}" = set; then :
-  withval=$with_lua;
-    LUAHOME="${LUAHOME}"
-
-    interface_lang=lua
-
-
-else
-
-    LUAHOME="${LUAHOME}"
-
-fi
-
+#AC_ARG_WITH([lua],[
+#    AS_HELP_STRING([--with-lua],[set lua as the interface langauge.])],[
+#    AC_SUBST([LUAHOME], ["${LUAHOME}"])
+#    AC_SUBST([interface_lang], [lua])
+#    ],[
+#    AC_SUBST([LUAHOME], ["${LUAHOME}"])])
 
 #AC_ARG_WITH([interface],[
 #    AS_HELP_STRING([--with-interface],[select interface language])],[
 #    AC_SUBST([interface_lang],[$withval])],[
 #    AC_SUBST([interface_lang],[default])])
 
-if test "x$interface_lang" == xdefault; then :
-
-    if test "x$enable_cuda" == xyes; then :
-
-        use_python=yes
-
-        use_lua=no
-
-
-else
-
-        use_python=yes
-
-        use_lua=no
-
-fi
-fi
-
-if test "x$interface_lang" == xlua; then :
-
-    use_python=no
-
-    use_lua=yes
-
-fi
-if test "x$interface_lang" == xpython; then :
-
-    use_python=yes
-
-    use_lua=no
-
-fi
-
- if test "x$use_python" == xyes; then
+#AS_IF([test "x$interface_lang" == xdefault],[
+#    AS_IF([test "x$enable_cuda" == xyes],[
+#        AC_SUBST([use_python],[yes])
+#        AC_SUBST([use_lua],[no])
+#        AC_SUBST([interface_lang],[python])
+#        ],[
+#        AC_SUBST([use_python],[yes])
+#        AC_SUBST([use_lua],[no])
+#        AC_SUBST([interface_lang],[python])])],[])
+
+#AS_IF([test "x$interface_lang" == xlua],[
+#    AC_SUBST([use_python],[no])
+#    AC_SUBST([use_lua],[yes])],[])
+#AS_IF([test "x$interface_lang" == xpython],[
+#    AC_SUBST([use_python],[yes])
+#    AC_SUBST([use_lua],[no])],[])
+
+ if test 1 = 1; then
   PYTHON_OPT_TRUE=
   PYTHON_OPT_FALSE='#'
 else
@@ -5454,7 +5410,7 @@ else
   PYTHON_OPT_FALSE=
 fi
 
- if test "x$use_lua" == xyes; then
+ if test 1 = 0; then
   LUA_OPT_TRUE=
   LUA_OPT_FALSE='#'
 else
diff --git a/configure.ac b/configure.ac
index c8296b4..6dbf44a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -67,42 +67,44 @@ AC_ARG_WITH([omega],[
     AC_SUBST([OMEGAHOME], [$withval])],[
     AC_SUBST([OMEGAHOME], ["$(pwd)/omega"])])
 
-AC_ARG_WITH([python],[
-    AS_HELP_STRING([--with-python],[set python as the interface languge])
-    ],[
-    AC_SUBST([interface_lang],[python])
-    ],[
-    AC_SUBST([interface_lang],[default])])
-
-AC_ARG_WITH([lua],[
-    AS_HELP_STRING([--with-lua],[set lua as the interface langauge.])],[
-    AC_SUBST([LUAHOME], ["${LUAHOME}"])
-    AC_SUBST([interface_lang], [lua])
-    ],[
-    AC_SUBST([LUAHOME], ["${LUAHOME}"])])
+#AC_ARG_WITH([python],[
+#    AS_HELP_STRING([--with-python],[set python as the interface languge])
+#    ],[
+#    AC_SUBST([interface_lang],[python])
+#    ],[
+#    AC_SUBST([interface_lang],[python])])
+
+#AC_ARG_WITH([lua],[
+#    AS_HELP_STRING([--with-lua],[set lua as the interface langauge.])],[
+#    AC_SUBST([LUAHOME], ["${LUAHOME}"])
+#    AC_SUBST([interface_lang], [lua])
+#    ],[
+#    AC_SUBST([LUAHOME], ["${LUAHOME}"])])
 
 #AC_ARG_WITH([interface],[
 #    AS_HELP_STRING([--with-interface],[select interface language])],[
 #    AC_SUBST([interface_lang],[$withval])],[
 #    AC_SUBST([interface_lang],[default])])
 
-AS_IF([test "x$interface_lang" == xdefault],[
-    AS_IF([test "x$enable_cuda" == xyes],[
-        AC_SUBST([use_python],[yes])
-        AC_SUBST([use_lua],[no])
-        ],[
-        AC_SUBST([use_python],[yes])
-        AC_SUBST([use_lua],[no])])],[])
-
-AS_IF([test "x$interface_lang" == xlua],[
-    AC_SUBST([use_python],[no])
-    AC_SUBST([use_lua],[yes])],[])
-AS_IF([test "x$interface_lang" == xpython],[
-    AC_SUBST([use_python],[yes])
-    AC_SUBST([use_lua],[no])],[])
-
-AM_CONDITIONAL([PYTHON_OPT],[test "x$use_python" == xyes])
-AM_CONDITIONAL([LUA_OPT],[test "x$use_lua" == xyes])
+#AS_IF([test "x$interface_lang" == xdefault],[
+#    AS_IF([test "x$enable_cuda" == xyes],[
+#        AC_SUBST([use_python],[yes])
+#        AC_SUBST([use_lua],[no])
+#        AC_SUBST([interface_lang],[python])
+#        ],[
+#        AC_SUBST([use_python],[yes])
+#        AC_SUBST([use_lua],[no])
+#        AC_SUBST([interface_lang],[python])])],[])
+
+#AS_IF([test "x$interface_lang" == xlua],[
+#    AC_SUBST([use_python],[no])
+#    AC_SUBST([use_lua],[yes])],[])
+#AS_IF([test "x$interface_lang" == xpython],[
+#    AC_SUBST([use_python],[yes])
+#    AC_SUBST([use_lua],[no])],[])
+
+AM_CONDITIONAL([PYTHON_OPT],[test 1 = 1])
+AM_CONDITIONAL([LUA_OPT],[test 1 = 0])
 
 AC_CONFIG_HEADERS([include/config.h])
 AC_CONFIG_FILES([Makefile])
diff --git a/omega/aclocal.m4 b/omega/aclocal.m4
index ec90bbe..a2aaad2 100644
--- a/omega/aclocal.m4
+++ b/omega/aclocal.m4
@@ -633,8 +633,7 @@ to "yes", and re-run configure.
 END
     AC_MSG_ERROR([Your 'rm' program is bad, sorry.])
   fi
-fi
-])
+fi])
 
 dnl Hook into '_AC_COMPILER_EXEEXT' early to learn its expansion.  Do not
 dnl add the conditional right here, as _AC_COMPILER_EXEEXT may be further
diff --git a/omega/code_gen/obj/Makefile.am b/omega/code_gen/obj/Makefile.am
index cd85b8b..f218be6 100644
--- a/omega/code_gen/obj/Makefile.am
+++ b/omega/code_gen/obj/Makefile.am
@@ -3,7 +3,7 @@ noinst_LIBRARIES =libcodegen.a
 
 libcodegen_a_SOURCES    =../src/codegen.cc ../src/CG_stringBuilder.cc ../src/CG.cc ../src/CG_utils.cc
 libcodegen_a_CFLAGS     =-Wno-write-strings
-libcodegen_a_CPPFLAGS   =-I../include -I../../omega_lib/include -I$(ROSEHOME)/include -I$(BOOSTHOME)/include
+libcodegen_a_CPPFLAGS   =-I../include -I../../omega_lib/include -I$(ROSEHOME)/include/rose -I$(BOOSTHOME)/include
 #if BUILD_ROSE
 libcodegen_a_SOURCES   += ../src/rose_attributes.cc ../src/CG_roseRepr.cc ../src/CG_roseBuilder.cc
 #endif
diff --git a/omega/code_gen/obj/Makefile.in b/omega/code_gen/obj/Makefile.in
index a350281..876e7e9 100644
--- a/omega/code_gen/obj/Makefile.in
+++ b/omega/code_gen/obj/Makefile.in
@@ -269,7 +269,7 @@ libcodegen_a_SOURCES = ../src/codegen.cc ../src/CG_stringBuilder.cc \
 	../src/CG.cc ../src/CG_utils.cc ../src/rose_attributes.cc \
 	../src/CG_roseRepr.cc ../src/CG_roseBuilder.cc
 libcodegen_a_CFLAGS = -Wno-write-strings
-libcodegen_a_CPPFLAGS = -I../include -I../../omega_lib/include -I$(ROSEHOME)/include -I$(BOOSTHOME)/include
+libcodegen_a_CPPFLAGS = -I../include -I../../omega_lib/include -I$(ROSEHOME)/include/rose -I$(BOOSTHOME)/include
 all: all-am
 
 .SUFFIXES:
diff --git a/omega/configure b/omega/configure
index 3a9175c..20a4dfd 100755
--- a/omega/configure
+++ b/omega/configure
@@ -2513,7 +2513,6 @@ END
   fi
 fi
 
-
 ### Use the C++ compiler for linking (C is default) ###
 CCLD="$""(CXX)"