Changeset 2067


Ignore:
Timestamp:
Jan 1, 2011 1:22:20 PM (9 years ago)
Author:
stefan
Message:

sync with trunk rev2066

Location:
ThirdParty/FilterSQP/stable/1.2
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • ThirdParty/FilterSQP/stable/1.2

  • ThirdParty/FilterSQP/stable/1.2/Makefile.in

    r2003 r2067  
    108108ABSBUILDDIR = @ABSBUILDDIR@
    109109ACLOCAL = @ACLOCAL@
    110 ADDLIBS = @ADDLIBS@
    111110ADD_CFLAGS = @ADD_CFLAGS@
    112111ADD_FFLAGS = @ADD_FFLAGS@
    … …  
    151150EXEEXT = @EXEEXT@
    152151F77 = @F77@
    153 FADDLIBS = @FADDLIBS@
    154152FFLAGS = @FFLAGS@
    155153FILTERSQP_PCLIBS = @FILTERSQP_PCLIBS@
    … …  
    187185PACKAGE_VERSION = @PACKAGE_VERSION@
    188186PATH_SEPARATOR = @PATH_SEPARATOR@
    189 PCADDLIBS = @PCADDLIBS@
    190187PKG_CONFIG = @PKG_CONFIG@
    191188RANLIB = @RANLIB@

  • ThirdParty/FilterSQP/stable/1.2/coinfiltersqp-uninstalled.pc.in

    r1903 r2067  
    44Name: FilterSQP
    55Description: FilterSQP
     6URL: https://projects.coin-or.org/BuildTools
    67Version: @PACKAGE_VERSION@
    78Libs: ${libdir}/libfiltersqp.la @FILTERSQP_PCLIBS@

  • ThirdParty/FilterSQP/stable/1.2/coinfiltersqp.pc.in

    r2003 r2067  
    44Name: FilterSQP
    55Description: FilterSQP
     6URL: https://projects.coin-or.org/BuildTools
    67Version: @PACKAGE_VERSION@
    78Libs: -L${libdir} -lfiltersqp @FILTERSQP_PCLIBS@

  • ThirdParty/FilterSQP/stable/1.2/configure

    r2030 r2067  
    473473#endif"
    474474
    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 ADDLIBS 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'
     475ac_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'
    476476ac_subst_files=''
    477477
    … …  
    16041604
    16051605
    1606 # Initialize the ADDLIBS variable
    1607 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 
    16151606
    16161607# As backup, we make sure we don't loose an FLIBS if it has been set
    16171608# by the user
    16181609save_FLIBS="$FLIBS"
    1619 
    1620 # Initialize the FADDLIBS variable (which is to be used with a fortran
    1621 # compiler and will not include FLIBS)
    1622 FADDLIBS="$LIBS"
    1623 
    16241610
    16251611# A useful makefile conditional that is always false
    … …  
    20382024             fi
    20392025             ;;
     2026  *-linux-gnu*) comps="gcc cc pgcc icc xlc" ;;
    20402027  *-linux-*) comps="xlc gcc cc pgcc icc" ;;
    20412028  *)         comps="xlc_r xlc cc gcc pgcc icc" ;;
    … …  
    31773164fi
    31783165
    3179 # Correct ADDLIBS initialization if we are using the MS compiler
     3166# Correct the LD variable if we are using the MS or Intel-windows compiler
    31803167case "$CC" in
    31813168  cl* | */cl* | CL* | */CL* | icl* | */icl* | ICL* | */ICL*)
    3182     ADDLIBS=
    31833169    case $build in
    31843170  *-mingw*)
    … …  
    32153201  *-*-solaris*)
    32163202     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" ;;
    32173205  *) coin_f77_comps="xlf_r fort77 gfortran f77 g77 pgf90 pgf77 ifort ifc frt af77" ;;
    32183206 esac
    … …  
    33863374
    33873375# Provide some information about the compiler.
    3388 echo "$as_me:3388:" \
     3376echo "$as_me:3376:" \
    33893377     "checking for Fortran 77 compiler version" >&5
    33903378ac_compiler=`set X $ac_compile; echo $2`
    … …  
    38743862fi
    38753863
     3864# correct the LD variable if we use the intel fortran compiler in windows
    38763865case "$F77" in
    38773866  ifort* | */ifort* | IFORT* | */IFORT*)
    … …  
    39543943ac_save_FFLAGS=$FFLAGS
    39553944FFLAGS="$FFLAGS $ac_verb"
    3956 (eval echo $as_me:3956: \"$ac_link\") >&5
     3945(eval echo $as_me:3945: \"$ac_link\") >&5
    39573946ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    39583947echo "$ac_f77_v_output" >&5
    … …  
    40324021ac_save_FFLAGS=$FFLAGS
    40334022FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    4034 (eval echo $as_me:4034: \"$ac_link\") >&5
     4023(eval echo $as_me:4023: \"$ac_link\") >&5
    40354024ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    40364025echo "$ac_f77_v_output" >&5
    … …  
    49624951        COIN_PKG_CONFIG_PATH_UNINSTALLED="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH_UNINSTALLED}"
    49634952      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
    49644956    done
    49654957  fi
    … …  
    49694961      if test -d ../../$i ; then
    49704962        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}"
    49714966      fi
    49724967    done
    … …  
    72667261*-*-irix6*)
    72677262  # Find out which ABI we are using.
    7268   echo '#line 7268 "configure"' > conftest.$ac_ext
     7263  echo '#line 7263 "configure"' > conftest.$ac_ext
    72697264  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    72707265  (eval $ac_compile) 2>&5
    … …  
    98529847   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    98539848   -e 's:$: $lt_compiler_flag:'`
    9854    (eval echo "\"\$as_me:9854: $lt_compile\"" >&5)
     9849   (eval echo "\"\$as_me:9849: $lt_compile\"" >&5)
    98559850   (eval "$lt_compile" 2>conftest.err)
    98569851   ac_status=$?
    98579852   cat conftest.err >&5
    9858    echo "$as_me:9858: \$? = $ac_status" >&5
     9853   echo "$as_me:9853: \$? = $ac_status" >&5
    98599854   if (exit $ac_status) && test -s "$ac_outfile"; then
    98609855     # The compiler can only warn and ignore the option if not recognized
    … …  
    1012010115   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1012110116   -e 's:$: $lt_compiler_flag:'`
    10122    (eval echo "\"\$as_me:10122: $lt_compile\"" >&5)
     10117   (eval echo "\"\$as_me:10117: $lt_compile\"" >&5)
    1012310118   (eval "$lt_compile" 2>conftest.err)
    1012410119   ac_status=$?
    1012510120   cat conftest.err >&5
    10126    echo "$as_me:10126: \$? = $ac_status" >&5
     10121   echo "$as_me:10121: \$? = $ac_status" >&5
    1012710122   if (exit $ac_status) && test -s "$ac_outfile"; then
    1012810123     # The compiler can only warn and ignore the option if not recognized
    … …  
    1022410219   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1022510220   -e 's:$: $lt_compiler_flag:'`
    10226    (eval echo "\"\$as_me:10226: $lt_compile\"" >&5)
     10221   (eval echo "\"\$as_me:10221: $lt_compile\"" >&5)
    1022710222   (eval "$lt_compile" 2>out/conftest.err)
    1022810223   ac_status=$?
    1022910224   cat out/conftest.err >&5
    10230    echo "$as_me:10230: \$? = $ac_status" >&5
     10225   echo "$as_me:10225: \$? = $ac_status" >&5
    1023110226   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1023210227   then
    … …  
    1264112636  lt_status=$lt_dlunknown
    1264212637  cat > conftest.$ac_ext <<EOF
    12643 #line 12643 "configure"
     12638#line 12638 "configure"
    1264412639#include "confdefs.h"
    1264512640
    … …  
    1274112736  lt_status=$lt_dlunknown
    1274212737  cat > conftest.$ac_ext <<EOF
    12743 #line 12743 "configure"
     12738#line 12738 "configure"
    1274412739#include "confdefs.h"
    1274512740
    … …  
    1510115096   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1510215097   -e 's:$: $lt_compiler_flag:'`
    15103    (eval echo "\"\$as_me:15103: $lt_compile\"" >&5)
     15098   (eval echo "\"\$as_me:15098: $lt_compile\"" >&5)
    1510415099   (eval "$lt_compile" 2>conftest.err)
    1510515100   ac_status=$?
    1510615101   cat conftest.err >&5
    15107    echo "$as_me:15107: \$? = $ac_status" >&5
     15102   echo "$as_me:15102: \$? = $ac_status" >&5
    1510815103   if (exit $ac_status) && test -s "$ac_outfile"; then
    1510915104     # The compiler can only warn and ignore the option if not recognized
    … …  
    1520515200   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1520615201   -e 's:$: $lt_compiler_flag:'`
    15207    (eval echo "\"\$as_me:15207: $lt_compile\"" >&5)
     15202   (eval echo "\"\$as_me:15202: $lt_compile\"" >&5)
    1520815203   (eval "$lt_compile" 2>out/conftest.err)
    1520915204   ac_status=$?
    1521015205   cat out/conftest.err >&5
    15211    echo "$as_me:15211: \$? = $ac_status" >&5
     15206   echo "$as_me:15206: \$? = $ac_status" >&5
    1521215207   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1521315208   then
    … …  
    1677516770   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1677616771   -e 's:$: $lt_compiler_flag:'`
    16777    (eval echo "\"\$as_me:16777: $lt_compile\"" >&5)
     16772   (eval echo "\"\$as_me:16772: $lt_compile\"" >&5)
    1677816773   (eval "$lt_compile" 2>conftest.err)
    1677916774   ac_status=$?
    1678016775   cat conftest.err >&5
    16781    echo "$as_me:16781: \$? = $ac_status" >&5
     16776   echo "$as_me:16776: \$? = $ac_status" >&5
    1678216777   if (exit $ac_status) && test -s "$ac_outfile"; then
    1678316778     # The compiler can only warn and ignore the option if not recognized
    … …  
    1687916874   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1688016875   -e 's:$: $lt_compiler_flag:'`
    16881    (eval echo "\"\$as_me:16881: $lt_compile\"" >&5)
     16876   (eval echo "\"\$as_me:16876: $lt_compile\"" >&5)
    1688216877   (eval "$lt_compile" 2>out/conftest.err)
    1688316878   ac_status=$?
    1688416879   cat out/conftest.err >&5
    16885    echo "$as_me:16885: \$? = $ac_status" >&5
     16880   echo "$as_me:16880: \$? = $ac_status" >&5
    1688616881   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1688716882   then
    … …  
    1908619081   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1908719082   -e 's:$: $lt_compiler_flag:'`
    19088    (eval echo "\"\$as_me:19088: $lt_compile\"" >&5)
     19083   (eval echo "\"\$as_me:19083: $lt_compile\"" >&5)
    1908919084   (eval "$lt_compile" 2>conftest.err)
    1909019085   ac_status=$?
    1909119086   cat conftest.err >&5
    19092    echo "$as_me:19092: \$? = $ac_status" >&5
     19087   echo "$as_me:19087: \$? = $ac_status" >&5
    1909319088   if (exit $ac_status) && test -s "$ac_outfile"; then
    1909419089     # The compiler can only warn and ignore the option if not recognized
    … …  
    1935419349   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1935519350   -e 's:$: $lt_compiler_flag:'`
    19356    (eval echo "\"\$as_me:19356: $lt_compile\"" >&5)
     19351   (eval echo "\"\$as_me:19351: $lt_compile\"" >&5)
    1935719352   (eval "$lt_compile" 2>conftest.err)
    1935819353   ac_status=$?
    1935919354   cat conftest.err >&5
    19360    echo "$as_me:19360: \$? = $ac_status" >&5
     19355   echo "$as_me:19355: \$? = $ac_status" >&5
    1936119356   if (exit $ac_status) && test -s "$ac_outfile"; then
    1936219357     # The compiler can only warn and ignore the option if not recognized
    … …  
    1945819453   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1945919454   -e 's:$: $lt_compiler_flag:'`
    19460    (eval echo "\"\$as_me:19460: $lt_compile\"" >&5)
     19455   (eval echo "\"\$as_me:19455: $lt_compile\"" >&5)
    1946119456   (eval "$lt_compile" 2>out/conftest.err)
    1946219457   ac_status=$?
    1946319458   cat out/conftest.err >&5
    19464    echo "$as_me:19464: \$? = $ac_status" >&5
     19459   echo "$as_me:19459: \$? = $ac_status" >&5
    1946519460   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1946619461   then
    … …  
    2240022395if test x$coin_skip_ac_output != xyes; then
    2240122396
    22402   FADDLIBS="$ADDLIBS"
    22403   if test x"$coin_need_flibs" = xyes; then
    22404     ADDLIBS="$ADDLIBS $FLIBS"
    22405   fi
    22406   PCADDLIBS="$PCADDLIBS $ADDLIBS"
    22407 
    2240822397  # library extension
    2240922398
    … …  
    2318023169s,@ECHO_T@,$ECHO_T,;t t
    2318123170s,@LIBS@,$LIBS,;t t
    23182 s,@ADDLIBS@,$ADDLIBS,;t t
    23183 s,@PCADDLIBS@,$PCADDLIBS,;t t
    23184 s,@FADDLIBS@,$FADDLIBS,;t t
    2318523171s,@ALWAYS_FALSE_TRUE@,$ALWAYS_FALSE_TRUE,;t t
    2318623172s,@ALWAYS_FALSE_FALSE@,$ALWAYS_FALSE_FALSE,;t t
Note: See TracChangeset for help on using the changeset viewer.