From: nri <nri@opencascade.com>
Date: Wed, 28 May 2003 16:22:04 +0000 (+0000)
Subject: NRI : Restore SALOMEconfig.h instead of GEOMconfig.h.
X-Git-Tag: V1_1_1~2
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=219f4144042d2ae7f35c8e1fba3d40fb2b0a934a;p=modules%2Fgeom.git

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

diff --git a/Makefile.in b/Makefile.in
index 2d2939c1b..e6d9a7669 100644
--- 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
index 0bf652556..000000000
--- 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 605392aca..41d838aa3 100755
--- 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