diff --git a/configure b/configure
index 13738ed59749718836a0547bd37fd7166d0f9c31..5a21f9c9413e0fc6a271272d9a47ea5ddd3fecc7 100755
--- a/configure
+++ b/configure
@@ -918,7 +918,7 @@ SHELL'
 ac_subst_files=''
 ac_user_opts='
 enable_option_checking
-enable_automatic_flags
+enable_auto_flags
 enable_icc
 enable_dependency_tracking
 enable_static
@@ -936,6 +936,7 @@ with_fftw_incdir
 with_xsl_url
 enable_threads
 enable_gprof
+enable_best_link
 '
       ac_precious_vars='build_alias
 host_alias
@@ -1582,8 +1583,7 @@ Optional Features:
   --disable-option-checking  ignore unrecognized --enable/--with options
   --disable-FEATURE       do not include FEATURE (same as --enable-FEATURE=no)
   --enable-FEATURE[=ARG]  include FEATURE [ARG=yes]
-  --enable-automatic-flags
-                          Let the configure script choose the compilation
+  --enable-auto-flags     Let the configure script choose the compilation
                           flags (off by default)
   --enable-icc            Enable special mode for compilation with the Intel
                           compiler (off by default)
@@ -1600,7 +1600,9 @@ Optional Features:
                           default)
   --enable-gprof          Enable special mode for compilation with the gprof
                           profiler (off by default)
-  --enable-static         Enable static linking (off by default)
+  --enable-best-link      Choose the right combination of static and dynamic
+                          linking to make the executable as portable as
+                          possible (off by default)
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -2616,9 +2618,9 @@ cclist="cc gcc"
 # Provide special option for choosing automatically the compilation flags.
 { $as_echo "$as_me:$LINENO: checking if compilation flags are set automatically" >&5
 $as_echo_n "checking if compilation flags are set automatically... " >&6; }
-# Check whether --enable-automatic-flags was given.
-if test "${enable_automatic_flags+set}" = set; then
-  enableval=$enable_automatic_flags; use_autoflag="yes"
+# Check whether --enable-auto-flags was given.
+if test "${enable_auto_flags+set}" = set; then
+  enableval=$enable_auto_flags; use_autoflag="yes"
 	{ $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
@@ -5320,7 +5322,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 5323 "configure"' > conftest.$ac_ext
+  echo '#line 5325 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -8095,11 +8097,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8098: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8100: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8102: \$? = $ac_status" >&5
+   echo "$as_me:8104: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8385,11 +8387,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8388: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8390: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8392: \$? = $ac_status" >&5
+   echo "$as_me:8394: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -8489,11 +8491,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8492: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:8494: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:8496: \$? = $ac_status" >&5
+   echo "$as_me:8498: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -10876,7 +10878,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10879 "configure"
+#line 10881 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -10976,7 +10978,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 10979 "configure"
+#line 10981 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13404,11 +13406,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13407: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13409: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13411: \$? = $ac_status" >&5
+   echo "$as_me:13413: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -13508,11 +13510,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13511: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:13513: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13515: \$? = $ac_status" >&5
+   echo "$as_me:13517: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -15072,11 +15074,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15075: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15077: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:15079: \$? = $ac_status" >&5
+   echo "$as_me:15081: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -15176,11 +15178,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:15179: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15181: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:15183: \$? = $ac_status" >&5
+   echo "$as_me:15185: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17373,11 +17375,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17376: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17378: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17380: \$? = $ac_status" >&5
+   echo "$as_me:17382: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17663,11 +17665,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17666: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17668: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:17670: \$? = $ac_status" >&5
+   echo "$as_me:17672: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
@@ -17767,11 +17769,11 @@ else
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:17770: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:17772: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:17774: \$? = $ac_status" >&5
+   echo "$as_me:17776: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -22993,16 +22995,16 @@ $as_echo "no" >&6; }
 fi
 
 
-# Enable static linking
-{ $as_echo "$as_me:$LINENO: checking static linking" >&5
-$as_echo_n "checking static linking... " >&6; }
-# Check whether --enable-static was given.
-if test "${enable_static+set}" = set; then
-  enableval=$enable_static; use_static="yes"
+# Enable linking options for making the executable as portable as possible.
+{ $as_echo "$as_me:$LINENO: checking best linking option" >&5
+$as_echo_n "checking best linking option... " >&6; }
+# Check whether --enable-best-link was given.
+if test "${enable_best_link+set}" = set; then
+  enableval=$enable_best_link; use_best="yes"
 	{ $as_echo "$as_me:$LINENO: result: yes" >&5
 $as_echo "yes" >&6; }
 else
-  use_static="no"
+  use_best="no"
 	{ $as_echo "$as_me:$LINENO: result: no" >&5
 $as_echo "no" >&6; }
 fi
@@ -27737,12 +27739,12 @@ if test "$use_gprof" = "yes"; then
   else
     AM_CFLAGS="$AM_CFLAGS -pg"
   fi
-  use_static="no"
+  use_best="no"
 fi
 
-# Static linking option
-if test "$use_static" = "yes"; then
-  AM_LDFLAGS="-static -shared-libgcc $AM_LDFLAGS"
+# "Best" linking option
+if test "$use_best" = "yes"; then
+  AM_LDFLAGS="-static -shared-libgcc -static-libtool-libs $AM_LDFLAGS"
 fi
 
 
diff --git a/configure.ac b/configure.ac
index 9f41f6944631d714de1acb26aa6f84939b062de2..eb0533036f0b156f531c1f6780a9b815a791b7dc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -34,8 +34,8 @@ cclist="cc gcc"
 
 # Provide special option for choosing automatically the compilation flags.
 AC_MSG_CHECKING([if compilation flags are set automatically])
-AC_ARG_ENABLE(automatic-flags,
-	[AC_HELP_STRING([--enable-automatic-flags],
+AC_ARG_ENABLE(auto-flags,
+	[AC_HELP_STRING([--enable-auto-flags],
 	[Let the configure script choose the compilation flags \
 (off by default)])],
         use_autoflag="yes"
@@ -172,15 +172,15 @@ AC_ARG_ENABLE(gprof,
         use_gprof="no"
 	AC_MSG_RESULT([no]))
 
-# Enable static linking
-AC_MSG_CHECKING([static linking])
-AC_ARG_ENABLE(static,
-	[AC_HELP_STRING([--enable-static],
-	[Enable static linking \
-(off by default)])],
-        use_static="yes"
+# Enable linking options for making the executable as portable as possible.
+AC_MSG_CHECKING([best linking option])
+AC_ARG_ENABLE(best-link,
+	[AC_HELP_STRING([--enable-best-link],
+	[Choose the right combination of static and dynamic linking to make \
+the executable as portable as possible (off by default)])],
+        use_best="yes"
 	AC_MSG_RESULT([yes]),
-        use_static="no"
+        use_best="no"
 	AC_MSG_RESULT([no]))
 
 ################# Actions to complete in case of multhreading ################
@@ -228,12 +228,12 @@ if test "$use_gprof" = "yes"; then
   else
     AM_CFLAGS="$AM_CFLAGS -pg"
   fi
-  use_static="no"
+  use_best="no"
 fi
 
-# Static linking option
-if test "$use_static" = "yes"; then
-  AM_LDFLAGS="-static -shared-libgcc $AM_LDFLAGS"
+# "Best" linking option
+if test "$use_best" = "yes"; then
+  AM_LDFLAGS="-static -shared-libgcc -static-libtool-libs $AM_LDFLAGS"
 fi
 
 AC_SUBST(AM_CFLAGS)