- Fix configure script so include flags in qmake are set correctly (d…

…oes not expect -I input as gcc does)

git-svn-id: https://openmodelica.org/svn/OpenModelica/trunk@5806 f25d12d1-65f4-0310-ae8a-bbce733d8d8e

Compiler/runtime/Makefile.in

@@ -46,8 +46,13 @@ omc_communication.cc omc_communication.h : omc_communication.idl
 
 omc_communication.h: omc_communication_impl.cpp corbaimpl.cpp
 
+omc_communication_impl.o: omc_communication.h
+corbaimpl.o: omc_communication.h
 dynload.o: systemimpl.h ../Absyn.h ../Values.h
 systemimpl.o : config.unix.h
 
 clean:
 	$(RM) -rf *.a *.o omc_communication.cc omc_communication.h omc_communication-*
+
+Makefile: Makefile.in
+	cd $(top_builddir) && ./config.status

configure

@@ -622,6 +622,7 @@ USE_MODPAR
 IDLCMD
 CORBALIBS
 CORBACFLAGS
+CORBA_QMAKE_INCLUDES
 QT_USE_CORBA
 USE_CORBA
 LIBLPSOLVE55
@@ -2179,6 +2180,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
+
 
 
 ac_ext=c
@@ -4443,7 +4445,7 @@ $as_echo_n "checking mico version... " >&6; }
   fi
   USE_CORBA="-DUSE_CORBA -DUSE_MICO"
   QT_USE_CORBA="USE_MICO"
-  CORBACFLAGS=-I`mico-config --prefix`/include;
+  CORBA_QMAKE_INCLUDES="`mico-config --prefix`/include";
   CORBALIBS=`mico-config --libs`;
   IDLCMD="idl";
   DESIRED_CORBA="mico"
@@ -4497,18 +4499,22 @@ fi
   USE_CORBA="-DUSE_CORBA -DUSE_ORBIT"
   QT_USE_CORBA="USE_ORBIT2"
   CORBACFLAGS=`orbit2-config --cflags`;
+  # Don't have orbit2-config installed to verify
+  CORBA_QMAKE_INCLUDES=`orbit2-config --prefix`/include/;
   CORBALIBS=`orbit2-config --libs`;
   IDLCMD="orbit-idl-2";
   DESIRED_CORBA="orbit2"
   as_fn_error "ORBIT2 is not supported yet" "$LINENO" 5
 elif test ! "$WANT_OMNIORB" = "no"; then
   if test "$WANT_OMNIORB" = "yes"; then
     WANT_OMNIORB="/usr";
+  else
+    CORBA_QMAKE_INCLUDES="-I$WANT_OMNIORB/include";
+    CORBACFLAGS="-I$CORBA_QMAKE_INCLUDES";
   fi
   USE_CORBA="-DUSE_CORBA -DUSE_OMNIORB";
   QT_USE_CORBA="USE_OMNIORB"
   CORBALIBS="-lomniORB4 -lomnithread -lpthread";
-  CORBACFLAGS="-I$WANT_OMNIORB/include";
   IDLCMD="omniidl -bcxx -Wbh=.h -Wbs=.cc";
   DESIRED_CORBA="omniorb"
 else

configure.in

@@ -14,6 +14,7 @@ AC_SUBST(LIBNSL)
 AC_SUBST(LIBLPSOLVE55)
 AC_SUBST(USE_CORBA)
 AC_SUBST(QT_USE_CORBA)
+AC_SUBST(CORBA_QMAKE_INCLUDES)
 AC_SUBST(CORBACFLAGS)
 AC_SUBST(CORBALIBS)
 AC_SUBST(IDLCMD)
@@ -207,7 +208,7 @@ if test ! "$WANT_MICO" = "no"; then
   fi
   USE_CORBA="-DUSE_CORBA -DUSE_MICO"
   QT_USE_CORBA="USE_MICO"
-  CORBACFLAGS=-I`mico-config --prefix`/include;
+  CORBA_QMAKE_INCLUDES="`mico-config --prefix`/include";
   CORBALIBS=`mico-config --libs`;
   IDLCMD="idl";
   DESIRED_CORBA="mico"
@@ -224,18 +225,22 @@ elif test ! "$WANT_ORBIT2" = "no"; then
   USE_CORBA="-DUSE_CORBA -DUSE_ORBIT"
   QT_USE_CORBA="USE_ORBIT2"
   CORBACFLAGS=`orbit2-config --cflags`;
+  # Don't have orbit2-config installed to verify
+  CORBA_QMAKE_INCLUDES=`orbit2-config --prefix`/include/;
   CORBALIBS=`orbit2-config --libs`;
   IDLCMD="orbit-idl-2";
   DESIRED_CORBA="orbit2"
   AC_MSG_ERROR([ORBIT2 is not supported yet])
 elif test ! "$WANT_OMNIORB" = "no"; then
   if test "$WANT_OMNIORB" = "yes"; then
     WANT_OMNIORB="/usr";
+  else
+    CORBA_QMAKE_INCLUDES="-I$WANT_OMNIORB/include";
+    CORBACFLAGS="-I$CORBA_QMAKE_INCLUDES";
   fi
   USE_CORBA="-DUSE_CORBA -DUSE_OMNIORB";
   QT_USE_CORBA="USE_OMNIORB"
   CORBALIBS="-lomniORB4 -lomnithread -lpthread";
-  CORBACFLAGS="-I$WANT_OMNIORB/include";
   IDLCMD="omniidl -bcxx -Wbh=.h -Wbs=.cc";
   DESIRED_CORBA="omniorb"
 else