Changeset 2067
- Timestamp:
- Jan 1, 2011 1:22:20 PM (10 years ago)
- Location:
- ThirdParty/FilterSQP/stable/1.2
- Files:
-
- 5 edited
Legend:
- Unmodified
- Added
- Removed
-
ThirdParty/FilterSQP/stable/1.2
- Property svn:mergeinfo changed
/ThirdParty/FilterSQP/trunk (added) merged: 2032,2055
- Property svn:mergeinfo changed
-
ThirdParty/FilterSQP/stable/1.2/Makefile.in
r2003 r2067 108 108 ABSBUILDDIR = @ABSBUILDDIR@ 109 109 ACLOCAL = @ACLOCAL@ 110 ADDLIBS = @ADDLIBS@111 110 ADD_CFLAGS = @ADD_CFLAGS@ 112 111 ADD_FFLAGS = @ADD_FFLAGS@ … … 151 150 EXEEXT = @EXEEXT@ 152 151 F77 = @F77@ 153 FADDLIBS = @FADDLIBS@154 152 FFLAGS = @FFLAGS@ 155 153 FILTERSQP_PCLIBS = @FILTERSQP_PCLIBS@ … … 187 185 PACKAGE_VERSION = @PACKAGE_VERSION@ 188 186 PATH_SEPARATOR = @PATH_SEPARATOR@ 189 PCADDLIBS = @PCADDLIBS@190 187 PKG_CONFIG = @PKG_CONFIG@ 191 188 RANLIB = @RANLIB@ -
ThirdParty/FilterSQP/stable/1.2/coinfiltersqp-uninstalled.pc.in
r1903 r2067 4 4 Name: FilterSQP 5 5 Description: FilterSQP 6 URL: https://projects.coin-or.org/BuildTools 6 7 Version: @PACKAGE_VERSION@ 7 8 Libs: ${libdir}/libfiltersqp.la @FILTERSQP_PCLIBS@ -
ThirdParty/FilterSQP/stable/1.2/coinfiltersqp.pc.in
r2003 r2067 4 4 Name: FilterSQP 5 5 Description: FilterSQP 6 URL: https://projects.coin-or.org/BuildTools 6 7 Version: @PACKAGE_VERSION@ 7 8 Libs: -L${libdir} -lfiltersqp @FILTERSQP_PCLIBS@ -
ThirdParty/FilterSQP/stable/1.2/configure
r2030 r2067 473 473 #endif" 474 474 475 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS A DDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion FILTERSQP_SVN_REV build build_cpu build_vendor build_os COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 FLIBS FILTERSQP_PCLIBS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'475 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion FILTERSQP_SVN_REV build build_cpu build_vendor build_os COIN_CC_IS_CL_TRUE COIN_CC_IS_CL_FALSE CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC ADD_FFLAGS DBG_FFLAGS OPT_FFLAGS F77 FFLAGS ac_ct_F77 MPIF77 FLIBS FILTERSQP_PCLIBS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH COIN_PKG_CONFIG_PATH_UNINSTALLED EGREP INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake have_svn BUILDTOOLSDIR AUX_DIR abs_source_dir abs_lib_dir abs_include_dir abs_bin_dir HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE host host_cpu host_vendor host_os LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS' 476 476 ac_subst_files='' 477 477 … … 1604 1604 1605 1605 1606 # Initialize the ADDLIBS variable1607 ADDLIBS="-lm $LIBS"1608 1609 1610 # Initialize the PCADDLIBS variable.1611 # This variable is used to setup library flags for the "Libs:" section in a .pc file.1612 # In certain cases, it may contain more flags than the ADDLIBS variable.1613 PCADDLIBS=""1614 1615 1606 1616 1607 # As backup, we make sure we don't loose an FLIBS if it has been set 1617 1608 # by the user 1618 1609 save_FLIBS="$FLIBS" 1619 1620 # Initialize the FADDLIBS variable (which is to be used with a fortran1621 # compiler and will not include FLIBS)1622 FADDLIBS="$LIBS"1623 1624 1610 1625 1611 # A useful makefile conditional that is always false … … 2038 2024 fi 2039 2025 ;; 2026 *-linux-gnu*) comps="gcc cc pgcc icc xlc" ;; 2040 2027 *-linux-*) comps="xlc gcc cc pgcc icc" ;; 2041 2028 *) comps="xlc_r xlc cc gcc pgcc icc" ;; … … 3177 3164 fi 3178 3165 3179 # Correct ADDLIBS initialization if we are using the MScompiler3166 # Correct the LD variable if we are using the MS or Intel-windows compiler 3180 3167 case "$CC" in 3181 3168 cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*) 3182 ADDLIBS=3183 3169 case $build in 3184 3170 *-mingw*) … … 3215 3201 *-*-solaris*) 3216 3202 coin_f77_comps="f95 f90 f77 xlf_r fort77 gfortran g77 pgf90 pgf77 ifort ifc frt af77" ;; 3203 *-linux-gnu*) 3204 coin_f77_comps="gfortran fort77 f77 g77 pgf90 pgf77 ifort ifc frt af77 xlf_r" ;; 3217 3205 *) coin_f77_comps="xlf_r fort77 gfortran f77 g77 pgf90 pgf77 ifort ifc frt af77" ;; 3218 3206 esac … … 3386 3374 3387 3375 # Provide some information about the compiler. 3388 echo "$as_me:33 88:" \3376 echo "$as_me:3376:" \ 3389 3377 "checking for Fortran 77 compiler version" >&5 3390 3378 ac_compiler=`set X $ac_compile; echo $2` … … 3874 3862 fi 3875 3863 3864 # correct the LD variable if we use the intel fortran compiler in windows 3876 3865 case "$F77" in 3877 3866 ifort* | */ifort* | IFORT* | */IFORT*) … … 3954 3943 ac_save_FFLAGS=$FFLAGS 3955 3944 FFLAGS="$FFLAGS $ac_verb" 3956 (eval echo $as_me:39 56: \"$ac_link\") >&53945 (eval echo $as_me:3945: \"$ac_link\") >&5 3957 3946 ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` 3958 3947 echo "$ac_f77_v_output" >&5 … … 4032 4021 ac_save_FFLAGS=$FFLAGS 4033 4022 FFLAGS="$FFLAGS $ac_cv_prog_f77_v" 4034 (eval echo $as_me:40 34: \"$ac_link\") >&54023 (eval echo $as_me:4023: \"$ac_link\") >&5 4035 4024 ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'` 4036 4025 echo "$ac_f77_v_output" >&5 … … 4962 4951 COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}" 4963 4952 fi 4953 if test -d ../$i/pkgconfig ; then 4954 COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i/pkgconfig; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}" 4955 fi 4964 4956 done 4965 4957 fi … … 4969 4961 if test -d ../../$i ; then 4970 4962 COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}" 4963 fi 4964 if test -d ../../$i/pkgconfig ; then 4965 COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../../$i/pkgconfig; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}" 4971 4966 fi 4972 4967 done … … 7266 7261 *-*-irix6*) 7267 7262 # Find out which ABI we are using. 7268 echo '#line 726 8"configure"' > conftest.$ac_ext7263 echo '#line 7263 "configure"' > conftest.$ac_ext 7269 7264 if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 7270 7265 (eval $ac_compile) 2>&5 … … 9852 9847 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 9853 9848 -e 's:$: $lt_compiler_flag:'` 9854 (eval echo "\"\$as_me:98 54: $lt_compile\"" >&5)9849 (eval echo "\"\$as_me:9849: $lt_compile\"" >&5) 9855 9850 (eval "$lt_compile" 2>conftest.err) 9856 9851 ac_status=$? 9857 9852 cat conftest.err >&5 9858 echo "$as_me:985 8: \$? = $ac_status" >&59853 echo "$as_me:9853: \$? = $ac_status" >&5 9859 9854 if (exit $ac_status) && test -s "$ac_outfile"; then 9860 9855 # The compiler can only warn and ignore the option if not recognized … … 10120 10115 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 10121 10116 -e 's:$: $lt_compiler_flag:'` 10122 (eval echo "\"\$as_me:101 22: $lt_compile\"" >&5)10117 (eval echo "\"\$as_me:10117: $lt_compile\"" >&5) 10123 10118 (eval "$lt_compile" 2>conftest.err) 10124 10119 ac_status=$? 10125 10120 cat conftest.err >&5 10126 echo "$as_me:1012 6: \$? = $ac_status" >&510121 echo "$as_me:10121: \$? = $ac_status" >&5 10127 10122 if (exit $ac_status) && test -s "$ac_outfile"; then 10128 10123 # The compiler can only warn and ignore the option if not recognized … … 10224 10219 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 10225 10220 -e 's:$: $lt_compiler_flag:'` 10226 (eval echo "\"\$as_me:1022 6: $lt_compile\"" >&5)10221 (eval echo "\"\$as_me:10221: $lt_compile\"" >&5) 10227 10222 (eval "$lt_compile" 2>out/conftest.err) 10228 10223 ac_status=$? 10229 10224 cat out/conftest.err >&5 10230 echo "$as_me:102 30: \$? = $ac_status" >&510225 echo "$as_me:10225: \$? = $ac_status" >&5 10231 10226 if (exit $ac_status) && test -s out/conftest2.$ac_objext 10232 10227 then … … 12641 12636 lt_status=$lt_dlunknown 12642 12637 cat > conftest.$ac_ext <<EOF 12643 #line 126 43"configure"12638 #line 12638 "configure" 12644 12639 #include "confdefs.h" 12645 12640 … … 12741 12736 lt_status=$lt_dlunknown 12742 12737 cat > conftest.$ac_ext <<EOF 12743 #line 127 43"configure"12738 #line 12738 "configure" 12744 12739 #include "confdefs.h" 12745 12740 … … 15101 15096 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 15102 15097 -e 's:$: $lt_compiler_flag:'` 15103 (eval echo "\"\$as_me:15 103: $lt_compile\"" >&5)15098 (eval echo "\"\$as_me:15098: $lt_compile\"" >&5) 15104 15099 (eval "$lt_compile" 2>conftest.err) 15105 15100 ac_status=$? 15106 15101 cat conftest.err >&5 15107 echo "$as_me:1510 7: \$? = $ac_status" >&515102 echo "$as_me:15102: \$? = $ac_status" >&5 15108 15103 if (exit $ac_status) && test -s "$ac_outfile"; then 15109 15104 # The compiler can only warn and ignore the option if not recognized … … 15205 15200 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 15206 15201 -e 's:$: $lt_compiler_flag:'` 15207 (eval echo "\"\$as_me:1520 7: $lt_compile\"" >&5)15202 (eval echo "\"\$as_me:15202: $lt_compile\"" >&5) 15208 15203 (eval "$lt_compile" 2>out/conftest.err) 15209 15204 ac_status=$? 15210 15205 cat out/conftest.err >&5 15211 echo "$as_me:152 11: \$? = $ac_status" >&515206 echo "$as_me:15206: \$? = $ac_status" >&5 15212 15207 if (exit $ac_status) && test -s out/conftest2.$ac_objext 15213 15208 then … … 16775 16770 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 16776 16771 -e 's:$: $lt_compiler_flag:'` 16777 (eval echo "\"\$as_me:1677 7: $lt_compile\"" >&5)16772 (eval echo "\"\$as_me:16772: $lt_compile\"" >&5) 16778 16773 (eval "$lt_compile" 2>conftest.err) 16779 16774 ac_status=$? 16780 16775 cat conftest.err >&5 16781 echo "$as_me:167 81: \$? = $ac_status" >&516776 echo "$as_me:16776: \$? = $ac_status" >&5 16782 16777 if (exit $ac_status) && test -s "$ac_outfile"; then 16783 16778 # The compiler can only warn and ignore the option if not recognized … … 16879 16874 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 16880 16875 -e 's:$: $lt_compiler_flag:'` 16881 (eval echo "\"\$as_me:168 81: $lt_compile\"" >&5)16876 (eval echo "\"\$as_me:16876: $lt_compile\"" >&5) 16882 16877 (eval "$lt_compile" 2>out/conftest.err) 16883 16878 ac_status=$? 16884 16879 cat out/conftest.err >&5 16885 echo "$as_me:1688 5: \$? = $ac_status" >&516880 echo "$as_me:16880: \$? = $ac_status" >&5 16886 16881 if (exit $ac_status) && test -s out/conftest2.$ac_objext 16887 16882 then … … 19086 19081 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 19087 19082 -e 's:$: $lt_compiler_flag:'` 19088 (eval echo "\"\$as_me:1908 8: $lt_compile\"" >&5)19083 (eval echo "\"\$as_me:19083: $lt_compile\"" >&5) 19089 19084 (eval "$lt_compile" 2>conftest.err) 19090 19085 ac_status=$? 19091 19086 cat conftest.err >&5 19092 echo "$as_me:190 92: \$? = $ac_status" >&519087 echo "$as_me:19087: \$? = $ac_status" >&5 19093 19088 if (exit $ac_status) && test -s "$ac_outfile"; then 19094 19089 # The compiler can only warn and ignore the option if not recognized … … 19354 19349 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 19355 19350 -e 's:$: $lt_compiler_flag:'` 19356 (eval echo "\"\$as_me:1935 6: $lt_compile\"" >&5)19351 (eval echo "\"\$as_me:19351: $lt_compile\"" >&5) 19357 19352 (eval "$lt_compile" 2>conftest.err) 19358 19353 ac_status=$? 19359 19354 cat conftest.err >&5 19360 echo "$as_me:193 60: \$? = $ac_status" >&519355 echo "$as_me:19355: \$? = $ac_status" >&5 19361 19356 if (exit $ac_status) && test -s "$ac_outfile"; then 19362 19357 # The compiler can only warn and ignore the option if not recognized … … 19458 19453 -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ 19459 19454 -e 's:$: $lt_compiler_flag:'` 19460 (eval echo "\"\$as_me:194 60: $lt_compile\"" >&5)19455 (eval echo "\"\$as_me:19455: $lt_compile\"" >&5) 19461 19456 (eval "$lt_compile" 2>out/conftest.err) 19462 19457 ac_status=$? 19463 19458 cat out/conftest.err >&5 19464 echo "$as_me:194 64: \$? = $ac_status" >&519459 echo "$as_me:19459: \$? = $ac_status" >&5 19465 19460 if (exit $ac_status) && test -s out/conftest2.$ac_objext 19466 19461 then … … 22400 22395 if test x$coin_skip_ac_output != xyes; then 22401 22396 22402 FADDLIBS="$ADDLIBS"22403 if test x"$coin_need_flibs" = xyes; then22404 ADDLIBS="$ADDLIBS $FLIBS"22405 fi22406 PCADDLIBS="$PCADDLIBS $ADDLIBS"22407 22408 22397 # library extension 22409 22398 … … 23180 23169 s,@ECHO_T@,$ECHO_T,;t t 23181 23170 s,@LIBS@,$LIBS,;t t 23182 s,@ADDLIBS@,$ADDLIBS,;t t23183 s,@PCADDLIBS@,$PCADDLIBS,;t t23184 s,@FADDLIBS@,$FADDLIBS,;t t23185 23171 s,@ALWAYS_FALSE_TRUE@,$ALWAYS_FALSE_TRUE,;t t 23186 23172 s,@ALWAYS_FALSE_FALSE@,$ALWAYS_FALSE_FALSE,;t t
Note: See TracChangeset
for help on using the changeset viewer.