- Fix configure for OSX

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@5671 f25d12d1-65f4-0310-ae8a-bbce733d8d8e
OpenModelica · Jun 16, 2010 · 6ac75ea · 6ac75ea
1 parent 40d5a2b
commit 6ac75ea
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 18 deletions.
diff --git a/Compiler/runtime/Makefile.in b/Compiler/runtime/Makefile.in
@@ -16,7 +16,7 @@ builddir_doc=$(top_builddir)/build/doc
 USE_CORBA = @USE_CORBA@
 
 RMLINCLUDE = @rmlinc@
-CFLAGS = @DEFS@ $(USE_CORBA) -DLDFLAGS_SENDDATA="\"@LIBSENDDATA_LDFLAGS@ -lpthread\""
+CFLAGS = @DEFS@ $(USE_CORBA)
 
 ifdef USE_CORBA
   CORBASRC = omc_communication.cc omc_communication_impl.cpp corbaimpl.cpp
@@ -47,7 +47,7 @@ omc_communication.cc omc_communication.h : omc_communication.idl
 omc_communication.h: omc_communication_impl.cpp corbaimpl.cpp
 
 dynload.o: systemimpl.h ../Absyn.h ../Values.h
-systemimpl.o : Makefile config.unix.h
+systemimpl.o : config.unix.h
 
 clean:
 	$(RM) -rf *.a *.o omc_communication.cc omc_communication.h omc_communication-*
diff --git a/Compiler/runtime/systemimpl.c b/Compiler/runtime/systemimpl.c
@@ -2265,7 +2265,7 @@ void System_5finit(void)
 
 RML_BEGIN_LABEL(System__getSendDataLibs)
 {
-  rmlA0 = (void*) mk_scon(LDFLAGS_SENDDATA) /* Defined in the Makefile; from the configure script */;
+  rmlA0 = (void*) mk_scon(LDFLAGS_SENDDATA);
   RML_TAILCALLK(rmlSC);
 }
 RML_END_LABEL

diff --git a/configure b/configure
@@ -634,6 +634,7 @@ omc_antlr_jar
 rmlinc
 rmlhome
 rmlc_bin
+date
 target_alias
 host_alias
 build_alias
@@ -2178,6 +2179,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
 
 
 ac_ext=c
@@ -4620,10 +4622,11 @@ $as_echo "Not compiling with BOOST" >&6; }; USE_MODPAR=""; BOOSTHOME=""
 
 fi
 
+date=`date "+%Y-%m-%d %H:%M:%S"`
 
-GENERATED_AUTOCONF_FILES="Makefile c_runtime/Makefile Compiler/rml2sig/Makefile modelica_parser/test/parser/Makefile mosh/src/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/omc_profiler/Makefile Compiler/absyn_builder/Makefile modelica_parser/test/lexer/Makefile Compiler/test_codegen/Makefile Compiler/runtime/Makefile modelica_parser/src/Makefile Compiler/modpar/Makefile flat_modelica_parser/src/Makefile c_runtime/interactive/Makefile OMNotebook/ext/OMPlotWindow.config OMNotebook/OMNotebookQT4/OMNotebook.config OMShell/OMShell.config"
+GENERATED_AUTOCONF_FILES="Makefile c_runtime/Makefile Compiler/rml2sig/Makefile modelica_parser/test/parser/Makefile mosh/src/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/omc_profiler/Makefile Compiler/absyn_builder/Makefile modelica_parser/test/lexer/Makefile Compiler/test_codegen/Makefile Compiler/runtime/Makefile modelica_parser/src/Makefile Compiler/modpar/Makefile flat_modelica_parser/src/Makefile c_runtime/interactive/Makefile OMNotebook/ext/OMPlotWindow.config OMNotebook/OMNotebookQT4/OMNotebook.config OMShell/OMShell.config Compiler/runtime/config.unix.h"
 
-ac_config_commands="$ac_config_commands config.h"
+ac_config_commands="$ac_config_commands config.unix.h.fix"
 
 
 ac_config_files="$ac_config_files ${GENERATED_AUTOCONF_FILES}"
@@ -5330,7 +5333,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
 for ac_config_target in $ac_config_targets
 do
   case $ac_config_target in
-    "config.h") CONFIG_COMMANDS="$CONFIG_COMMANDS config.h" ;;
+    "config.unix.h.fix") CONFIG_COMMANDS="$CONFIG_COMMANDS config.unix.h.fix" ;;
     "${GENERATED_AUTOCONF_FILES}") CONFIG_FILES="$CONFIG_FILES ${GENERATED_AUTOCONF_FILES}" ;;
 
   *) as_fn_error "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
@@ -5739,11 +5742,9 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
 
 
   case $ac_file$ac_mode in
-    "config.h":C)
-echo "/* Automatically generated */" > Compiler/runtime/config.unix.h
-echo -n "#define CONFIGURE_COMMANDLINE \"" >> Compiler/runtime/config.unix.h;
-echo -n Configured `date "+%Y-%m-%d %H:%M"` using arguments: `./config.status --config` | sed s/\"//g | sed s/\'//g >> Compiler/runtime/config.unix.h
-echo \" >> Compiler/runtime/config.unix.h;
+    "config.unix.h.fix":C) echo $ac_cs_config | tr -d \" | tr -d \' | sed s/\\//\\\\\\//g > tmp.$$;
+sed -i "s/@CONFIGURE_ARGS@/`cat tmp.$$`/" Compiler/runtime/config.unix.h
+rm -f tmp.$$
  ;;
 
   esac

diff --git a/configure.in b/configure.in
@@ -1,6 +1,8 @@
 dnl Process this file with autoconf to produce a configure script.
 
+AC_PREREQ([2.65])
 AC_INIT(c_runtime/boolean_array.c)
+AC_SUBST(date)
 AC_SUBST(rmlc_bin)
 AC_SUBST(rmlhome)
 AC_SUBST(rmlinc)
@@ -343,14 +345,14 @@ AC_ARG_WITH(BOOST, [  --with-BOOST=DIR        With BOOST library in DIR],
 ], [
 AC_MSG_RESULT([Not compiling with BOOST]); USE_MODPAR=""; BOOSTHOME=""
 ])
+date=`date "+%Y-%m-%d %H:%M:%S"`
 
-GENERATED_AUTOCONF_FILES="Makefile c_runtime/Makefile Compiler/rml2sig/Makefile modelica_parser/test/parser/Makefile mosh/src/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/omc_profiler/Makefile Compiler/absyn_builder/Makefile modelica_parser/test/lexer/Makefile Compiler/test_codegen/Makefile Compiler/runtime/Makefile modelica_parser/src/Makefile Compiler/modpar/Makefile flat_modelica_parser/src/Makefile c_runtime/interactive/Makefile OMNotebook/ext/OMPlotWindow.config OMNotebook/OMNotebookQT4/OMNotebook.config OMShell/OMShell.config"
+GENERATED_AUTOCONF_FILES="Makefile c_runtime/Makefile Compiler/rml2sig/Makefile modelica_parser/test/parser/Makefile mosh/src/Makefile Compiler/Makefile Compiler/omc_release/Makefile Compiler/omc_debug/Makefile Compiler/omc_profiler/Makefile Compiler/absyn_builder/Makefile modelica_parser/test/lexer/Makefile Compiler/test_codegen/Makefile Compiler/runtime/Makefile modelica_parser/src/Makefile Compiler/modpar/Makefile flat_modelica_parser/src/Makefile c_runtime/interactive/Makefile OMNotebook/ext/OMPlotWindow.config OMNotebook/OMNotebookQT4/OMNotebook.config OMShell/OMShell.config Compiler/runtime/config.unix.h"
 
-AC_CONFIG_COMMANDS([config.h], [
-echo "/* Automatically generated */" > Compiler/runtime/config.unix.h
-echo -n "#define CONFIGURE_COMMANDLINE \"" >> Compiler/runtime/config.unix.h;
-echo -n Configured `date "+%Y-%m-%d %H:%M"` using arguments: `./config.status --config` | sed s/\"//g | sed s/\'//g >> Compiler/runtime/config.unix.h]
-echo \" >> Compiler/runtime/config.unix.h;
-)
+AC_CONFIG_COMMANDS([config.unix.h.fix],
+[echo $ac_cs_config | tr -d \" | tr -d \' | sed s/\\//\\\\\\//g > tmp.$$;
+sed -i "s/@CONFIGURE_ARGS@/`cat tmp.$$`/" Compiler/runtime/config.unix.h
+rm -f tmp.$$
+])
 
 AC_OUTPUT(${GENERATED_AUTOCONF_FILES})