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

rerun autotools; improve setup of addlibs file

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

Legend:

Unmodified
Added
Removed

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

    r1539 r1542  
    4545
    4646asl_addlibs.txt : coinasl.pc
    47         PKG_CONFIG_PATH=.:$(libdir)/pkgconfig:${PKG_CONFIG_PATH} $(PKG_CONFIG) --libs coinasl > asl_addlibs.txt
     47        PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs coinasl > asl_addlibs.txt
    4848endif
    4949

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

    r1539 r1542  
    130130COIN_HAS_PKGCONFIG_FALSE = @COIN_HAS_PKGCONFIG_FALSE@
    131131COIN_HAS_PKGCONFIG_TRUE = @COIN_HAS_PKGCONFIG_TRUE@
     132COIN_PKG_CONFIG_PATH = @COIN_PKG_CONFIG_PATH@
    132133CPP = @CPP@
    133134CPPFLAGS = @CPPFLAGS@
    … …  
    685686
    686687@COIN_HAS_PKGCONFIG_TRUE@asl_addlibs.txt : coinasl.pc
    687 @COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:$(libdir)/pkgconfig:${PKG_CONFIG_PATH} $(PKG_CONFIG) --libs coinasl > asl_addlibs.txt
     688@COIN_HAS_PKGCONFIG_TRUE@       PKG_CONFIG_PATH=.:@COIN_PKG_CONFIG_PATH@ $(PKG_CONFIG) --libs coinasl > asl_addlibs.txt
    688689
    689690install-doc: $(DocFiles)

  • ThirdParty/ASL/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 build build_cpu build_vendor build_os ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE EGREP LN_S CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC 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 ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE AMPLSOLVER_A ABSPATH_AMPLSOLVER_INSTALLED ABSPATH_AMPLSOLVER_UNINSTALLED ASLMAKEFLAGS MSVC_COMPILE_TRUE MSVC_COMPILE_FALSE 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 build build_cpu build_vendor build_os ADDLIBS FADDLIBS ALWAYS_FALSE_TRUE ALWAYS_FALSE_FALSE EGREP LN_S CDEFS ADD_CFLAGS DBG_CFLAGS OPT_CFLAGS sol_cc_compiler CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT MPICC 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 ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE CXXCPP F77 FFLAGS ac_ct_F77 LIBTOOL ac_c_preproc_warn_flag ac_cxx_preproc_warn_flag RPATH_FLAGS LT_LDFLAGS PKG_CONFIG ac_pt_PKG_CONFIG COIN_HAS_PKGCONFIG_TRUE COIN_HAS_PKGCONFIG_FALSE COIN_PKG_CONFIG_PATH AMPLSOLVER_A ABSPATH_AMPLSOLVER_INSTALLED ABSPATH_AMPLSOLVER_UNINSTALLED ASLMAKEFLAGS MSVC_COMPILE_TRUE MSVC_COMPILE_FALSE LIBEXT VPATH_DISTCLEANFILES ABSBUILDDIR LIBOBJS LTLIBOBJS'
    476476ac_subst_files=''
    477477
    … …  
    10931093  --with-tags[=TAGS]
    10941094                          include additional configurations [automatic]
     1095  --with-coin-instdir     prefix of installation directory for precompiled
     1096                          COIN packages
    10951097
    10961098Some influential environment variables:
    … …  
    47414743*-*-irix6*)
    47424744  # Find out which ABI we are using.
    4743   echo '#line 4743 "configure"' > conftest.$ac_ext
     4745  echo '#line 4745 "configure"' > conftest.$ac_ext
    47444746  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    47454747  (eval $ac_compile) 2>&5
    … …  
    63406342
    63416343# Provide some information about the compiler.
    6342 echo "$as_me:6342:" \
     6344echo "$as_me:6344:" \
    63436345     "checking for Fortran 77 compiler version" >&5
    63446346ac_compiler=`set X $ac_compile; echo $2`
    … …  
    74077409   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    74087410   -e 's:$: $lt_compiler_flag:'`
    7409    (eval echo "\"\$as_me:7409: $lt_compile\"" >&5)
     7411   (eval echo "\"\$as_me:7411: $lt_compile\"" >&5)
    74107412   (eval "$lt_compile" 2>conftest.err)
    74117413   ac_status=$?
    74127414   cat conftest.err >&5
    7413    echo "$as_me:7413: \$? = $ac_status" >&5
     7415   echo "$as_me:7415: \$? = $ac_status" >&5
    74147416   if (exit $ac_status) && test -s "$ac_outfile"; then
    74157417     # The compiler can only warn and ignore the option if not recognized
    … …  
    76757677   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    76767678   -e 's:$: $lt_compiler_flag:'`
    7677    (eval echo "\"\$as_me:7677: $lt_compile\"" >&5)
     7679   (eval echo "\"\$as_me:7679: $lt_compile\"" >&5)
    76787680   (eval "$lt_compile" 2>conftest.err)
    76797681   ac_status=$?
    76807682   cat conftest.err >&5
    7681    echo "$as_me:7681: \$? = $ac_status" >&5
     7683   echo "$as_me:7683: \$? = $ac_status" >&5
    76827684   if (exit $ac_status) && test -s "$ac_outfile"; then
    76837685     # The compiler can only warn and ignore the option if not recognized
    … …  
    77797781   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    77807782   -e 's:$: $lt_compiler_flag:'`
    7781    (eval echo "\"\$as_me:7781: $lt_compile\"" >&5)
     7783   (eval echo "\"\$as_me:7783: $lt_compile\"" >&5)
    77827784   (eval "$lt_compile" 2>out/conftest.err)
    77837785   ac_status=$?
    77847786   cat out/conftest.err >&5
    7785    echo "$as_me:7785: \$? = $ac_status" >&5
     7787   echo "$as_me:7787: \$? = $ac_status" >&5
    77867788   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    77877789   then
    … …  
    1012410126  lt_status=$lt_dlunknown
    1012510127  cat > conftest.$ac_ext <<EOF
    10126 #line 10126 "configure"
     10128#line 10128 "configure"
    1012710129#include "confdefs.h"
    1012810130
    … …  
    1022410226  lt_status=$lt_dlunknown
    1022510227  cat > conftest.$ac_ext <<EOF
    10226 #line 10226 "configure"
     10228#line 10228 "configure"
    1022710229#include "confdefs.h"
    1022810230
    … …  
    1256812570   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1256912571   -e 's:$: $lt_compiler_flag:'`
    12570    (eval echo "\"\$as_me:12570: $lt_compile\"" >&5)
     12572   (eval echo "\"\$as_me:12572: $lt_compile\"" >&5)
    1257112573   (eval "$lt_compile" 2>conftest.err)
    1257212574   ac_status=$?
    1257312575   cat conftest.err >&5
    12574    echo "$as_me:12574: \$? = $ac_status" >&5
     12576   echo "$as_me:12576: \$? = $ac_status" >&5
    1257512577   if (exit $ac_status) && test -s "$ac_outfile"; then
    1257612578     # The compiler can only warn and ignore the option if not recognized
    … …  
    1267212674   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1267312675   -e 's:$: $lt_compiler_flag:'`
    12674    (eval echo "\"\$as_me:12674: $lt_compile\"" >&5)
     12676   (eval echo "\"\$as_me:12676: $lt_compile\"" >&5)
    1267512677   (eval "$lt_compile" 2>out/conftest.err)
    1267612678   ac_status=$?
    1267712679   cat out/conftest.err >&5
    12678    echo "$as_me:12678: \$? = $ac_status" >&5
     12680   echo "$as_me:12680: \$? = $ac_status" >&5
    1267912681   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1268012682   then
    … …  
    1424214244   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1424314245   -e 's:$: $lt_compiler_flag:'`
    14244    (eval echo "\"\$as_me:14244: $lt_compile\"" >&5)
     14246   (eval echo "\"\$as_me:14246: $lt_compile\"" >&5)
    1424514247   (eval "$lt_compile" 2>conftest.err)
    1424614248   ac_status=$?
    1424714249   cat conftest.err >&5
    14248    echo "$as_me:14248: \$? = $ac_status" >&5
     14250   echo "$as_me:14250: \$? = $ac_status" >&5
    1424914251   if (exit $ac_status) && test -s "$ac_outfile"; then
    1425014252     # The compiler can only warn and ignore the option if not recognized
    … …  
    1434614348   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1434714349   -e 's:$: $lt_compiler_flag:'`
    14348    (eval echo "\"\$as_me:14348: $lt_compile\"" >&5)
     14350   (eval echo "\"\$as_me:14350: $lt_compile\"" >&5)
    1434914351   (eval "$lt_compile" 2>out/conftest.err)
    1435014352   ac_status=$?
    1435114353   cat out/conftest.err >&5
    14352    echo "$as_me:14352: \$? = $ac_status" >&5
     14354   echo "$as_me:14354: \$? = $ac_status" >&5
    1435314355   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1435414356   then
    … …  
    1655316555   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1655416556   -e 's:$: $lt_compiler_flag:'`
    16555    (eval echo "\"\$as_me:16555: $lt_compile\"" >&5)
     16557   (eval echo "\"\$as_me:16557: $lt_compile\"" >&5)
    1655616558   (eval "$lt_compile" 2>conftest.err)
    1655716559   ac_status=$?
    1655816560   cat conftest.err >&5
    16559    echo "$as_me:16559: \$? = $ac_status" >&5
     16561   echo "$as_me:16561: \$? = $ac_status" >&5
    1656016562   if (exit $ac_status) && test -s "$ac_outfile"; then
    1656116563     # The compiler can only warn and ignore the option if not recognized
    … …  
    1682116823   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1682216824   -e 's:$: $lt_compiler_flag:'`
    16823    (eval echo "\"\$as_me:16823: $lt_compile\"" >&5)
     16825   (eval echo "\"\$as_me:16825: $lt_compile\"" >&5)
    1682416826   (eval "$lt_compile" 2>conftest.err)
    1682516827   ac_status=$?
    1682616828   cat conftest.err >&5
    16827    echo "$as_me:16827: \$? = $ac_status" >&5
     16829   echo "$as_me:16829: \$? = $ac_status" >&5
    1682816830   if (exit $ac_status) && test -s "$ac_outfile"; then
    1682916831     # The compiler can only warn and ignore the option if not recognized
    … …  
    1692516927   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1692616928   -e 's:$: $lt_compiler_flag:'`
    16927    (eval echo "\"\$as_me:16927: $lt_compile\"" >&5)
     16929   (eval echo "\"\$as_me:16929: $lt_compile\"" >&5)
    1692816930   (eval "$lt_compile" 2>out/conftest.err)
    1692916931   ac_status=$?
    1693016932   cat out/conftest.err >&5
    16931    echo "$as_me:16931: \$? = $ac_status" >&5
     16933   echo "$as_me:16933: \$? = $ac_status" >&5
    1693216934   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1693316935   then
    … …  
    1996219964
    1996319965
     19966
     19967# assemble search path for pkg-config, if we are in a project setup
     19968if test x$coin_projectdir = xyes ; then
     19969  COIN_PKG_CONFIG_PATH="$PKG_CONFIG_PATH"
     19970
     19971  # 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
     19972  # best would actually to use ${libdir}, since .pc files get installed into ${libdir}/pkgconfig,
     19973  # unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
     19974  if test -d "${prefix}"; then
     19975    COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     19976  fi
     19977
     19978
     19979# Check whether --with-coin-instdir or --without-coin-instdir was given.
     19980if test "${with_coin_instdir+set}" = set; then
     19981  withval="$with_coin_instdir"
     19982  if test -d "$withval"; then : ; else
     19983       { { echo "$as_me:$LINENO: error: argument for --with-coin-instdir not a directory" >&5
     19984echo "$as_me: error: argument for --with-coin-instdir not a directory" >&2;}
     19985   { (exit 1); exit 1; }; }
     19986     fi
     19987     COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     19988
     19989fi;
     19990
     19991  # in a classic setup, we want to find uninstalled projects
     19992  # their (relative) location is written to coin_subdirs.txt by the configure in the project base directory
     19993  # unfortunately, if the user set prefix, then we do not know where the project base directory is located
     19994  # 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)
     19995  if test -e ../coin_subdirs.txt ; then
     19996    for i in `cat ../coin_subdirs.txt` ; do
     19997      COIN_PKG_CONFIG_PATH="`cd ../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     19998    done
     19999  fi
     20000
     20001  if test -e ../../coin_subdirs.txt ; then
     20002    for i in `cat ../../coin_subdirs.txt` ; do
     20003      COIN_PKG_CONFIG_PATH="`cd ../../$i; pwd`:${COIN_PKG_CONFIG_PATH}"
     20004    done
     20005  fi
     20006
     20007
     20008fi
    1996420009
    1996520010
    … …  
    2109521140s,@COIN_HAS_PKGCONFIG_TRUE@,$COIN_HAS_PKGCONFIG_TRUE,;t t
    2109621141s,@COIN_HAS_PKGCONFIG_FALSE@,$COIN_HAS_PKGCONFIG_FALSE,;t t
     21142s,@COIN_PKG_CONFIG_PATH@,$COIN_PKG_CONFIG_PATH,;t t
    2109721143s,@AMPLSOLVER_A@,$AMPLSOLVER_A,;t t
    2109821144s,@ABSPATH_AMPLSOLVER_INSTALLED@,$ABSPATH_AMPLSOLVER_INSTALLED,;t t
Note: See TracChangeset for help on using the changeset viewer.