Bump to omnetpp 5.1, add dirty solution to ./configure bug

7 files changed, 1334 insertions, 18 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 27756269f33f..447c640f687c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = omnetpp-qt
 	pkgdesc = OMNeT++ Discrete Event Simulator. OMNeT++ is an extensible, modular, component-based C++ simulation library and framework, primarily for building network simulators: QT version
-	pkgver = 5.0
+	pkgver = 5.1
 	pkgrel = 1
 	url = http://www.omnetpp.org
 	arch = i686
@@ -32,13 +32,19 @@ pkgbase = omnetpp-qt
 	provides = omnetpp
 	conflicts = omnetpp
 	source = OMNeT++.desktop
+	source = config.status
+	source = Makefile.inc
+	source = qtenv.pri
 	source = omnetpp.sh
 	source = download.sh
-	source = omnetpp-5.0-src.tgz::https://omnetpp.org/omnetpp/send/30-omnet-releases/2305-omnetpp-50-linux
-	sha512sums = 87dfd78b441c4384f40aa160786ea847b3a7dbef569258311dc03821273f08dc22962747ef7022a1d2f65f422b34d4a909c9eae7deb4dc6839b12b1dbad56e88
+	source = omnetpp-5.1-src-linux.tgz::https://omnetpp.org/omnetpp/send/30-omnet-releases/2309-omnetpp-5-1-linux
+	sha512sums = 2d228d3830f3dba95f0261a1474f908f2ae14f9477e82d57586141787267d27f0e37e074b51cbd0ad7aac25d1d32c9c1cf43296422f1be33538c432724933b98
+	sha512sums = 021d93c3dd606f3d8ed7df0fa77142108cc5a6e43929d6db729ad74948decaccda4f33f271f6714e23c566ed377f8cf0f18c244c549e20a9617eb852fc41c510
+	sha512sums = d52d6cfa2f156f8262a88364932a4b3429e51962e6707ea6330b179fd21e70a6a2afa4805bc2f40c34192ac6e47237f07f1db1ca46b3f5243b4c99a51107b256
+	sha512sums = 799d9aa8ae5d9804706188ff237f9e662e678fd88fb2da45023fe04f71e67e87243f1df4b6a33e9e3c6fd6e6f1309f779b3c3ad7c6d8ff34f9ceb49116ab3558
 	sha512sums = facb711a01c41665c7909f82b4cee65ddee232e0c526f754ce1ab148dbc6c65abb9b24255f985be245fb2c33f91623365eac730ef83cb1a7c595a09726856fa1
-	sha512sums = 7e543c381f358fa840726cda4c8feb8773d90e923ce5cdf20a25dcb287cf0ebdfc20fef5cfc43475a859057bff81eecaffe1a12a1e92029b346365e4d62abfc9
-	sha512sums = 85315492c3863b05be030944c8ae8ba4a20997a8f3673bbeaf5456dd92075ca88eb2babd5f4ab6d012866de9905e0368c929b03cfdccf6d76705b66defb7698c
+	sha512sums = 559f43976959b0456bb21601b84df3ab690c734b6b0dcb2b5f564b9e061a3e3a824b8bd5844b1922e6302f4918146620160617feec442f956449fc7c07fb244a
+	sha512sums = c569f4abb829ffd603ddafe588487893295f16f27ff52de143aca24080dafe282a2e24fa047745cc7f6963c3be5db761ca9f288c41887331e62f21ebc4416eb3
 
 pkgname = omnetpp-qt
 
diff --git a/Makefile.inc b/Makefile.inc
new file mode 100644
index 000000000000..895feb5f2f0f
--- /dev/null
+++ b/Makefile.inc
@@ -0,0 +1,288 @@
+#
+# Do not edit this file -- it gets generated from Makefile.inc.in.
+# Your changes will be lost the next time ./configure is run.
+#
+OMNETPP_PRODUCT = OMNeT++
+OMNETPP_RELEASE = omnetpp-5.1
+OMNETPP_VERSION = 5.1
+OMNETPP_BUILDID = 170331-7c4e366
+OMNETPP_EDITION = Academic Public License -- NOT FOR COMMERCIAL USE
+
+#
+# Optional features (set to "yes" to enable the feature)
+#
+WITH_QTENV ?= yes
+WITH_OSG ?= yes
+WITH_OSGEARTH ?= yes
+WITH_NETBUILDER ?= yes
+WITH_PARSIM ?= yes
+WITH_SYSTEMC ?= no
+WITH_TKENV ?= yes
+EMBED_TCL_CODE ?= yes
+PREFER_SQLITE_RESULT_FILES ?= no
+
+#
+# SHARED_LIBS determines whether omnetpp is built as shared or static libs
+# By default we use shared libs
+#
+SHARED_LIBS ?= yes
+
+#
+# Directories
+#
+
+# NOTE: it is important to evaluate the current path immediately in this file using :=
+OMNETPP_ROOT := $(abspath $(dir $(lastword $(MAKEFILE_LIST))))
+OMNETPP_IMAGE_PATH := ./bitmaps:./images:$(OMNETPP_ROOT)/images
+OMNETPP_BIN_DIR = $(OMNETPP_ROOT)/bin
+OMNETPP_INCL_DIR = $(OMNETPP_ROOT)/include
+OMNETPP_LIB_DIR = $(OMNETPP_ROOT)/lib$(OUTPUT_PREFIX)
+OMNETPP_OUT_DIR = $(OMNETPP_ROOT)/out$(OUTPUT_PREFIX)
+OMNETPP_SRC_DIR = $(OMNETPP_ROOT)/src
+OMNETPP_UTILS_DIR = $(OMNETPP_SRC_DIR)/utils
+OMNETPP_TKENV_DIR = $(OMNETPP_SRC_DIR)/tkenv
+OMNETPP_UI_DIR = $(OMNETPP_ROOT)/ui
+OMNETPP_DOC_DIR = $(OMNETPP_ROOT)/doc
+OMNETPP_SAMPLES_DIR = $(OMNETPP_ROOT)/samples
+OMNETPP_TEST_DIR = $(OMNETPP_ROOT)/test
+
+PLATFORM = linux.x86_64
+# platform specific code
+ifeq ($(PLATFORM),win32.x86_64)
+  OMNETPP_TOOLS_DIR = $(OMNETPP_ROOT)/tools/win64
+  OMNETPP_IMAGE_PATH := $(shell cygpath -p -m '$(OMNETPP_IMAGE_PATH)')
+else ifeq ($(PLATFORM),macosx)
+  OMNETPP_TOOLS_DIR = $(OMNETPP_ROOT)/tools/macosx
+else
+  # Linux and other platforms do not have a tools directory
+endif
+
+#
+# Configure MODE specific flags/suffixes
+#
+ifeq ($(MODE),release)
+  CFLAGS=$(CFLAGS_RELEASE)
+  D=
+else
+  # by default assume debug mode
+  MODE=debug
+  CFLAGS=$(CFLAGS_DEBUG)
+  D=d
+endif
+
+# use statically built omnetpp if we are building the IDE native helper library
+ifeq ($(BUILDING_UILIBS),yes)
+  SHARED_LIBS=no
+  OUTPUT_PREFIX=/ui
+endif
+
+#
+# Configname determines where (in which subdirectory of out/)
+# makemake-generated makefiles create object files and other
+# build artifacts.
+#
+CONFIGNAME ?= $(TOOLCHAIN_NAME)-$(MODE)
+
+#
+# Control verbosity. Specifiying V=1 will make the build output verbose. You can use:
+# $(Q) to hide commands only in quiet mode
+# $(qecho) to print out something only in quite mode
+# $(vecho) to print out something only in verbose mode
+#
+ifeq ($(V),1)
+  Q :=
+  vecho = @echo
+  qecho = @true
+else
+  Q := @
+  vecho = @true
+  qecho = @echo
+endif
+
+# Recursive wildcard function. Call like: $(call opp_rwildcard, src/, *.c *.h)
+opp_rwildcard=$(foreach d,$(wildcard $1*),$(call opp_rwildcard,$d/,$2) $(filter $(subst *,%,$2),$d))
+
+#
+# tools, libraries and compiler flags detected by ./configure
+#
+PERL = perl
+YACC = bison -y
+LEX = flex
+CC = clang
+CXX = clang++
+TOOLCHAIN_NAME = clang
+DEFINES = -DHAVE_SWAPCONTEXT -DWITH_MPI
+CFLAGS_DEBUG = -g -Wall
+CFLAGS_RELEASE = -O2 -DNDEBUG=1
+CFLAGS += -MMD -MP -MF $(basename $@).d  -fPIC  -Wno-deprecated-register -Wno-unused-function -fno-stack-protector $(DEFINES)
+CXXFLAGS =  -std=c++11
+LDFLAG_LIBPATH = -L
+LDFLAG_INCLUDE = -Wl,-u,
+LDFLAG_LIB = -l
+LDFLAG_IMPLIB = -Wl,--out-implib,
+LDFLAGS =  -Wl,-rpath,$(OMNETPP_LIB_DIR) -Wl,-rpath,$(OMNETPP_TOOLS_DIR)/lib -Wl,-rpath,.  -Wl,--export-dynamic $(LDFLAG_LIBPATH)$(OMNETPP_LIB_DIR)
+WHOLE_ARCHIVE_ON = -Wl,--whole-archive
+WHOLE_ARCHIVE_OFF = -Wl,--no-whole-archive
+AS_NEEDED_ON = -Wl,--as-needed
+AS_NEEDED_OFF = -Wl,--no-as-needed
+PIC_FLAGS = -fPIC
+MSGC = opp_msgc
+SMC = opp_smc
+NEDTOOL = nedtool
+AS = as
+AR = ar cr
+ARFLAG_OUT = 
+RANLIB = ranlib
+SHLIB_LD = clang++ -shared -fPIC
+DLLTOOL = dlltool
+STRIP = strip
+WISH = wish
+MAKEDEPEND = opp_makedep -Y --objdirtree
+LN = ln -sf
+MKPATH = mkdir -p
+SHLIB_POSTPROCESS = opp_shlib_postprocess
+SWIG = swig
+QMAKE = /usr/bin/qmake
+MOC=/usr/bin/moc
+UIC=/usr/bin/uic
+RCC=/usr/bin/rcc
+
+HAVE_DLOPEN = 1
+SYS_LIBS = -ldl -lstdc++ 
+TK_CFLAGS = 
+TK_LIBS = -ltk8.6 -ltcl8.6
+QT_CFLAGS = -isystem /usr/include/qt -isystem /usr/include/qt/QtCore -isystem /usr/include/qt/QtGui -isystem /usr/include/qt/QtWidgets -isystem /usr/include/qt/QtOpenGL -isystem /usr/include/qt/QtPrintSupport
+QT_LIBS = -lQt5Gui -lQt5Core -lQt5Widgets -lQt5PrintSupport -lQt5OpenGL -L/usr/lib -Wl,-rpath=/usr/lib
+QTENV_LDFLAGS = -Wl,-rpath-link=/usr/lib
+OSG_CFLAGS = 
+OSG_LIBS = -losg -losgDB -losgGA -losgViewer -losgUtil -lOpenThreads
+OSGEARTH_CFLAGS = 
+OSGEARTH_LIBS = -losgEarth -losgEarthUtil
+ZLIB_CFLAGS = 
+ZLIB_LIBS = -lz
+MPI_CFLAGS = -pthread
+MPI_LIBS = -pthread -Wl,-rpath -Wl,/usr/lib/openmpi -Wl,--enable-new-dtags -L/usr/lib/openmpi -lmpi_cxx -lmpi
+PTHREAD_CFLAGS = 
+PTHREAD_LIBS = -lpthread
+XMLPARSER = libxml
+XML_CFLAGS = -I/usr/include/libxml2
+XML_LIBS = -lxml2
+DEFINES += -DXMLPARSER=$(XMLPARSER)
+AKAROA_CFLAGS = -I/usr/local/akaroa/include
+AKAROA_LIBS = -L/usr/local/akaroa/lib -lakaroa -lfl
+JNILIBS_IF_POSSIBLE = jnilibs
+JAVA_CFLAGS = 
+JAVA_LIBS = 
+
+#
+# platform specific library and executable prefixes and extensions
+#
+A_LIB_SUFFIX = .a
+SO_LIB_SUFFIX = .so
+DLL_LIB_SUFFIX = .dll
+JNI_LIB_SUFFIX = $(SO_LIB_SUFFIX)
+EXE_SUFFIX = 
+LIB_PREFIX = lib
+SHARED_LIB_SUFFIX = $(SO_LIB_SUFFIX)
+
+#
+# omnetpp and system libraries linked with the simulations
+#
+TKENV_LIBS = $(LDFLAG_INCLUDE)_tkenv_lib $(AS_NEEDED_OFF) -lopptkenv$D -loppenvir$D -lopplayout$D
+QTENV_LIBS = $(LDFLAG_INCLUDE)_qtenv_lib $(AS_NEEDED_OFF) $(QTENV_LDFLAGS) -loppqtenv$D -loppenvir$D -lopplayout$D
+CMDENV_LIBS = $(LDFLAG_INCLUDE)_cmdenv_lib $(AS_NEEDED_OFF) -loppcmdenv$D -loppenvir$D
+ALL_ENV_LIBS = $(CMDENV_LIBS)
+KERNEL_LIBS = -loppsim$D
+OPPMAIN_LIB = $(LDFLAG_LIB)oppmain$D
+
+#
+# flags and libraries required for Qtenv
+#
+ifeq ($(WITH_QTENV),yes)
+  QTENV_TARGET = qtenv
+  DEFINES += -DPREFER_QTENV -DWITH_QTENV
+  # libraries required for static linking
+  ifneq ($(SHARED_LIBS),yes)
+    QTENV_LIBS += $(QT_LIBS)
+    ifeq ($(WITH_OSG),yes)
+      QTENV_LIBS += $(OSG_LIBS)
+      KERNEL_LIBS += -losg -lOpenThreads
+    endif
+    ifeq ($(WITH_OSGEARTH),yes)
+      QTENV_LIBS += $(OSGEARTH_LIBS)
+      KERNEL_LIBS += -losgEarth
+    endif
+    ifeq ($(PLATFORM),macosx)
+      QTENV_LIBS += -framework Carbon
+    endif
+  endif
+  ALL_ENV_LIBS += $(QTENV_LIBS)
+else
+  QTENV_TARGET = skip
+endif
+
+#
+# flags and libraries required for Ttenv
+#
+ifeq ($(WITH_TKENV),yes)
+  TKENV_TARGET = tkenv
+  DEFINES += -DWITH_TKENV
+  # libraries required for static linking
+  ifneq ($(SHARED_LIBS),yes)
+    TKENV_LIBS += $(TK_LIBS) $(ZLIB_LIBS)
+    ifeq ($(PLATFORM),macosx)
+      TKENV_LIBS += -framework Carbon
+    endif
+  endif
+  ALL_ENV_LIBS += $(TKENV_LIBS)
+else
+  TKENV_TARGET = skip
+endif
+
+#
+# Other defines
+#
+ifeq ($(WITH_PARSIM),yes)
+  DEFINES += -DWITH_PARSIM
+  # extra libs needed during static building
+  ifneq ($(SHARED_LIBS),yes)
+    KERNEL_LIBS += $(MPI_LIBS)
+  endif
+endif
+
+ifeq ($(WITH_NETBUILDER),yes)
+  DEFINES += -DWITH_NETBUILDER
+endif
+
+# note: defines for OSG and osgEarth must be available even if WITH_QTENV=no
+ifeq ($(WITH_OSG),yes)
+  DEFINES += -DWITH_OSG
+endif
+
+ifeq ($(WITH_OSGEARTH),yes)
+  DEFINES += -DWITH_OSGEARTH
+endif
+
+
+#
+# toolchain specific flags and options
+#
+ifeq ($(TOOLCHAIN_NAME),clangc2)
+  # this macro can be used to pass EXPORT macros to the compiler if omnet is built as shared library
+  ifeq ($(SHARED_LIBS),yes)
+    IMPORT_DEFINES = -DOMNETPPLIBS_IMPORT
+    EXPORT_DEFINES = $(EXPORT_MACRO)
+  endif
+endif
+
+#
+# handle differences between shared and static lib builds
+#
+ifeq ($(SHARED_LIBS),yes)
+  LIB_SUFFIX =  $(SHARED_LIB_SUFFIX)
+else
+  LIB_SUFFIX = $(A_LIB_SUFFIX)
+  # extra libraries needed when statically linking (because of indirect dependencies)
+  KERNEL_LIBS += -loppnedxml$D -loppcommon$D $(XML_LIBS)
+endif
+
diff --git a/OMNeT++.desktop b/OMNeT++.desktop
index 830d16774f17..8326ef588985 100644
--- a/OMNeT++.desktop
+++ b/OMNeT++.desktop
@@ -1,5 +1,5 @@
 [Desktop Entry]
-Version=5.0
+Version=5.1
 Type=Application
 Name=OMNeT++
 Icon=/opt/omnetpp/doc/manual/omnetpp.png
diff --git a/PKGBUILD b/PKGBUILD
index 89e37f50b77d..16df2d029f3b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,8 @@
 # Maintainer: Bruno Silva <brunofernandes at ua dot pt>
 
 pkgname='omnetpp-qt'
-pkgver=5.0
+pkgver=5.1
+_pkgver=5-1
 pkgrel=1
 _pkgname='omnetpp'
 pkgdesc='OMNeT++ Discrete Event Simulator. OMNeT++ is an extensible, modular, component-based C++ simulation library and framework, primarily for building network simulators: QT version'
@@ -13,26 +14,36 @@ arch=('i686' 'x86_64')
 provides=('omnetpp')
 conflicts=('omnetpp')
 
-if [ $(echo "85315492c3863b05be030944c8ae8ba4a20997a8f3673bbeaf5456dd92075ca88eb2babd5f4ab6d012866de9905e0368c929b03cfdccf6d76705b66defb7698c  omnetpp-5.0-src.tgz" | sha512sum -c --status; echo $?) -ne 0 ];
+if [ $(echo "c569f4abb829ffd603ddafe588487893295f16f27ff52de143aca24080dafe282a2e24fa047745cc7f6963c3be5db761ca9f288c41887331e62f21ebc4416eb3 omnetpp-5.1-src-linux.tgz" | sha512sum -c --status; echo $?) -ne 0 ];
 then
 	sh download.sh
 fi
 
 source=(OMNeT++.desktop
+	config.status
+	Makefile.inc
+	qtenv.pri
 	omnetpp.sh
 	download.sh
-	omnetpp-5.0-src.tgz::https://omnetpp.org/omnetpp/send/30-omnet-releases/2305-omnetpp-50-linux)
+	omnetpp-5.1-src-linux.tgz::https://omnetpp.org/omnetpp/send/30-omnet-releases/2309-omnetpp-5-1-linux)
 
-sha512sums=('87dfd78b441c4384f40aa160786ea847b3a7dbef569258311dc03821273f08dc22962747ef7022a1d2f65f422b34d4a909c9eae7deb4dc6839b12b1dbad56e88'
+sha512sums=('2d228d3830f3dba95f0261a1474f908f2ae14f9477e82d57586141787267d27f0e37e074b51cbd0ad7aac25d1d32c9c1cf43296422f1be33538c432724933b98'
+	'021d93c3dd606f3d8ed7df0fa77142108cc5a6e43929d6db729ad74948decaccda4f33f271f6714e23c566ed377f8cf0f18c244c549e20a9617eb852fc41c510'
+	'd52d6cfa2f156f8262a88364932a4b3429e51962e6707ea6330b179fd21e70a6a2afa4805bc2f40c34192ac6e47237f07f1db1ca46b3f5243b4c99a51107b256'
+	'799d9aa8ae5d9804706188ff237f9e662e678fd88fb2da45023fe04f71e67e87243f1df4b6a33e9e3c6fd6e6f1309f779b3c3ad7c6d8ff34f9ceb49116ab3558'
 	'facb711a01c41665c7909f82b4cee65ddee232e0c526f754ce1ab148dbc6c65abb9b24255f985be245fb2c33f91623365eac730ef83cb1a7c595a09726856fa1'
-	'7e543c381f358fa840726cda4c8feb8773d90e923ce5cdf20a25dcb287cf0ebdfc20fef5cfc43475a859057bff81eecaffe1a12a1e92029b346365e4d62abfc9'
-	'85315492c3863b05be030944c8ae8ba4a20997a8f3673bbeaf5456dd92075ca88eb2babd5f4ab6d012866de9905e0368c929b03cfdccf6d76705b66defb7698c')
+	'559f43976959b0456bb21601b84df3ab690c734b6b0dcb2b5f564b9e061a3e3a824b8bd5844b1922e6302f4918146620160617feec442f956449fc7c07fb244a'
+	'c569f4abb829ffd603ddafe588487893295f16f27ff52de143aca24080dafe282a2e24fa047745cc7f6963c3be5db761ca9f288c41887331e62f21ebc4416eb3')
 
 build() {
+	# fix configure bug by providing pre-generated configuration file with --prefix=/opt --libdir=/opt/lib --libexecdir=/opt/lib
+	cp config.status ${srcdir}/${_pkgname}-${pkgver}/
+	cp Makefile.inc  ${srcdir}/${_pkgname}-${pkgver}/
+	cp qtenv.pri ${srcdir}/${_pkgname}-${pkgver}/src/qtenv/
 	cd ${srcdir}/${_pkgname}-${pkgver}
 	PATH=${srcdir}/${_pkgname}-${pkgver}/bin:$PATH
 	LD_LIBRARY_PATH=${srcdir}/${_pkgname}-${pkgver}/lib:$LD_LIBRARY_PATH
-	./configure --prefix=/opt --libdir=/opt/lib --libexecdir=/opt/lib && make
+	make
 }
 
 package() {
diff --git a/config.status b/config.status
new file mode 100755
index 000000000000..9062fc3598ea
--- /dev/null
+++ b/config.status
@@ -0,0 +1,995 @@
+#! /bin/sh
+# Generated by configure.
+# Run this file to recreate the current configuration.
+# Compiler output produced by configure, useful for debugging
+# configure, is in config.log if it exists.
+
+debug=false
+ac_cs_recheck=false
+ac_cs_silent=false
+
+SHELL=${CONFIG_SHELL-/bin/sh}
+export SHELL
+## -------------------- ##
+## M4sh Initialization. ##
+## -------------------- ##
+
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
+  emulate sh
+  NULLCMD=:
+  # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
+  # is contrary to our usage.  Disable this feature.
+  alias -g '${1+"$@"}'='"$@"'
+  setopt NO_GLOB_SUBST
+else
+  case `(set -o) 2>/dev/null` in #(
+  *posix*) :
+    set -o posix ;; #(
+  *) :
+     ;;
+esac
+fi
+
+
+as_nl='
+'
+export as_nl
+# Printing a long string crashes Solaris 7 /usr/bin/printf.
+as_echo='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo
+as_echo=$as_echo$as_echo$as_echo$as_echo$as_echo$as_echo
+# Prefer a ksh shell builtin over an external printf program on Solaris,
+# but without wasting forks for bash or zsh.
+if test -z "$BASH_VERSION$ZSH_VERSION" \
+    && (test "X`print -r -- $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='print -r --'
+  as_echo_n='print -rn --'
+elif (test "X`printf %s $as_echo`" = "X$as_echo") 2>/dev/null; then
+  as_echo='printf %s\n'
+  as_echo_n='printf %s'
+else
+  if test "X`(/usr/ucb/echo -n -n $as_echo) 2>/dev/null`" = "X-n $as_echo"; then
+    as_echo_body='eval /usr/ucb/echo -n "$1$as_nl"'
+    as_echo_n='/usr/ucb/echo -n'
+  else
+    as_echo_body='eval expr "X$1" : "X\\(.*\\)"'
+    as_echo_n_body='eval
+      arg=$1;
+      case $arg in #(
+      *"$as_nl"*)
+	expr "X$arg" : "X\\(.*\\)$as_nl";
+	arg=`expr "X$arg" : ".*$as_nl\\(.*\\)"`;;
+      esac;
+      expr "X$arg" : "X\\(.*\\)" | tr -d "$as_nl"
+    '
+    export as_echo_n_body
+    as_echo_n='sh -c $as_echo_n_body as_echo'
+  fi
+  export as_echo_body
+  as_echo='sh -c $as_echo_body as_echo'
+fi
+
+# The user is always right.
+if test "${PATH_SEPARATOR+set}" != set; then
+  PATH_SEPARATOR=:
+  (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+    (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+      PATH_SEPARATOR=';'
+  }
+fi
+
+
+# IFS
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent editors from complaining about space-tab.
+# (If _AS_PATH_WALK were called with IFS unset, it would disable word
+# splitting by setting IFS to empty value.)
+IFS=" ""	$as_nl"
+
+# Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
+case $0 in #((
+  *[\\/]* ) as_myself=$0 ;;
+  *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    test -r "$as_dir/$0" && as_myself=$as_dir/$0 && break
+  done
+IFS=$as_save_IFS
+
+     ;;
+esac
+# We did not find ourselves, most probably we were run as `sh COMMAND'
+# in which case we are not to be found in the path.
+if test "x$as_myself" = x; then
+  as_myself=$0
+fi
+if test ! -f "$as_myself"; then
+  $as_echo "$as_myself: error: cannot find myself; rerun with an absolute file name" >&2
+  exit 1
+fi
+
+# Unset variables that we do not need and which cause bugs (e.g. in
+# pre-3.0 UWIN ksh).  But do not cause bugs in bash 2.01; the "|| exit 1"
+# suppresses any "Segmentation fault" message there.  '((' could
+# trigger a bug in pdksh 5.2.14.
+for as_var in BASH_ENV ENV MAIL MAILPATH
+do eval test x\${$as_var+set} = xset \
+  && ( (unset $as_var) || exit 1) >/dev/null 2>&1 && unset $as_var || :
+done
+PS1='$ '
+PS2='> '
+PS4='+ '
+
+# NLS nuisances.
+LC_ALL=C
+export LC_ALL
+LANGUAGE=C
+export LANGUAGE
+
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+
+# as_fn_error STATUS ERROR [LINENO LOG_FD]
+# ----------------------------------------
+# Output "`basename $0`: error: ERROR" to stderr. If LINENO and LOG_FD are
+# provided, also output the error to LOG_FD, referencing LINENO. Then exit the
+# script with STATUS, using 1 if that was 0.
+as_fn_error ()
+{
+  as_status=$1; test $as_status -eq 0 && as_status=1
+  if test "$4"; then
+    as_lineno=${as_lineno-"$3"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
+    $as_echo "$as_me:${as_lineno-$LINENO}: error: $2" >&$4
+  fi
+  $as_echo "$as_me: error: $2" >&2
+  as_fn_exit $as_status
+} # as_fn_error
+
+
+# as_fn_set_status STATUS
+# -----------------------
+# Set $? to STATUS, without forking.
+as_fn_set_status ()
+{
+  return $1
+} # as_fn_set_status
+
+# as_fn_exit STATUS
+# -----------------
+# Exit the shell with STATUS, even in a "trap 0" or "set -e" context.
+as_fn_exit ()
+{
+  set +e
+  as_fn_set_status $1
+  exit $1
+} # as_fn_exit
+
+# as_fn_unset VAR
+# ---------------
+# Portably unset VAR.
+as_fn_unset ()
+{
+  { eval $1=; unset $1;}
+}
+as_unset=as_fn_unset
+# as_fn_append VAR VALUE
+# ----------------------
+# Append the text in VALUE to the end of the definition contained in VAR. Take
+# advantage of any shell optimizations that allow amortized linear growth over
+# repeated appends, instead of the typical quadratic growth present in naive
+# implementations.
+if (eval "as_var=1; as_var+=2; test x\$as_var = x12") 2>/dev/null; then :
+  eval 'as_fn_append ()
+  {
+    eval $1+=\$2
+  }'
+else
+  as_fn_append ()
+  {
+    eval $1=\$$1\$2
+  }
+fi # as_fn_append
+
+# as_fn_arith ARG...
+# ------------------
+# Perform arithmetic evaluation on the ARGs, and store the result in the
+# global $as_val. Take advantage of shells that can avoid forks. The arguments
+# must be portable across $(()) and expr.
+if (eval "test \$(( 1 + 1 )) = 2") 2>/dev/null; then :
+  eval 'as_fn_arith ()
+  {
+    as_val=$(( $* ))
+  }'
+else
+  as_fn_arith ()
+  {
+    as_val=`expr "$@" || test $? -eq 1`
+  }
+fi # as_fn_arith
+
+
+if expr a : '\(a\)' >/dev/null 2>&1 &&
+   test "X`expr 00001 : '.*\(...\)'`" = X001; then
+  as_expr=expr
+else
+  as_expr=false
+fi
+
+if (basename -- /) >/dev/null 2>&1 && test "X`basename -- / 2>&1`" = "X/"; then
+  as_basename=basename
+else
+  as_basename=false
+fi
+
+if (as_dir=`dirname -- /` && test "X$as_dir" = X/) >/dev/null 2>&1; then
+  as_dirname=dirname
+else
+  as_dirname=false
+fi
+
+as_me=`$as_basename -- "$0" ||
+$as_expr X/"$0" : '.*/\([^/][^/]*\)/*$' \| \
+	 X"$0" : 'X\(//\)$' \| \
+	 X"$0" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X/"$0" |
+    sed '/^.*\/\([^/][^/]*\)\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\/\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+
+# Avoid depending upon Character Ranges.
+as_cr_letters='abcdefghijklmnopqrstuvwxyz'
+as_cr_LETTERS='ABCDEFGHIJKLMNOPQRSTUVWXYZ'
+as_cr_Letters=$as_cr_letters$as_cr_LETTERS
+as_cr_digits='0123456789'
+as_cr_alnum=$as_cr_Letters$as_cr_digits
+
+ECHO_C= ECHO_N= ECHO_T=
+case `echo -n x` in #(((((
+-n*)
+  case `echo 'xy\c'` in
+  *c*) ECHO_T='	';;	# ECHO_T is single tab character.
+  xy)  ECHO_C='\c';;
+  *)   echo `echo ksh88 bug on AIX 6.1` > /dev/null
+       ECHO_T='	';;
+  esac;;
+*)
+  ECHO_N='-n';;
+esac
+
+rm -f conf$$ conf$$.exe conf$$.file
+if test -d conf$$.dir; then
+  rm -f conf$$.dir/conf$$.file
+else
+  rm -f conf$$.dir
+  mkdir conf$$.dir 2>/dev/null
+fi
+if (echo >conf$$.file) 2>/dev/null; then
+  if ln -s conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s='ln -s'
+    # ... but there are two gotchas:
+    # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
+    # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
+    # In both cases, we have to default to `cp -pR'.
+    ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
+      as_ln_s='cp -pR'
+  elif ln conf$$.file conf$$ 2>/dev/null; then
+    as_ln_s=ln
+  else
+    as_ln_s='cp -pR'
+  fi
+else
+  as_ln_s='cp -pR'
+fi
+rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
+rmdir conf$$.dir 2>/dev/null
+
+
+# as_fn_mkdir_p
+# -------------
+# Create "$as_dir" as a directory, including parents if necessary.
+as_fn_mkdir_p ()
+{
+
+  case $as_dir in #(
+  -*) as_dir=./$as_dir;;
+  esac
+  test -d "$as_dir" || eval $as_mkdir_p || {
+    as_dirs=
+    while :; do
+      case $as_dir in #(
+      *\'*) as_qdir=`$as_echo "$as_dir" | sed "s/'/'\\\\\\\\''/g"`;; #'(
+      *) as_qdir=$as_dir;;
+      esac
+      as_dirs="'$as_qdir' $as_dirs"
+      as_dir=`$as_dirname -- "$as_dir" ||
+$as_expr X"$as_dir" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$as_dir" : 'X\(//\)[^/]' \| \
+	 X"$as_dir" : 'X\(//\)$' \| \
+	 X"$as_dir" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$as_dir" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+      test -d "$as_dir" && break
+    done
+    test -z "$as_dirs" || eval "mkdir $as_dirs"
+  } || test -d "$as_dir" || as_fn_error $? "cannot create directory $as_dir"
+
+
+} # as_fn_mkdir_p
+if mkdir -p . 2>/dev/null; then
+  as_mkdir_p='mkdir -p "$as_dir"'
+else
+  test -d ./-p && rmdir ./-p
+  as_mkdir_p=false
+fi
+
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
+
+# Sed expression to map a string onto a valid CPP name.
+as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
+
+# Sed expression to map a string onto a valid variable name.
+as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
+
+
+exec 6>&1
+## ----------------------------------- ##
+## Main body of $CONFIG_STATUS script. ##
+## ----------------------------------- ##
+# Save the log message, to keep $0 and so on meaningful, and to
+# report actual input values of CONFIG_FILES etc. instead of their
+# values after options handling.
+ac_log="
+This file was extended by $as_me, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
+
+  CONFIG_FILES    = $CONFIG_FILES
+  CONFIG_HEADERS  = $CONFIG_HEADERS
+  CONFIG_LINKS    = $CONFIG_LINKS
+  CONFIG_COMMANDS = $CONFIG_COMMANDS
+  $ $0 $@
+
+on `(hostname || uname -n) 2>/dev/null | sed 1q`
+"
+
+# Files that config.status was made for.
+config_files=" Makefile.inc src/qtenv/qtenv.pri"
+
+ac_cs_usage="\
+\`$as_me' instantiates files and other configuration actions
+from templates according to the current configuration.  Unless the files
+and actions are specified as TAGs, all are instantiated by default.
+
+Usage: $0 [OPTION]... [TAG]...
+
+  -h, --help       print this help, then exit
+  -V, --version    print version number and configuration settings, then exit
+      --config     print configuration, then exit
+  -q, --quiet, --silent
+                   do not print progress messages
+  -d, --debug      don't remove temporary files
+      --recheck    update $as_me by reconfiguring in the same conditions
+      --file=FILE[:TEMPLATE]
+                   instantiate the configuration file FILE
+
+Configuration files:
+$config_files
+
+Report bugs to the package provider."
+
+ac_cs_config="'--prefix=/opt'"
+ac_cs_version="\
+config.status
+configured by ./configure, generated by GNU Autoconf 2.69,
+  with options \"$ac_cs_config\"
+
+Copyright (C) 2012 Free Software Foundation, Inc.
+This config.status script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."
+
+ac_pwd='.'
+srcdir='.'
+test -n "$AWK" || AWK=awk
+# The default lists apply if the user does not specify any file.
+ac_need_defaults=:
+while test $# != 0
+do
+  case $1 in
+  --*=?*)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=`expr "X$1" : 'X[^=]*=\(.*\)'`
+    ac_shift=:
+    ;;
+  --*=)
+    ac_option=`expr "X$1" : 'X\([^=]*\)='`
+    ac_optarg=
+    ac_shift=:
+    ;;
+  *)
+    ac_option=$1
+    ac_optarg=$2
+    ac_shift=shift
+    ;;
+  esac
+
+  case $ac_option in
+  # Handling of the options.
+  -recheck | --recheck | --rechec | --reche | --rech | --rec | --re | --r)
+    ac_cs_recheck=: ;;
+  --version | --versio | --versi | --vers | --ver | --ve | --v | -V )
+    $as_echo "$ac_cs_version"; exit ;;
+  --config | --confi | --conf | --con | --co | --c )
+    $as_echo "$ac_cs_config"; exit ;;
+  --debug | --debu | --deb | --de | --d | -d )
+    debug=: ;;
+  --file | --fil | --fi | --f )
+    $ac_shift
+    case $ac_optarg in
+    *\'*) ac_optarg=`$as_echo "$ac_optarg" | sed "s/'/'\\\\\\\\''/g"` ;;
+    '') as_fn_error $? "missing file argument" ;;
+    esac
+    as_fn_append CONFIG_FILES " '$ac_optarg'"
+    ac_need_defaults=false;;
+  --he | --h |  --help | --hel | -h )
+    $as_echo "$ac_cs_usage"; exit ;;
+  -q | -quiet | --quiet | --quie | --qui | --qu | --q \
+  | -silent | --silent | --silen | --sile | --sil | --si | --s)
+    ac_cs_silent=: ;;
+
+  # This is an error.
+  -*) as_fn_error $? "unrecognized option: \`$1'
+Try \`$0 --help' for more information." ;;
+
+  *) as_fn_append ac_config_targets " $1"
+     ac_need_defaults=false ;;
+
+  esac
+  shift
+done
+
+ac_configure_extra_args=
+
+if $ac_cs_silent; then
+  exec 6>/dev/null
+  ac_configure_extra_args="$ac_configure_extra_args --silent"
+fi
+
+if $ac_cs_recheck; then
+  set X /bin/sh './configure'  '--prefix=/opt' $ac_configure_extra_args --no-create --no-recursion
+  shift
+  $as_echo "running CONFIG_SHELL=/bin/sh $*" >&6
+  CONFIG_SHELL='/bin/sh'
+  export CONFIG_SHELL
+  exec "$@"
+fi
+
+exec 5>>config.log
+{
+  echo
+  sed 'h;s/./-/g;s/^.../## /;s/...$/ ##/;p;x;p;x' <<_ASBOX
+## Running $as_me. ##
+_ASBOX
+  $as_echo "$ac_log"
+} >&5
+
+
+# Handling of arguments.
+for ac_config_target in $ac_config_targets
+do
+  case $ac_config_target in
+    "Makefile.inc") CONFIG_FILES="$CONFIG_FILES Makefile.inc" ;;
+    "src/qtenv/qtenv.pri") CONFIG_FILES="$CONFIG_FILES src/qtenv/qtenv.pri" ;;
+
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
+  esac
+done
+
+
+# If the user did not use the arguments to specify the items to instantiate,
+# then the envvar interface is used.  Set only those that are not.
+# We use the long form for the default assignment because of an extremely
+# bizarre bug on SunOS 4.1.3.
+if $ac_need_defaults; then
+  test "${CONFIG_FILES+set}" = set || CONFIG_FILES=$config_files
+fi
+
+# Have a temporary directory for convenience.  Make it in the build tree
+# simply because there is no reason against having it here, and in addition,
+# creating and moving files from /tmp can sometimes cause problems.
+# Hook for its removal unless debugging.
+# Note that there is a small window in which the directory will not be cleaned:
+# after its creation but before its name has been assigned to `$tmp'.
+$debug ||
+{
+  tmp= ac_tmp=
+  trap 'exit_status=$?
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
+' 0
+  trap 'as_fn_exit 1' 1 2 13 15
+}
+# Create a (secure) tmp directory for tmp files.
+
+{
+  tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
+  test -d "$tmp"
+}  ||
+{
+  tmp=./conf$$-$RANDOM
+  (umask 077 && mkdir "$tmp")
+} || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
+
+# Set up the scripts for CONFIG_FILES section.
+# No need to generate them if there are no CONFIG_FILES.
+# This happens for instance with `./config.status config.h'.
+if test -n "$CONFIG_FILES"; then
+
+
+ac_cr=`echo X | tr X '\015'`
+# On cygwin, bash can eat \r inside `` if the user requested igncr.
+# But we know of no other shell where ac_cr would be empty at this
+# point, so we can use a bashism as a fallback.
+if test "x$ac_cr" = x; then
+  eval ac_cr=\$\'\\r\'
+fi
+ac_cs_awk_cr=`$AWK 'BEGIN { print "a\rb" }' </dev/null 2>/dev/null`
+if test "$ac_cs_awk_cr" = "a${ac_cr}b"; then
+  ac_cs_awk_cr='\\r'
+else
+  ac_cs_awk_cr=$ac_cr
+fi
+
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
+cat >>"$ac_tmp/subs1.awk" <<\_ACAWK &&
+S["LTLIBOBJS"]=""
+S["LIBOBJS"]=""
+S["PLATFORM"]="linux.x86_64"
+S["JAVA_LIBS"]=""
+S["JAVA_CFLAGS"]=""
+S["PREFER_SQLITE_RESULT_FILES"]="no"
+S["WITH_SYSTEMC"]="no"
+S["WITH_OSGEARTH"]="yes"
+S["WITH_OSG"]="yes"
+S["WITH_QTENV"]="yes"
+S["WITH_TKENV"]="yes"
+S["WITH_PARSIM"]="yes"
+S["WITH_NETBUILDER"]="yes"
+S["EMBED_TCL_CODE"]="yes"
+S["JNILIBS_IF_POSSIBLE"]="jnilibs"
+S["AKAROA_LIBS"]="-L/usr/local/akaroa/lib -lakaroa -lfl"
+S["AKAROA_CFLAGS"]="-I/usr/local/akaroa/include"
+S["XML_LIBS"]="-lxml2"
+S["XML_CFLAGS"]="-I/usr/include/libxml2"
+S["XMLPARSER"]="libxml"
+S["PTHREAD_LIBS"]="-lpthread"
+S["PTHREAD_CFLAGS"]=""
+S["SYS_LIBS"]="-ldl -lstdc++ "
+S["MPI_LIBS"]="-pthread -Wl,-rpath -Wl,/usr/lib/openmpi -Wl,--enable-new-dtags -L/usr/lib/openmpi -lmpi_cxx -lmpi"
+S["MPI_CFLAGS"]="-pthread"
+S["ZLIB_LIBS"]="-lz"
+S["ZLIB_CFLAGS"]=""
+S["OSGEARTH_LIBS"]="-losgEarth -losgEarthUtil"
+S["OSGEARTH_CFLAGS"]=""
+S["OSG_LIBS"]="-losg -losgDB -losgGA -losgViewer -losgUtil -lOpenThreads"
+S["OSG_CFLAGS"]=""
+S["QTENV_LDFLAGS"]="-Wl,-rpath-link=/usr/lib"
+S["QT_LIBS"]="-lQt5Gui -lQt5Core -lQt5Widgets -lQt5PrintSupport -lQt5OpenGL -L/usr/lib -Wl,-rpath=/usr/lib"
+S["QT_CFLAGS"]="-isystem /usr/include/qt -isystem /usr/include/qt/QtCore -isystem /usr/include/qt/QtGui -isystem /usr/include/qt/QtWidgets -isystem /usr/include/qt/"\
+"QtOpenGL -isystem /usr/include/qt/QtPrintSupport"
+S["TK_LIBS"]="-ltk8.6 -ltcl8.6"
+S["TK_CFLAGS"]=""
+S["HAVE_DLOPEN"]="1"
+S["LIB_PREFIX"]="lib"
+S["EXE_SUFFIX"]=""
+S["DLL_LIB_SUFFIX"]=".dll"
+S["SO_LIB_SUFFIX"]=".so"
+S["JNI_LIB_SUFFIX"]="$(SO_LIB_SUFFIX)"
+S["SHARED_LIB_SUFFIX"]="$(SO_LIB_SUFFIX)"
+S["A_LIB_SUFFIX"]=".a"
+S["SHARED_LIBS"]="yes"
+S["SHLIB_POSTPROCESS"]="opp_shlib_postprocess"
+S["MKPATH"]="mkdir -p"
+S["LN"]="ln -sf"
+S["MAKEDEPEND"]="opp_makedep -Y --objdirtree"
+S["STRIP"]="strip"
+S["DLLTOOL"]="dlltool"
+S["SHLIB_LD"]="clang++ -shared -fPIC"
+S["ARFLAG_OUT"]=""
+S["AR"]="ar cr"
+S["AS"]="as"
+S["NEDTOOL"]="nedtool"
+S["SMC"]="opp_smc"
+S["MSGC"]="opp_msgc"
+S["TOOLCHAIN_NAME"]="clang"
+S["PIC_FLAGS"]="-fPIC"
+S["AS_NEEDED_OFF"]="-Wl,--no-as-needed"
+S["AS_NEEDED_ON"]="-Wl,--as-needed"
+S["WHOLE_ARCHIVE_OFF"]="-Wl,--no-whole-archive"
+S["WHOLE_ARCHIVE_ON"]="-Wl,--whole-archive"
+S["LDFLAG_IMPLIB"]="-Wl,--out-implib,"
+S["LDFLAG_LIB"]="-l"
+S["LDFLAG_INCLUDE"]="-Wl,-u,"
+S["LDFLAG_LIBPATH"]="-L"
+S["DEFINES"]=" -DHAVE_SWAPCONTEXT -DWITH_MPI"
+S["CFLAGS_RELEASE"]=" -O2 -DNDEBUG=1"
+S["CFLAGS_DEBUG"]=" -g -Wall"
+S["OMNETPP_EDITION"]="Academic Public License -- NOT FOR COMMERCIAL USE"
+S["OMNETPP_BUILDID"]="170331-7c4e366"
+S["OMNETPP_VERSION"]="5.1"
+S["OMNETPP_RELEASE"]="omnetpp-5.1"
+S["OMNETPP_PRODUCT"]="OMNeT++"
+S["MPICXX"]=""
+S["MPICPP"]="mpic++"
+S["PRIVATE_JRE"]=""
+S["JRE"]="java"
+S["WISH"]="wish"
+S["CXXCPP"]=""
+S["XMKMF"]=""
+S["RCC"]="/usr/bin/rcc"
+S["UIC"]="/usr/bin/uic"
+S["MOC"]="/usr/bin/moc"
+S["QMAKE"]="/usr/bin/qmake"
+S["SWIG"]="swig"
+S["PERL"]="perl"
+S["MAKE"]="make"
+S["LEXLIB"]=""
+S["LEX_OUTPUT_ROOT"]="lex.yy"
+S["LEX"]="flex"
+S["YFLAGS"]=""
+S["YACC"]="bison -y"
+S["RANLIB"]="ranlib"
+S["tmp_CXX"]="clang++"
+S["ac_ct_CXX"]="clang++"
+S["CXXFLAGS"]=" -std=c++11"
+S["CXX"]="clang++"
+S["OBJEXT"]="o"
+S["EXEEXT"]=""
+S["ac_ct_CC"]="clang"
+S["CPPFLAGS"]=""
+S["LDFLAGS"]=" -Wl,-rpath,$(OMNETPP_LIB_DIR) -Wl,-rpath,$(OMNETPP_TOOLS_DIR)/lib -Wl,-rpath,.  -Wl,--export-dynamic $(LDFLAG_LIBPATH)$(OMNETPP_LIB_DIR)"
+S["CFLAGS"]=" -MMD -MP -MF $(basename $@).d  -fPIC  -Wno-deprecated-register -Wno-unused-function -fno-stack-protector $(DEFINES)"
+S["CC"]="clang"
+S["host_os"]="linux-gnu"
+S["host_vendor"]="unknown"
+S["host_cpu"]="x86_64"
+S["host"]="x86_64-unknown-linux-gnu"
+S["build_os"]="linux-gnu"
+S["build_vendor"]="unknown"
+S["build_cpu"]="x86_64"
+S["build"]="x86_64-unknown-linux-gnu"
+S["target_alias"]=""
+S["host_alias"]=""
+S["build_alias"]=""
+S["LIBS"]=""
+S["ECHO_T"]=""
+S["ECHO_N"]="-n"
+S["ECHO_C"]=""
+S["DEFS"]="-DPACKAGE_NAME=\\\"\\\" -DPACKAGE_TARNAME=\\\"\\\" -DPACKAGE_VERSION=\\\"\\\" -DPACKAGE_STRING=\\\"\\\" -DPACKAGE_BUGREPORT=\\\"\\\" -DPACKAGE_URL=\\\"\\\" -DHAVE_SWAPCONTE"\
+"XT=1"
+S["mandir"]="${datarootdir}/man"
+S["localedir"]="${datarootdir}/locale"
+S["libdir"]="${exec_prefix}/lib"
+S["psdir"]="${docdir}"
+S["pdfdir"]="${docdir}"
+S["dvidir"]="${docdir}"
+S["htmldir"]="${docdir}"
+S["infodir"]="${datarootdir}/info"
+S["docdir"]="${datarootdir}/doc/${PACKAGE}"
+S["oldincludedir"]="/usr/include"
+S["includedir"]="${prefix}/include"
+S["runstatedir"]="${localstatedir}/run"
+S["localstatedir"]="${prefix}/var"
+S["sharedstatedir"]="${prefix}/com"
+S["sysconfdir"]="${prefix}/etc"
+S["datadir"]="${datarootdir}"
+S["datarootdir"]="${prefix}/share"
+S["libexecdir"]="${exec_prefix}/libexec"
+S["sbindir"]="${exec_prefix}/sbin"
+S["bindir"]="${exec_prefix}/bin"
+S["program_transform_name"]="s,x,x,"
+S["prefix"]="/opt"
+S["exec_prefix"]="${prefix}"
+S["PACKAGE_URL"]=""
+S["PACKAGE_BUGREPORT"]=""
+S["PACKAGE_STRING"]=""
+S["PACKAGE_VERSION"]=""
+S["PACKAGE_TARNAME"]=""
+S["PACKAGE_NAME"]=""
+S["PATH_SEPARATOR"]=":"
+S["SHELL"]="/bin/sh"
+_ACAWK
+cat >>"$ac_tmp/subs1.awk" <<_ACAWK &&
+  for (key in S) S_is_set[key] = 1
+  FS = ""
+
+}
+{
+  line = $ 0
+  nfields = split(line, field, "@")
+  substed = 0
+  len = length(field[1])
+  for (i = 2; i < nfields; i++) {
+    key = field[i]
+    keylen = length(key)
+    if (S_is_set[key]) {
+      value = S[key]
+      line = substr(line, 1, len) "" value "" substr(line, len + keylen + 3)
+      len += length(value) + length(field[++i])
+      substed = 1
+    } else
+      len += 1 + keylen
+  }
+
+  print line
+}
+
+_ACAWK
+if sed "s/$ac_cr//" < /dev/null > /dev/null 2>&1; then
+  sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
+else
+  cat
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
+  || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
+fi # test -n "$CONFIG_FILES"
+
+
+eval set X "  :F $CONFIG_FILES      "
+shift
+for ac_tag
+do
+  case $ac_tag in
+  :[FHLC]) ac_mode=$ac_tag; continue;;
+  esac
+  case $ac_mode$ac_tag in
+  :[FHL]*:*);;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
+  :[FH]-) ac_tag=-:-;;
+  :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
+  esac
+  ac_save_IFS=$IFS
+  IFS=:
+  set x $ac_tag
+  IFS=$ac_save_IFS
+  shift
+  ac_file=$1
+  shift
+
+  case $ac_mode in
+  :L) ac_source=$1;;
+  :[FH])
+    ac_file_inputs=
+    for ac_f
+    do
+      case $ac_f in
+      -) ac_f="$ac_tmp/stdin";;
+      *) # Look for the file first in the build tree, then in the source tree
+	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
+	 # because $ac_f cannot contain `:'.
+	 test -f "$ac_f" ||
+	   case $ac_f in
+	   [\\/$]*) false;;
+	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
+	   esac ||
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
+      esac
+      case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
+      as_fn_append ac_file_inputs " '$ac_f'"
+    done
+
+    # Let's still pretend it is `configure' which instantiates (i.e., don't
+    # use $as_me), people would be surprised to read:
+    #    /* config.h.  Generated by config.status.  */
+    configure_input='Generated from '`
+	  $as_echo "$*" | sed 's|^[^:]*/||;s|:[^:]*/|, |g'
+	`' by configure.'
+    if test x"$ac_file" != x-; then
+      configure_input="$ac_file.  $configure_input"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: creating $ac_file" >&5
+$as_echo "$as_me: creating $ac_file" >&6;}
+    fi
+    # Neutralize special characters interpreted by sed in replacement strings.
+    case $configure_input in #(
+    *\&* | *\|* | *\\* )
+       ac_sed_conf_input=`$as_echo "$configure_input" |
+       sed 's/[\\\\&|]/\\\\&/g'`;; #(
+    *) ac_sed_conf_input=$configure_input;;
+    esac
+
+    case $ac_tag in
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
+    esac
+    ;;
+  esac
+
+  ac_dir=`$as_dirname -- "$ac_file" ||
+$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+	 X"$ac_file" : 'X\(//\)[^/]' \| \
+	 X"$ac_file" : 'X\(//\)$' \| \
+	 X"$ac_file" : 'X\(/\)' \| . 2>/dev/null ||
+$as_echo X"$ac_file" |
+    sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)[^/].*/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\/\)$/{
+	    s//\1/
+	    q
+	  }
+	  /^X\(\/\).*/{
+	    s//\1/
+	    q
+	  }
+	  s/.*/./; q'`
+  as_dir="$ac_dir"; as_fn_mkdir_p
+  ac_builddir=.
+
+case "$ac_dir" in
+.) ac_dir_suffix= ac_top_builddir_sub=. ac_top_build_prefix= ;;
+*)
+  ac_dir_suffix=/`$as_echo "$ac_dir" | sed 's|^\.[\\/]||'`
+  # A ".." for each directory in $ac_dir_suffix.
+  ac_top_builddir_sub=`$as_echo "$ac_dir_suffix" | sed 's|/[^\\/]*|/..|g;s|/||'`
+  case $ac_top_builddir_sub in
+  "") ac_top_builddir_sub=. ac_top_build_prefix= ;;
+  *)  ac_top_build_prefix=$ac_top_builddir_sub/ ;;
+  esac ;;
+esac
+ac_abs_top_builddir=$ac_pwd
+ac_abs_builddir=$ac_pwd$ac_dir_suffix
+# for backward compatibility:
+ac_top_builddir=$ac_top_build_prefix
+
+case $srcdir in
+  .)  # We are building in place.
+    ac_srcdir=.
+    ac_top_srcdir=$ac_top_builddir_sub
+    ac_abs_top_srcdir=$ac_pwd ;;
+  [\\/]* | ?:[\\/]* )  # Absolute name.
+    ac_srcdir=$srcdir$ac_dir_suffix;
+    ac_top_srcdir=$srcdir
+    ac_abs_top_srcdir=$srcdir ;;
+  *) # Relative name.
+    ac_srcdir=$ac_top_build_prefix$srcdir$ac_dir_suffix
+    ac_top_srcdir=$ac_top_build_prefix$srcdir
+    ac_abs_top_srcdir=$ac_pwd/$srcdir ;;
+esac
+ac_abs_srcdir=$ac_abs_top_srcdir$ac_dir_suffix
+
+
+  case $ac_mode in
+  :F)
+  #
+  # CONFIG_FILE
+  #
+
+# If the template does not know about datarootdir, expand it.
+# FIXME: This hack should be removed a few years after 2.60.
+ac_datarootdir_hack=; ac_datarootdir_seen=
+ac_sed_dataroot='
+/datarootdir/ {
+  p
+  q
+}
+/@datadir@/p
+/@docdir@/p
+/@infodir@/p
+/@localedir@/p
+/@mandir@/p'
+case `eval "sed -n \"\$ac_sed_dataroot\" $ac_file_inputs"` in
+*datarootdir*) ac_datarootdir_seen=yes;;
+*@datadir@*|*@docdir@*|*@infodir@*|*@localedir@*|*@mandir@*)
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&5
+$as_echo "$as_me: WARNING: $ac_file_inputs seems to ignore the --datarootdir setting" >&2;}
+  ac_datarootdir_hack='
+  s&@datadir@&${datarootdir}&g
+  s&@docdir@&${datarootdir}/doc/${PACKAGE}&g
+  s&@infodir@&${datarootdir}/info&g
+  s&@localedir@&${datarootdir}/locale&g
+  s&@mandir@&${datarootdir}/man&g
+  s&\${datarootdir}&${prefix}/share&g' ;;
+esac
+ac_sed_extra="/^[	 ]*VPATH[	 ]*=[	 ]*/{
+h
+s///
+s/^/:/
+s/[	 ]*$/:/
+s/:\$(srcdir):/:/g
+s/:\${srcdir}:/:/g
+s/:@srcdir@:/:/g
+s/^:*//
+s/:*$//
+x
+s/\(=[	 ]*\).*/\1/
+G
+s/\n//
+s/^[^=]*=[	 ]*$//
+}
+
+:t
+/@[a-zA-Z_][a-zA-Z_0-9]*@/!b
+s|@configure_input@|$ac_sed_conf_input|;t t
+s&@top_builddir@&$ac_top_builddir_sub&;t t
+s&@top_build_prefix@&$ac_top_build_prefix&;t t
+s&@srcdir@&$ac_srcdir&;t t
+s&@abs_srcdir@&$ac_abs_srcdir&;t t
+s&@top_srcdir@&$ac_top_srcdir&;t t
+s&@abs_top_srcdir@&$ac_abs_top_srcdir&;t t
+s&@builddir@&$ac_builddir&;t t
+s&@abs_builddir@&$ac_abs_builddir&;t t
+s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
+$ac_datarootdir_hack
+"
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+
+test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&5
+$as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
+which seems to be undefined.  Please make sure it is defined" >&2;}
+
+  rm -f "$ac_tmp/stdin"
+  case $ac_file in
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
+  esac \
+  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+ ;;
+
+
+
+  esac
+
+done # for ac_tag
+
+
+as_fn_exit 0
diff --git a/download.sh b/download.sh
index 57c1914d022e..f6fd8ee617ac 100644
--- a/download.sh
+++ b/download.sh
@@ -1,13 +1,13 @@
 wget --header='authority:omnetpp.org' \
 	  --header='method:GET' \
-	  --header='path:/omnetpp/send/30-omnet-releases/2305-omnetpp-50-linux' \
+	  --header='path:/omnetpp/send/30-omnet-releases/2309-omnetpp-5-1-linux' \
 	  --header='scheme:https' \
 	  --header='accept:text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,*/*;q=0.8' \
 	  --header='accept-encoding:gzip, deflate, sdch, br' \
 	  --header='accept-language:en-US,en;q=0.8,pt-PT;q=0.6,pt;q=0.4,en-GB;q=0.2' \
-	  --header='cookie:__cfduid=d1bb9abc9c4001de43c1a8743bb9ea65e1478628669; imstime=1478628796; fcb7e5dfc3182a73cb86f768253d1ad1=it577vfrhi4a3gl2bj1rgkrms1' \
+	  --header='cookie:__cfduid=d50836abc713caa68412f2569f4306ef41490692140; fcb7e5dfc3182a73cb86f768253d1ad1=eqim9j7u991od77bhhdhou9v30' \
 	  --header='referer:https://omnetpp.org/omnetpp' \
 	  --header='upgrade-insecure-requests:1' \
-	  --header='user-agent:Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/56.0.2922.1 Safari/537.36' \
-	  https://omnetpp.org/omnetpp/send/30-omnet-releases/2305-omnetpp-50-linux \
-	  -O omnetpp-5.0-src.tgz
+	  --header='user-agent:Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/59.0.3071.15 Safari/537.36' \
+	  https://omnetpp.org/omnetpp/send/30-omnet-releases/2309-omnetpp-5-1-linux \
+	  -O omnetpp-5.1-src-linux.tgz
diff --git a/qtenv.pri b/qtenv.pri
new file mode 100644
index 000000000000..8a0e431c2bc7
--- /dev/null
+++ b/qtenv.pri
@@ -0,0 +1,16 @@
+# qtenv.pri is automatically generated from qtenv.pri.in by the
+# configure script, so any manual modifications will be lost.
+
+# This file serves no real purpose for the build itself, just
+# tells Qt Creator the relevant defines, so it can highlight
+# and index the code accordingly during development.
+
+WITH_OSG = yes
+equals(WITH_OSG, yes) {
+  DEFINES += WITH_OSG
+}
+
+WITH_OSGEARTH = yes
+equals(WITH_OSGEARTH, yes) {
+  DEFINES += WITH_OSGEARTH
+}