X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=0e968cd822ee54cafb3aed69bda513dad8c9776f;hb=2ee0a93e8763dd6aef0545ca35d5f2a6f9e52e82;hp=daf43a42d13cb3312c0b8972abf38085c1f9efdf;hpb=8871ad59a020f1ba13a0aa625e17ad855d42c866;p=samples%2Fgenericsolver.git

diff --git a/configure.ac b/configure.ac
index daf43a4..0e968cd 100644
--- 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) 2009-2012 EDF R&D
 #
 #  This library is free software; you can redistribute it and/or
 #  modify it under the terms of the GNU Lesser General Public
@@ -19,17 +16,11 @@
 #
 #  See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-#  PLEASE DO NOT MODIFY configure.in FILE
-#  ALL CHANGES WILL BE DISCARDED BY THE NEXT
-#  build_configure COMMAND
-#  CHANGES MUST BE MADE IN configure.in.base FILE
-# Author : Marc Tajchman (CEA)
-# Date : 28/06/2001
-# Modified by : Patrick GOLDBRONN (CEA)
-# Modified by : Marc Tajchman (CEA)
-# Created from configure.in.base
+# $Id$
 #
-AC_INIT([Salome2 Project GENERICSOLVER module], [5.1.3], [webmaster.salome@opencascade.com], [SalomeGENERICSOLVER])
+
+AC_PREREQ(2.50)
+AC_INIT([Salome GENERICSOLVER module],[6.6.0],[webmaster.salome@opencascade.com],[SalomeGENERICSOLVER])
 AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
@@ -64,15 +55,6 @@ echo
 AC_CHECK_PROG(SHELL,sh)
 AC_SUBST(SHELL)
 
-if test -z "$AR"; then
-   AC_CHECK_PROGS(AR,ar xar,:,$PATH)
-fi
-AC_SUBST(AR)
-
-dnl Export the AR macro so that it will be placed in the libtool file
-dnl correctly.
-export AR
-
 echo
 echo ---------------------------------------------
 echo testing make
@@ -81,23 +63,10 @@ echo
 
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
-dnl 
-dnl libtool macro check for CC, LD, NM, LN_S, RANLIB, STRIP + for shared libraries
 
 AC_ENABLE_DEBUG(yes)
 AC_DISABLE_PRODUCTION
 
-echo ---------------------------------------------
-echo testing libtool
-echo ---------------------------------------------
-
-dnl first, we set static to no!
-dnl if we want it, use --enable-static
-AC_ENABLE_STATIC(no)
-
-AC_LIBTOOL_DLOPEN
-AC_PROG_LIBTOOL
-
 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
@@ -207,28 +176,22 @@ echo generating Makefiles and configure files
 echo ---------------------------------------------
 echo
 
-AC_OUTPUT_COMMANDS([ \
-      chmod +x ./bin/*; \
-])
-
 # This list is initiated using autoscan and must be updated manually
 # when adding a new file <filename>.in to manage. When you execute
 # autoscan, the Makefile list is generated in the output file configure.scan.
-# This could be helpfull to update de configuration.
-AC_OUTPUT([ \
+# This could be helpful to update de configuration.
+AC_CONFIG_FILES([ \
   salome_adm/unix/SALOMEconfig.h \
   adm_local/Makefile \
   adm_local/unix/Makefile \
   adm_local/unix/config_files/Makefile \
-  bin/VERSION \
-  bin/runAppli \
-  bin/Makefile \
-  doc/Makefile \
   src/Makefile \
   src/GENERICSOLVER/Makefile \
   src/GENERICSOLVERGUI/Makefile \
   resources/Makefile \
   resources/GENERICSOLVERCatalog.xml \
+  resources/SalomeApp.xml \
   idl/Makefile \
   Makefile \
 ])
+AC_OUTPUT