Hack libtool (!) to workaround problem with wrong linkage of native libraries

[modules/smesh.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 184a15510e1b23f76a95b4f1ba298277d858f5d1..79ed304e2b028d6129ad30a346c3b9cfc6876f2f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,4 @@
-#  Copyright (C) 2007-2008  CEA/DEN, EDF R&D, OPEN CASCADE
-#
-#  Copyright (C) 2003-2007  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
-#  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS
+#  Copyright (C) 2007-2010  CEA/DEN, EDF R&D, OPEN CASCADE
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,6 +16,7 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
+
 # Author : Marc Tajchman (CEA)
 # Date : 28/06/2001
 # Modified by : Patrick GOLDBRONN (CEA)
@@ -26,8 +24,8 @@
 # Modified by : Alexander BORODIN (OCN) - autotools usage
 # Created from configure.in.base
 #
-AC_INIT([Salome2 Project SMESH module], [5.1.1], [webmaster.salome@opencascade.com], [SalomeSMESH])
-AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
+AC_INIT([Salome2 Project SMESH module], [5.1.4], [webmaster.salome@opencascade.com], [SalomeSMESH])
+AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([-Wno-portability])
@@ -81,12 +79,13 @@ echo
 
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
+AC_LOCAL_INSTALL
 dnl
 dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + pour les librairies dynamiques !
 
 echo
 echo ---------------------------------------------
-echo Coniguring production
+echo Configuring production
 echo ---------------------------------------------
 echo
 AC_ENABLE_DEBUG(yes)
@@ -107,7 +106,7 @@ dnl Fix up the INSTALL macro if it s a relative path. We want the
 dnl full-path to the binary instead.
 case "$INSTALL" in
    *install-sh*)
-      INSTALL='\${ROOT_BUILDDIR}'/salome_adm/unix/config_files/install-sh
+      INSTALL='\${ROOT_BUILDDIR}'/adm_local/unix/config_files/install-sh
       ;;
 esac
 
@@ -433,7 +432,6 @@ echo
 # autoscan, the Makefile list is generated in the output file configure.scan.
 # This could be helpfull to update de configuration.
 AC_OUTPUT([ \
-  salome_adm/unix/SALOMEconfig.h \
   adm_local/Makefile \
   adm_local/cmake_files/Makefile \
   adm_local/unix/Makefile \
@@ -447,8 +445,10 @@ AC_OUTPUT([ \
   doc/salome/gui/SMESH/Makefile \
   doc/salome/gui/SMESH/doxyfile \
   doc/salome/gui/SMESH/doxyfile_py \
+  doc/salome/gui/SMESH/static/header.html \
   doc/salome/tui/Makefile \
   doc/salome/tui/doxyfile \
+  doc/salome/tui/static/header.html \
   src/Makefile \
   src/Controls/Makefile \
   src/Driver/Makefile \
@@ -458,6 +458,7 @@ AC_OUTPUT([ \
   src/DriverUNV/Makefile \
   src/MEFISTO2/Makefile \
   src/OBJECT/Makefile \
+  src/PluginUtils/Makefile \
   src/SMDS/Makefile \
   src/SMESH/Makefile \
   src/SMESHClient/Makefile \
@@ -475,3 +476,5 @@ AC_OUTPUT([ \
   idl/Makefile \
   Makefile
 ])
+
+AC_HACK_LIBTOOL