ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/svn/hopm/trunk/configure
(Generate patch)

Comparing hopm/trunk/configure (file contents):
Revision 5352 by michael, Sun Jan 11 13:26:11 2015 UTC vs.
Revision 5433 by michael, Wed Jan 28 14:14:14 2015 UTC

# Line 644 | Line 644 | LEX
644   YFLAGS
645   YACC
646   CPP
647 + LT_SYS_LIBRARY_PATH
648   OTOOL64
649   OTOOL
650   LIPO
# Line 781 | Line 782 | CFLAGS
782   LDFLAGS
783   LIBS
784   CPPFLAGS
785 + LT_SYS_LIBRARY_PATH
786   CPP
787   YACC
788   YFLAGS'
# Line 1437 | Line 1439 | Some influential environment variables:
1439    LIBS        libraries to pass to the linker, e.g. -l<library>
1440    CPPFLAGS    (Objective) C/C++ preprocessor flags, e.g. -I<include dir> if
1441                you have headers in a nonstandard directory <include dir>
1442 +  LT_SYS_LIBRARY_PATH
1443 +              User-defined run-time library search path.
1444    CPP         C preprocessor
1445    YACC        The `Yet Another Compiler Compiler' implementation to use.
1446                Defaults to the first program found out of: `bison -y', `byacc',
# Line 4000 | Line 4004 | esac
4004  
4005  
4006  
4007 < macro_version='2.4.4'
4008 < macro_revision='2.4.4'
4007 > macro_version='2.4.5'
4008 > macro_revision='2.4.5'
4009  
4010  
4011  
# Line 6424 | Line 6428 | $as_echo "$lt_cv_truncate_bin" >&6; }
6428  
6429  
6430  
6431 +
6432 + # Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
6433 + func_cc_basename ()
6434 + {
6435 +    for cc_temp in $*""; do
6436 +      case $cc_temp in
6437 +        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
6438 +        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
6439 +        \-*) ;;
6440 +        *) break;;
6441 +      esac
6442 +    done
6443 +    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
6444 + }
6445 +
6446   # Check whether --enable-libtool-lock was given.
6447   if test "${enable_libtool_lock+set}" = set; then :
6448    enableval=$enable_libtool_lock;
# Line 7431 | Line 7450 | $as_echo "$lt_cv_ld_force_load" >&6; }
7450      ;;
7451    esac
7452  
7453 + # func_munge_path_list VARIABLE PATH
7454 + # -----------------------------------
7455 + # VARIABLE is name of variable containing _space_ separated list of
7456 + # directories to be munged by the contents of PATH, which is string
7457 + # having a format:
7458 + # "DIR[:DIR]:"
7459 + #       string "DIR[ DIR]" will be prepended to VARIABLE
7460 + # ":DIR[:DIR]"
7461 + #       string "DIR[ DIR]" will be appended to VARIABLE
7462 + # "DIRP[:DIRP]::[DIRA:]DIRA"
7463 + #       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
7464 + #       "DIRA[ DIRA]" will be appended to VARIABLE
7465 + # "DIR[:DIR]"
7466 + #       VARIABLE will be replaced by "DIR[ DIR]"
7467 + func_munge_path_list ()
7468 + {
7469 +    case x$2 in
7470 +    x)
7471 +        ;;
7472 +    *:)
7473 +        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\"
7474 +        ;;
7475 +    x:*)
7476 +        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
7477 +        ;;
7478 +    *::*)
7479 +        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
7480 +        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
7481 +        ;;
7482 +    *)
7483 +        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
7484 +        ;;
7485 +    esac
7486 + }
7487 +
7488   ac_ext=c
7489   ac_cpp='$CPP $CPPFLAGS'
7490   ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
# Line 8018 | Line 8072 | test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
8072   test -z "$LD" && LD=ld
8073   test -z "$ac_objext" && ac_objext=o
8074  
8075 < for cc_temp in $compiler""; do
8076 <  case $cc_temp in
8023 <    compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
8024 <    distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
8025 <    \-*) ;;
8026 <    *) break;;
8027 <  esac
8028 < done
8029 < cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
8075 > func_cc_basename $compiler
8076 > cc_basename=$func_cc_basename_result
8077  
8078  
8079   # Only perform the check for file, if the check method requires it
# Line 10481 | Line 10528 | hardcode_into_libs=no
10528   # flags to be left without arguments
10529   need_version=unknown
10530  
10531 +
10532 +
10533   case $host_os in
10534   aix3*)
10535    version_type=linux # correct to gnu/linux during the next big refactor
# Line 10769 | Line 10818 | freebsd* | dragonfly*)
10818    case $version_type in
10819      freebsd-elf*)
10820        library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
10821 +      soname_spec='$libname$release$shared_ext$major'
10822        need_version=no
10823        need_lib_prefix=no
10824        ;;
# Line 10828 | Line 10878 | hpux9* | hpux10* | hpux11*)
10878      soname_spec='$libname$release$shared_ext$major'
10879      if test 32 = "$HPUX_IA64_MODE"; then
10880        sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
10881 +      sys_lib_dlsearch_path_spec=/usr/lib/hpux32
10882      else
10883        sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
10884 +      sys_lib_dlsearch_path_spec=/usr/lib/hpux64
10885      fi
10834    sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
10886      ;;
10887    hppa*64*)
10888      shrext_cmds='.sl'
# Line 10983 | Line 11034 | fi
11034    # before this can be enabled.
11035    hardcode_into_libs=yes
11036  
11037 <  # Append ld.so.conf contents to the search path
11037 >  # Ideally, we could use ldconfig to report *all* directores which are
11038 >  # searched for libraries, however this is still not possible.  Aside from not
11039 >  # being certain /sbin/ldconfig is available, command
11040 >  # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
11041 >  # even though it is searched at run-time.  Try to do the best guess by
11042 >  # appending ld.so.conf contents (and includes) to the search path.
11043    if test -f /etc/ld.so.conf; then
11044      lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[       ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
11045      sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
# Line 11208 | Line 11264 | fi
11264   if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
11265    sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
11266   fi
11267 +
11268   if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
11269    sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
11270   fi
11271  
11272 + # lt_cv_sys_lib... is unaugmented for libtool script decls...
11273 + lt_cv_sys_lib_dlsearch_path_spec=$sys_lib_dlsearch_path_spec
11274 +
11275 + # ..but sys_lib_... needs LT_SYS_LIBRARY_PATH munging for
11276 + # LT_SYS_DLSEARCH_PATH macro in ltdl.m4 to work with the correct paths:
11277 + func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
11278 +
11279  
11280  
11281  
# Line 13479 | Line 13543 | finish_cmds='`$ECHO "$finish_cmds" | $SE
13543   finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
13544   hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
13545   sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
13546 < sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
13546 > lt_cv_sys_lib_dlsearch_path_spec='`$ECHO "$lt_cv_sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
13547   hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
13548   enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
13549   enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
# Line 13597 | Line 13661 | postinstall_cmds \
13661   postuninstall_cmds \
13662   finish_cmds \
13663   sys_lib_search_path_spec \
13664 < sys_lib_dlsearch_path_spec; do
13664 > lt_cv_sys_lib_dlsearch_path_spec; do
13665      case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
13666      *[\\\\\\\`\\"\\\$]*)
13667        eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
# Line 14376 | Line 14440 | $as_echo X"$file" |
14440   # The names of the tagged configurations supported by this script.
14441   available_tags=''
14442  
14443 + # Configured defaults for sys_lib_dlsearch_path munging.
14444 + : \${LT_SYS_LIBRARY_PATH="$LT_SYS_LIBRARY_PATH"}
14445 +
14446   # ### BEGIN LIBTOOL CONFIG
14447  
14448   # Which release of libtool.m4 was used?
# Line 14626 | Line 14693 | hardcode_into_libs=$hardcode_into_libs
14693   sys_lib_search_path_spec=$lt_sys_lib_search_path_spec
14694  
14695   # Run-time system search path for libraries.
14696 < sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
14696 > sys_lib_dlsearch_path_spec=$lt_lt_cv_sys_lib_dlsearch_path_spec
14697  
14698   # Whether dlopen is supported.
14699   dlopen_support=$enable_dlopen
# Line 14777 | Line 14844 | hardcode_action=$hardcode_action
14844  
14845   _LT_EOF
14846  
14847 +    cat <<'_LT_EOF' >> "$cfgfile"
14848 +
14849 + # func_munge_path_list VARIABLE PATH
14850 + # -----------------------------------
14851 + # VARIABLE is name of variable containing _space_ separated list of
14852 + # directories to be munged by the contents of PATH, which is string
14853 + # having a format:
14854 + # "DIR[:DIR]:"
14855 + #       string "DIR[ DIR]" will be prepended to VARIABLE
14856 + # ":DIR[:DIR]"
14857 + #       string "DIR[ DIR]" will be appended to VARIABLE
14858 + # "DIRP[:DIRP]::[DIRA:]DIRA"
14859 + #       string "DIRP[ DIRP]" will be prepended to VARIABLE and string
14860 + #       "DIRA[ DIRA]" will be appended to VARIABLE
14861 + # "DIR[:DIR]"
14862 + #       VARIABLE will be replaced by "DIR[ DIR]"
14863 + func_munge_path_list ()
14864 + {
14865 +    case x$2 in
14866 +    x)
14867 +        ;;
14868 +    *:)
14869 +        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'` \S|@1\"
14870 +        ;;
14871 +    x:*)
14872 +        eval $1=\"\$$1 `$ECHO $2 | $SED 's/:/ /g'`\"
14873 +        ;;
14874 +    *::*)
14875 +        eval $1=\"\$$1\ `$ECHO $2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
14876 +        eval $1=\"`$ECHO $2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \$$1\"
14877 +        ;;
14878 +    *)
14879 +        eval $1=\"`$ECHO $2 | $SED 's/:/ /g'`\"
14880 +        ;;
14881 +    esac
14882 + }
14883 +
14884 +
14885 + # Calculate cc_basename.  Skip known compiler wrappers and cross-prefix.
14886 + func_cc_basename ()
14887 + {
14888 +    for cc_temp in $*""; do
14889 +      case $cc_temp in
14890 +        compile | *[\\/]compile | ccache | *[\\/]ccache ) ;;
14891 +        distcc | *[\\/]distcc | purify | *[\\/]purify ) ;;
14892 +        \-*) ;;
14893 +        *) break;;
14894 +      esac
14895 +    done
14896 +    func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
14897 + }
14898 +
14899 +
14900 + _LT_EOF
14901 +
14902    case $host_os in
14903    aix3*)
14904      cat <<\_LT_EOF >> "$cfgfile"

Diff Legend

Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)