diff options
| author | rose-edg4-demo <derickhuth@gmail.com> | 2016-01-18 18:44:30 -0800 |
|---|---|---|
| committer | rose-edg4-demo <derickhuth@gmail.com> | 2016-01-18 18:44:30 -0800 |
| commit | d68532f2f3ba332199f84818cb047d69a3f33588 (patch) | |
| tree | 9731867c7019ec9b6ee111c8fa9f92a92119b5ec | |
| parent | 1419de621b01ef899e5b4d0d0b90e46616d580d3 (diff) | |
| download | chill-d68532f2f3ba332199f84818cb047d69a3f33588.tar.gz chill-d68532f2f3ba332199f84818cb047d69a3f33588.tar.bz2 chill-d68532f2f3ba332199f84818cb047d69a3f33588.zip | |
small bugfix
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 64 | ||||
| -rw-r--r-- | omega/code_gen/obj/Makefile.am | 2 |
3 files changed, 34 insertions, 34 deletions
diff --git a/Makefile.am b/Makefile.am index bbb7412..ab2a5cc 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,7 @@ core_libdirs += -L$(ROSEHOME)/lib -L$(BOOSTHOME)/lib ## Core Includes ## core_includes = -Iomega/include -core_includes += -I$(ROSEHOME)/include/rose +core_includes += -I$(ROSEHOME)/include core_includes += -I$(BOOSTHOME)/include diff --git a/configure.ac b/configure.ac index 6dbf44a..1dfedbc 100644 --- a/configure.ac +++ b/configure.ac @@ -67,44 +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],[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([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([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([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]) +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 "x$use_python" = xyes]) +AM_CONDITIONAL([LUA_OPT],[test "x$use_lua" = xyes]) AC_CONFIG_HEADERS([include/config.h]) AC_CONFIG_FILES([Makefile]) diff --git a/omega/code_gen/obj/Makefile.am b/omega/code_gen/obj/Makefile.am index f218be6..cd85b8b 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/rose -I$(BOOSTHOME)/include +libcodegen_a_CPPFLAGS =-I../include -I../../omega_lib/include -I$(ROSEHOME)/include -I$(BOOSTHOME)/include #if BUILD_ROSE libcodegen_a_SOURCES += ../src/rose_attributes.cc ../src/CG_roseRepr.cc ../src/CG_roseBuilder.cc #endif |