NRI : Restore SALOMEconfig.h instead of GEOMconfig.h.

diff --git a/Makefile.in b/Makefile.in
index 2d2939c1babd8dee4466b571cf2de35aac30358d..e6d9a7669ec6b88a455c6aa42110431396b8e837 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -128,14 +128,14 @@ VERSION
 
 # copy header files in common directory
 ifeq ($(HAVE_SSTREAM),yes)
-  include_list=include/salome/GEOMconfig.h
+  include_list=include/salome/SALOMEconfig.h
 else
-  include_list=include/salome/GEOMconfig.h include/salome/sstream
+  include_list=include/salome/SALOMEconfig.h include/salome/sstream
 endif
 
 inc: idl $(include_list)
 
-include/salome/GEOMconfig.h: adm_local/unix/GEOMconfig.h
+include/salome/SALOMEconfig.h: salome_adm/unix/SALOMEconfig.h
        -$(RM) $@
        $(LN_S) ../../$< $@
 

diff --git a/adm_local/unix/GEOMconfig.h.in b/adm_local/unix/GEOMconfig.h.in
deleted file mode 100644 (file)
index 0bf6525..0000000
--- a/adm_local/unix/GEOMconfig.h.in
+++ /dev/null
@@ -1,6 +0,0 @@
-#define DEBUG
-
-#define QUOTE(x)  #x
-#define CORBA_CLIENT_HEADER(x)  QUOTE(x@IDL_CLN_H@)
-#define CORBA_SERVER_HEADER(x)  QUOTE(x@IDL_SRV_H@)
-

diff --git a/build_configure b/build_configure
index 605392acaf33c48b37d0f5c3f01cf6d8103d3aa4..41d838aa368ec834b5c22887167e12aea7f75bf7 100755 (executable)
--- a/build_configure
+++ b/build_configure
@@ -120,7 +120,7 @@ echo "AC_OUTPUT([ \\" >> configure.in_tmp1
 # put them "manually"
 #
 
-echo " ./adm_local/unix/GEOMconfig.h \\" >> configure.in_tmp1
+echo " ./salome_adm/unix/SALOMEconfig.h \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/F77config.h \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/sstream \\" >> configure.in_tmp1
 echo " ./salome_adm/unix/depend \\" >> configure.in_tmp1