diff --git a/configure.ac b/configure.ac
index af9313f9d..15d84b478 100644
--- a/configure.ac
+++ b/configure.ac
@@ -467,6 +467,7 @@ AC_OUTPUT([ \
src/VTKExport/Makefile \
resources/Makefile \
resources/GEOMCatalog.xml \
+ resources/SalomeApp.xml \
idl/Makefile \
Makefile \
])
diff --git a/resources/Makefile.am b/resources/Makefile.am
index 957f96fa5..a5711e810 100644
--- a/resources/Makefile.am
+++ b/resources/Makefile.am
@@ -28,7 +28,7 @@ dist_salomeres_DATA = \
GEOM_en.xml \
GEOM_fr.xml \
GEOM.config \
-SalomeApp.xml \
+$(top_builddir)/resources/SalomeApp.xml \
Plugin \
GEOMDS_Resources \
ImportExport \
diff --git a/resources/SalomeApp.xml b/resources/SalomeApp.xml.in
similarity index 98%
rename from resources/SalomeApp.xml
rename to resources/SalomeApp.xml.in
index 63843ab07..ee739d075 100644
--- a/resources/SalomeApp.xml
+++ b/resources/SalomeApp.xml.in
@@ -27,6 +27,7 @@
+
diff --git a/src/GEOMGUI/GeometryGUI.cxx b/src/GEOMGUI/GeometryGUI.cxx
index 969ce28d3..033704512 100644
--- a/src/GEOMGUI/GeometryGUI.cxx
+++ b/src/GEOMGUI/GeometryGUI.cxx
@@ -98,12 +98,19 @@
#include
#include
+#include
+
+
#include "GEOMImpl_Types.hxx"
extern "C" {
Standard_EXPORT CAM_Module* createModule() {
return new GeometryGUI();
}
+
+ Standard_EXPORT char* getModuleVersion() {
+ return GEOM_VERSION_STR;
+ }
}
GeometryGUI::StudyTextureMap GeometryGUI::myTextureMap;
diff --git a/src/GEOMGUI/Makefile.am b/src/GEOMGUI/Makefile.am
index a35b6f06a..d65f42496 100644
--- a/src/GEOMGUI/Makefile.am
+++ b/src/GEOMGUI/Makefile.am
@@ -75,7 +75,8 @@ libGEOM_la_CPPFLAGS = \
-I$(srcdir)/../GEOMFiltersSelection \
-I$(srcdir)/../GEOMClient \
-I$(srcdir)/../GEOMImpl \
- -I$(top_builddir)/idl
+ -I$(top_builddir)/idl \
+ -I$(top_builddir)
libGEOM_la_LDFLAGS = \
$(PYTHON_LIBS) \