From: prascle Date: Wed, 10 Nov 2004 19:07:48 +0000 (+0000) Subject: PR: portage CCRT - ajustements sur RedHat8: minimisation ecart du au portage sur... X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=refs%2Fheads%2FBR_CCRT;p=modules%2Fkernel.git PR: portage CCRT - ajustements sur RedHat8: minimisation ecart du au portage sur makefiles generes --- diff --git a/configure.in.base b/configure.in.base index e0760a01e..880355a61 100644 --- a/configure.in.base +++ b/configure.in.base @@ -72,6 +72,9 @@ AC_PROG_INSTALL dnl dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques ! +AC_ENABLE_DEBUG(yes) +AC_DISABLE_PRODUCTION + echo --------------------------------------------- echo testing libtool echo --------------------------------------------- @@ -107,9 +110,6 @@ AC_DEPEND_FLAG # AC_CC_WARNINGS([ansi]) cc_ok=yes -AC_ENABLE_DEBUG(yes) -AC_DISABLE_PRODUCTION - dnl Library libdl : AC_CHECK_LIB(dl,dlopen) diff --git a/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 b/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 index 5dd873fd2..9e3d4ecc9 100644 --- a/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 +++ b/salome_adm/unix/config_files/ac_cxx_depend_flag.m4 @@ -42,7 +42,7 @@ dnl sur CCRT/osf pas d'equivalent de l'option -MG de gcc avec compilo natif dnl on utilise donc gnu pour generer les dependances. DEPCC=gcc DEPCXX=g++ - DEPCXXFLAGS="-Wno-deprecated -funsigned-char" + DEPCXXFLAGS="-Wno-deprecated" DIFFFLAGS="-w" ;; *) diff --git a/salome_adm/unix/config_files/check_cas.m4 b/salome_adm/unix/config_files/check_cas.m4 index eed46982c..3b3f654f9 100644 --- a/salome_adm/unix/config_files/check_cas.m4 +++ b/salome_adm/unix/config_files/check_cas.m4 @@ -104,7 +104,7 @@ if test "x$occ_ok" = "xyes"; then dnl test c++ compiler flag for unsigned character for opt in -funsigned-char -unsigned ; do - AC_CXX_OPTION($opt,CXXFLAGS,flag=yes,flag=no) + AC_CXX_OPTION($opt,CAS_CXXFLAGS,flag=yes,flag=no) if test "$flag" = "yes"; then break fi @@ -147,6 +147,8 @@ dnl cascade headers fi +AC_SUBST(OWN_CONFIG_H) + if test "x$occ_ok" = xyes ; then AC_MSG_CHECKING(for OpenCascade libraries) diff --git a/salome_adm/unix/make_commence.in b/salome_adm/unix/make_commence.in index e294c2f1c..cabebbd71 100644 --- a/salome_adm/unix/make_commence.in +++ b/salome_adm/unix/make_commence.in @@ -16,7 +16,7 @@ LDFLAGS=@LDFLAGS@ -L$(top_builddir)/lib/salome # add libstdc++ to link c++ library with libtool ! LDFLAGS+= @STDLIB@ -CP=@CP@ +#CP=@CP@ # CPP @@ -48,9 +48,9 @@ OPENPBS_LIBS = @OPENPBS_LIBS@ # JAVA -JAVA_INCLUDES = @JAVA_INCLUDES@ -JAVA_LIBS = @JAVA_LIBS@ -JAVA_LDPATH = @JAVA_LDPATH@ +#JAVA_INCLUDES = @JAVA_INCLUDES@ +#JAVA_LIBS = @JAVA_LIBS@ +#JAVA_LDPATH = @JAVA_LDPATH@ # PYTHON @@ -186,8 +186,8 @@ LIBS+=$(CORBA_LIBS) DOXYGEN = @DOXYGEN@ ## Shared libraries -LT_STATIC_EXEC=@LT_STATIC_EXEC@ -DYNAMIC_DIRS=@DYNAMIC_DIRS@ +#LT_STATIC_EXEC=@LT_STATIC_EXEC@ +#DYNAMIC_DIRS=@DYNAMIC_DIRS@ LT_LIB=libtool LT=$(top_builddir)/libtool LT_COMPILE=$(LT) --mode=compile $(CC)