Porting to Python 2.6 - add coding page specification for Python scripts

[modules/smesh.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 912e8c20af8314b3f212c3c03e12785d42026b19..b6553b70482f5c3f8de3e1b461563873cc112502 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -27,7 +27,7 @@
 # Created from configure.in.base
 #
 AC_INIT([Salome2 Project SMESH module], [5.1.2], [webmaster.salome@opencascade.com], [SalomeSMESH])
-AC_CONFIG_AUX_DIR(salome_adm/unix/config_files)
+AC_CONFIG_AUX_DIR(adm_local/unix/config_files)
 AC_CANONICAL_HOST
 AC_CANONICAL_TARGET
 AM_INIT_AUTOMAKE([-Wno-portability])
@@ -81,12 +81,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 +108,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 +434,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 \