Changeset 1682 for ThirdParty/FilterSQP


Ignore:
Timestamp:
Sep 13, 2010 3:37:57 AM (9 years ago)
Author:
stefan
Message:

change from COIN_HAS_MODULE to COIN_HAS_PACKAGE

Location:
ThirdParty/FilterSQP/trunk
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • ThirdParty/FilterSQP/trunk/Makefile.in

    r1650 r1682  
    152152FADDLIBS = @FADDLIBS@
    153153FFLAGS = @FFLAGS@
     154FILTERSQP_PCLIBS = @FILTERSQP_PCLIBS@
    154155FILTERSQP_SVN_REV = @FILTERSQP_SVN_REV@
    155156FLIBS = @FLIBS@
  • ThirdParty/FilterSQP/trunk/coinfiltersqp-uninstalled.pc.in

    r1548 r1682  
    55Description: FilterSQP
    66Version: @PACKAGE_VERSION@
    7 Libs: -L${libdir} -lfiltersqp @ADDLIBS@
     7Libs: -L${libdir} -lfiltersqp @FILTERSQP_PCLIBS@
    88Cflags:
  • ThirdParty/FilterSQP/trunk/coinfiltersqp.pc.in

    r1548 r1682  
    55Description: FilterSQP
    66Version: @PACKAGE_VERSION@
    7 Libs: -L${libdir} -lfiltersqp @ADDLIBS@
     7Libs: -L${libdir} -lfiltersqp @FILTERSQP_PCLIBS@
    88Cflags:
  • ThirdParty/FilterSQP/trunk/configure

    r1670 r1682  
    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 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 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 ADDLIBS PCADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE have_svnversion FILTERSQP_SVN_REV 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 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
     
    16481648fi
    16491649
    1650 # Set the project's SVN revision number
     1650# Set the project's SVN revision number. The complicated sed expression
     1651# (made worse by quadrigraphs) ensures that things like 4123:4168MS end up
     1652# as a single number.
    16511653# Extract the first word of "svnversion", so it can be a program name with args.
    16521654set dummy svnversion; ac_word=$2
     
    16871689if test "x$have_svnversion" = xyes && test "xFilterSQP" != x; then
    16881690
    1689   FILTERSQP_SVN_REV=`cd $srcdir/$coin_has_filtersqp ; svnversion`
     1691  svn_rev_tmp=`cd $srcdir/$coin_has_filtersqp ; svnversion`
     1692  FILTERSQP_SVN_REV=`echo $svn_rev_tmp | sed -n -e 's/^[0-9]*://' -e 's/\([0-9]\)[^0-9]*$/\1/p'`
    16901693  if test $FILTERSQP_SVN_REV != exported; then
    16911694
    16921695cat >>confdefs.h <<_ACEOF
    1693 #define FILTERSQP_SVN_REV "$FILTERSQP_SVN_REV"
     1696#define FILTERSQP_SVN_REV $FILTERSQP_SVN_REV
    16941697_ACEOF
    16951698
     
    33633366
    33643367# Provide some information about the compiler.
    3365 echo "$as_me:3365:" \
     3368echo "$as_me:3368:" \
    33663369     "checking for Fortran 77 compiler version" >&5
    33673370ac_compiler=`set X $ac_compile; echo $2`
     
    39313934ac_save_FFLAGS=$FFLAGS
    39323935FFLAGS="$FFLAGS $ac_verb"
    3933 (eval echo $as_me:3933: \"$ac_link\") >&5
     3936(eval echo $as_me:3936: \"$ac_link\") >&5
    39343937ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    39353938echo "$ac_f77_v_output" >&5
     
    40094012ac_save_FFLAGS=$FFLAGS
    40104013FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    4011 (eval echo $as_me:4011: \"$ac_link\") >&5
     4014(eval echo $as_me:4014: \"$ac_link\") >&5
    40124015ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    40134016echo "$ac_f77_v_output" >&5
     
    47604763
    47614764
    4762 # Tell FINALIZE to add FLIBS to ADDLIBS, so that they get into the .pc files
    4763 coin_need_flibs=yes
     4765# Add FLIBS to FILTERSQP_PCLIBS, so that they get into the .pc files
     4766FILTERSQP_PCLIBS="$FLIBS"
     4767
    47644768
    47654769# Check if pkg-config is available (to setup addlibs file)
     
    72387242*-*-irix6*)
    72397243  # Find out which ABI we are using.
    7240   echo '#line 7240 "configure"' > conftest.$ac_ext
     7244  echo '#line 7244 "configure"' > conftest.$ac_ext
    72417245  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    72427246  (eval $ac_compile) 2>&5
     
    98249828   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    98259829   -e 's:$: $lt_compiler_flag:'`
    9826    (eval echo "\"\$as_me:9826: $lt_compile\"" >&5)
     9830   (eval echo "\"\$as_me:9830: $lt_compile\"" >&5)
    98279831   (eval "$lt_compile" 2>conftest.err)
    98289832   ac_status=$?
    98299833   cat conftest.err >&5
    9830    echo "$as_me:9830: \$? = $ac_status" >&5
     9834   echo "$as_me:9834: \$? = $ac_status" >&5
    98319835   if (exit $ac_status) && test -s "$ac_outfile"; then
    98329836     # The compiler can only warn and ignore the option if not recognized
     
    1009210096   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1009310097   -e 's:$: $lt_compiler_flag:'`
    10094    (eval echo "\"\$as_me:10094: $lt_compile\"" >&5)
     10098   (eval echo "\"\$as_me:10098: $lt_compile\"" >&5)
    1009510099   (eval "$lt_compile" 2>conftest.err)
    1009610100   ac_status=$?
    1009710101   cat conftest.err >&5
    10098    echo "$as_me:10098: \$? = $ac_status" >&5
     10102   echo "$as_me:10102: \$? = $ac_status" >&5
    1009910103   if (exit $ac_status) && test -s "$ac_outfile"; then
    1010010104     # The compiler can only warn and ignore the option if not recognized
     
    1019610200   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1019710201   -e 's:$: $lt_compiler_flag:'`
    10198    (eval echo "\"\$as_me:10198: $lt_compile\"" >&5)
     10202   (eval echo "\"\$as_me:10202: $lt_compile\"" >&5)
    1019910203   (eval "$lt_compile" 2>out/conftest.err)
    1020010204   ac_status=$?
    1020110205   cat out/conftest.err >&5
    10202    echo "$as_me:10202: \$? = $ac_status" >&5
     10206   echo "$as_me:10206: \$? = $ac_status" >&5
    1020310207   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1020410208   then
     
    1261312617  lt_status=$lt_dlunknown
    1261412618  cat > conftest.$ac_ext <<EOF
    12615 #line 12615 "configure"
     12619#line 12619 "configure"
    1261612620#include "confdefs.h"
    1261712621
     
    1271312717  lt_status=$lt_dlunknown
    1271412718  cat > conftest.$ac_ext <<EOF
    12715 #line 12715 "configure"
     12719#line 12719 "configure"
    1271612720#include "confdefs.h"
    1271712721
     
    1507315077   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1507415078   -e 's:$: $lt_compiler_flag:'`
    15075    (eval echo "\"\$as_me:15075: $lt_compile\"" >&5)
     15079   (eval echo "\"\$as_me:15079: $lt_compile\"" >&5)
    1507615080   (eval "$lt_compile" 2>conftest.err)
    1507715081   ac_status=$?
    1507815082   cat conftest.err >&5
    15079    echo "$as_me:15079: \$? = $ac_status" >&5
     15083   echo "$as_me:15083: \$? = $ac_status" >&5
    1508015084   if (exit $ac_status) && test -s "$ac_outfile"; then
    1508115085     # The compiler can only warn and ignore the option if not recognized
     
    1517715181   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1517815182   -e 's:$: $lt_compiler_flag:'`
    15179    (eval echo "\"\$as_me:15179: $lt_compile\"" >&5)
     15183   (eval echo "\"\$as_me:15183: $lt_compile\"" >&5)
    1518015184   (eval "$lt_compile" 2>out/conftest.err)
    1518115185   ac_status=$?
    1518215186   cat out/conftest.err >&5
    15183    echo "$as_me:15183: \$? = $ac_status" >&5
     15187   echo "$as_me:15187: \$? = $ac_status" >&5
    1518415188   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1518515189   then
     
    1674716751   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1674816752   -e 's:$: $lt_compiler_flag:'`
    16749    (eval echo "\"\$as_me:16749: $lt_compile\"" >&5)
     16753   (eval echo "\"\$as_me:16753: $lt_compile\"" >&5)
    1675016754   (eval "$lt_compile" 2>conftest.err)
    1675116755   ac_status=$?
    1675216756   cat conftest.err >&5
    16753    echo "$as_me:16753: \$? = $ac_status" >&5
     16757   echo "$as_me:16757: \$? = $ac_status" >&5
    1675416758   if (exit $ac_status) && test -s "$ac_outfile"; then
    1675516759     # The compiler can only warn and ignore the option if not recognized
     
    1685116855   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1685216856   -e 's:$: $lt_compiler_flag:'`
    16853    (eval echo "\"\$as_me:16853: $lt_compile\"" >&5)
     16857   (eval echo "\"\$as_me:16857: $lt_compile\"" >&5)
    1685416858   (eval "$lt_compile" 2>out/conftest.err)
    1685516859   ac_status=$?
    1685616860   cat out/conftest.err >&5
    16857    echo "$as_me:16857: \$? = $ac_status" >&5
     16861   echo "$as_me:16861: \$? = $ac_status" >&5
    1685816862   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1685916863   then
     
    1905819062   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1905919063   -e 's:$: $lt_compiler_flag:'`
    19060    (eval echo "\"\$as_me:19060: $lt_compile\"" >&5)
     19064   (eval echo "\"\$as_me:19064: $lt_compile\"" >&5)
    1906119065   (eval "$lt_compile" 2>conftest.err)
    1906219066   ac_status=$?
    1906319067   cat conftest.err >&5
    19064    echo "$as_me:19064: \$? = $ac_status" >&5
     19068   echo "$as_me:19068: \$? = $ac_status" >&5
    1906519069   if (exit $ac_status) && test -s "$ac_outfile"; then
    1906619070     # The compiler can only warn and ignore the option if not recognized
     
    1932619330   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1932719331   -e 's:$: $lt_compiler_flag:'`
    19328    (eval echo "\"\$as_me:19328: $lt_compile\"" >&5)
     19332   (eval echo "\"\$as_me:19332: $lt_compile\"" >&5)
    1932919333   (eval "$lt_compile" 2>conftest.err)
    1933019334   ac_status=$?
    1933119335   cat conftest.err >&5
    19332    echo "$as_me:19332: \$? = $ac_status" >&5
     19336   echo "$as_me:19336: \$? = $ac_status" >&5
    1933319337   if (exit $ac_status) && test -s "$ac_outfile"; then
    1933419338     # The compiler can only warn and ignore the option if not recognized
     
    1943019434   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1943119435   -e 's:$: $lt_compiler_flag:'`
    19432    (eval echo "\"\$as_me:19432: $lt_compile\"" >&5)
     19436   (eval echo "\"\$as_me:19436: $lt_compile\"" >&5)
    1943319437   (eval "$lt_compile" 2>out/conftest.err)
    1943419438   ac_status=$?
    1943519439   cat out/conftest.err >&5
    19436    echo "$as_me:19436: \$? = $ac_status" >&5
     19440   echo "$as_me:19440: \$? = $ac_status" >&5
    1943719441   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1943819442   then
     
    2317723181s,@MPIF77@,$MPIF77,;t t
    2317823182s,@FLIBS@,$FLIBS,;t t
     23183s,@FILTERSQP_PCLIBS@,$FILTERSQP_PCLIBS,;t t
    2317923184s,@PKG_CONFIG@,$PKG_CONFIG,;t t
    2318023185s,@ac_pt_PKG_CONFIG@,$ac_pt_PKG_CONFIG,;t t
  • ThirdParty/FilterSQP/trunk/configure.ac

    r1584 r1682  
    4949AC_COIN_F77_WRAPPERS
    5050
    51 # Tell FINALIZE to add FLIBS to ADDLIBS, so that they get into the .pc files
    52 coin_need_flibs=yes
     51# Add FLIBS to FILTERSQP_PCLIBS, so that they get into the .pc files
     52FILTERSQP_PCLIBS="$FLIBS"
     53AC_SUBST(FILTERSQP_PCLIBS)
    5354
    5455# Check if pkg-config is available (to setup addlibs file)
Note: See TracChangeset for help on using the changeset viewer.