Ignore:
Timestamp:
May 1, 2010 6:25:18 AM (11 years ago)
Author:
stefan
Message:

rerun autotools; improve setup of addlibs file

Location:
ThirdParty/FilterSQP/branches/split
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • ThirdParty/FilterSQP/branches/split/Makefile.am

    r1539 r1542  
    3131
    3232filtersqp_addlibs.txt : coinfiltersqp.pc
    33         PKG_CONFIG_PATH=.:$(libdir)/pkgconfig:${PKG_CONFIG_PATH} $(PKG_CONFIG) --libs coinfiltersqp > filtersqp_addlibs.txt
     33        PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ --libs coinfiltersqp > filtersqp_addlibs.txt
    3434endif
    3535

  • ThirdParty/FilterSQP/branches/split/Makefile.in

    r1539 r1542  
    134134COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
    135135COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
     136COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
    136137CPP = @CPP@
    137138CPPFLAGS = @CPPFLAGS@
    … …  
    720721
    721722@COIN_HAS_PKGCONFIG_TRUE@filtersqp_addlibs.txt : coinfiltersqp.pc
    722 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:$(libdir)/pkgconfig:${PKG_CONFIG_PATH} $(PKG_CONFIG) --libs coinfiltersqp > filtersqp_addlibs.txt
     723@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ --libs coinfiltersqp > filtersqp_addlibs.txt
    723724
    724725install-doc: $(DocFiles)

  • ThirdParty/FilterSQP/branches/split/configure

    r1539 r1542  
    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 FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE build build_cpu build_vendor build_os 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 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE 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 ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE build build_cpu build_vendor build_os 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 PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH 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
    … …  
    11041104  --with-filtersqp-checklevel
    11051105                          specify the sanity check level for project FilterSQP
     1106  --with-coin-instdir     prefix of installation directory for precompiled
     1107                          COIN packages
    11061108  --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
    11071109  --with-pic              try to use only PIC/non-PIC objects [default=use
    … …  
    32973299
    32983300# Provide some information about the compiler.
    3299 echo "$as_me:3299:" \
     3301echo "$as_me:3301:" \
    33003302     "checking for Fortran 77 compiler version" >&5
    33013303ac_compiler=`set X $ac_compile; echo $2`
    … …  
    38653867ac_save_FFLAGS=$FFLAGS
    38663868FFLAGS="$FFLAGS $ac_verb"
    3867 (eval echo $as_me:3867: \"$ac_link\") >&5
     3869(eval echo $as_me:3869: \"$ac_link\") >&5
    38683870ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    38693871echo "$ac_f77_v_output" >&5
    … …  
    39433945ac_save_FFLAGS=$FFLAGS
    39443946FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    3945 (eval echo $as_me:3945: \"$ac_link\") >&5
     3947(eval echo $as_me:3947: \"$ac_link\") >&5
    39463948ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    39473949echo "$ac_f77_v_output" >&5
    … …  
    48304832
    48314833
     4834
     4835# assemble search path for pkg-config, if we are in a project setup
     4836if test x$coin_projectdir = xyes ; then
     4837  COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
     4838
     4839  # let's assume that when installing into $prefix, then the user may have installed some other coin projects there before, so it's worth to have a look into there
     4840  # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
     4841  # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
     4842  if test -d "${prefix}"; then
     4843    COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     4844  fi
     4845
     4846
     4847# Check whether --with-coin-instdir or --without-coin-instdir was given.
     4848if test "${with_coin_instdir+set}" = set; then
     4849  withval="$with_coin_instdir"
     4850  if test -d "$withval"; then : ; else
     4851       { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
     4852echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
     4853   { (exit 1); exit 1; }; }
     4854     fi
     4855     COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     4856
     4857fi;
     4858
     4859  # in a classic setup, we want to find uninstalled projects
     4860  # their (relative) location is written to coin_subdirs.txt by the configure in the project base directory
     4861  # unfortunately, if the user set prefix, then we do not know where the project base directory is located
     4862  # but it is likely to be either .. (if we are a usual coin project) or ../.. (if we are a unusual coin project like ThirdParty or Data)
     4863  if test -e ../coin_subdirs.txt ; then
     4864    for i in `cat ../coin_subdirs.txt` ; do
     4865      COIN_PKG_CONFIG_PATH="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     4866    done
     4867  fi
     4868
     4869  if test -e ../../coin_subdirs.txt ; then
     4870    for i in `cat ../../coin_subdirs.txt` ; do
     4871      COIN_PKG_CONFIG_PATH="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     4872    done
     4873  fi
     4874
     4875
     4876fi
    48324877
    48334878
    … …  
    71217166*-*-irix6*)
    71227167  # Find out which ABI we are using.
    7123   echo '#line 7123 "configure"' > conftest.$ac_ext
     7168  echo '#line 7168 "configure"' > conftest.$ac_ext
    71247169  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    71257170  (eval $ac_compile) 2>&5
    … …  
    97079752   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    97089753   -e 's:$: $lt_compiler_flag:'`
    9709    (eval echo "\"\$as_me:9709: $lt_compile\"" >&5)
     9754   (eval echo "\"\$as_me:9754: $lt_compile\"" >&5)
    97109755   (eval "$lt_compile" 2>conftest.err)
    97119756   ac_status=$?
    97129757   cat conftest.err >&5
    9713    echo "$as_me:9713: \$? = $ac_status" >&5
     9758   echo "$as_me:9758: \$? = $ac_status" >&5
    97149759   if (exit $ac_status) && test -s "$ac_outfile"; then
    97159760     # The compiler can only warn and ignore the option if not recognized
    … …  
    997510020   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    997610021   -e 's:$: $lt_compiler_flag:'`
    9977    (eval echo "\"\$as_me:9977: $lt_compile\"" >&5)
     10022   (eval echo "\"\$as_me:10022: $lt_compile\"" >&5)
    997810023   (eval "$lt_compile" 2>conftest.err)
    997910024   ac_status=$?
    998010025   cat conftest.err >&5
    9981    echo "$as_me:9981: \$? = $ac_status" >&5
     10026   echo "$as_me:10026: \$? = $ac_status" >&5
    998210027   if (exit $ac_status) && test -s "$ac_outfile"; then
    998310028     # The compiler can only warn and ignore the option if not recognized
    … …  
    1007910124   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1008010125   -e 's:$: $lt_compiler_flag:'`
    10081    (eval echo "\"\$as_me:10081: $lt_compile\"" >&5)
     10126   (eval echo "\"\$as_me:10126: $lt_compile\"" >&5)
    1008210127   (eval "$lt_compile" 2>out/conftest.err)
    1008310128   ac_status=$?
    1008410129   cat out/conftest.err >&5
    10085    echo "$as_me:10085: \$? = $ac_status" >&5
     10130   echo "$as_me:10130: \$? = $ac_status" >&5
    1008610131   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1008710132   then
    … …  
    1249612541  lt_status=$lt_dlunknown
    1249712542  cat > conftest.$ac_ext <<EOF
    12498 #line 12498 "configure"
     12543#line 12543 "configure"
    1249912544#include "confdefs.h"
    1250012545
    … …  
    1259612641  lt_status=$lt_dlunknown
    1259712642  cat > conftest.$ac_ext <<EOF
    12598 #line 12598 "configure"
     12643#line 12643 "configure"
    1259912644#include "confdefs.h"
    1260012645
    … …  
    1495615001   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1495715002   -e 's:$: $lt_compiler_flag:'`
    14958    (eval echo "\"\$as_me:14958: $lt_compile\"" >&5)
     15003   (eval echo "\"\$as_me:15003: $lt_compile\"" >&5)
    1495915004   (eval "$lt_compile" 2>conftest.err)
    1496015005   ac_status=$?
    1496115006   cat conftest.err >&5
    14962    echo "$as_me:14962: \$? = $ac_status" >&5
     15007   echo "$as_me:15007: \$? = $ac_status" >&5
    1496315008   if (exit $ac_status) && test -s "$ac_outfile"; then
    1496415009     # The compiler can only warn and ignore the option if not recognized
    … …  
    1506015105   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1506115106   -e 's:$: $lt_compiler_flag:'`
    15062    (eval echo "\"\$as_me:15062: $lt_compile\"" >&5)
     15107   (eval echo "\"\$as_me:15107: $lt_compile\"" >&5)
    1506315108   (eval "$lt_compile" 2>out/conftest.err)
    1506415109   ac_status=$?
    1506515110   cat out/conftest.err >&5
    15066    echo "$as_me:15066: \$? = $ac_status" >&5
     15111   echo "$as_me:15111: \$? = $ac_status" >&5
    1506715112   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1506815113   then
    … …  
    1663016675   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1663116676   -e 's:$: $lt_compiler_flag:'`
    16632    (eval echo "\"\$as_me:16632: $lt_compile\"" >&5)
     16677   (eval echo "\"\$as_me:16677: $lt_compile\"" >&5)
    1663316678   (eval "$lt_compile" 2>conftest.err)
    1663416679   ac_status=$?
    1663516680   cat conftest.err >&5
    16636    echo "$as_me:16636: \$? = $ac_status" >&5
     16681   echo "$as_me:16681: \$? = $ac_status" >&5
    1663716682   if (exit $ac_status) && test -s "$ac_outfile"; then
    1663816683     # The compiler can only warn and ignore the option if not recognized
    … …  
    1673416779   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1673516780   -e 's:$: $lt_compiler_flag:'`
    16736    (eval echo "\"\$as_me:16736: $lt_compile\"" >&5)
     16781   (eval echo "\"\$as_me:16781: $lt_compile\"" >&5)
    1673716782   (eval "$lt_compile" 2>out/conftest.err)
    1673816783   ac_status=$?
    1673916784   cat out/conftest.err >&5
    16740    echo "$as_me:16740: \$? = $ac_status" >&5
     16785   echo "$as_me:16785: \$? = $ac_status" >&5
    1674116786   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1674216787   then
    … …  
    1894118986   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1894218987   -e 's:$: $lt_compiler_flag:'`
    18943    (eval echo "\"\$as_me:18943: $lt_compile\"" >&5)
     18988   (eval echo "\"\$as_me:18988: $lt_compile\"" >&5)
    1894418989   (eval "$lt_compile" 2>conftest.err)
    1894518990   ac_status=$?
    1894618991   cat conftest.err >&5
    18947    echo "$as_me:18947: \$? = $ac_status" >&5
     18992   echo "$as_me:18992: \$? = $ac_status" >&5
    1894818993   if (exit $ac_status) && test -s "$ac_outfile"; then
    1894918994     # The compiler can only warn and ignore the option if not recognized
    … …  
    1920919254   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1921019255   -e 's:$: $lt_compiler_flag:'`
    19211    (eval echo "\"\$as_me:19211: $lt_compile\"" >&5)
     19256   (eval echo "\"\$as_me:19256: $lt_compile\"" >&5)
    1921219257   (eval "$lt_compile" 2>conftest.err)
    1921319258   ac_status=$?
    1921419259   cat conftest.err >&5
    19215    echo "$as_me:19215: \$? = $ac_status" >&5
     19260   echo "$as_me:19260: \$? = $ac_status" >&5
    1921619261   if (exit $ac_status) && test -s "$ac_outfile"; then
    1921719262     # The compiler can only warn and ignore the option if not recognized
    … …  
    1931319358   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1931419359   -e 's:$: $lt_compiler_flag:'`
    19315    (eval echo "\"\$as_me:19315: $lt_compile\"" >&5)
     19360   (eval echo "\"\$as_me:19360: $lt_compile\"" >&5)
    1931619361   (eval "$lt_compile" 2>out/conftest.err)
    1931719362   ac_status=$?
    1931819363   cat out/conftest.err >&5
    19319    echo "$as_me:19319: \$? = $ac_status" >&5
     19364   echo "$as_me:19364: \$? = $ac_status" >&5
    1932019365   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1932119366   then
    … …  
    2306023105s,@COIN_HAS_PKGCONFIG_TRUE@,$COIN_HAS_PKGCONFIG_TRUE,;t t
    2306123106s,@COIN_HAS_PKGCONFIG_FALSE@,$COIN_HAS_PKGCONFIG_FALSE,;t t
     23107s,@COIN_PKG_CONFIG_PATH@,$COIN_PKG_CONFIG_PATH,;t t
    2306223108s,@EGREP@,$EGREP,;t t
    2306323109s,@INSTALL_PROGRAM@,$INSTALL_PROGRAM,;t t
Note: See TracChangeset for help on using the changeset viewer.