Changeset 2121 for ThirdParty/ASL


Ignore:
Timestamp:
Mar 12, 2011 3:13:50 PM (9 years ago)
Author:
stefan
Message:

rerun autotools

Location:
ThirdParty/ASL/trunk
Files:
2 edited

Legend:

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

    r2078 r2121  
    5858        $(thirdpartyinclude_HEADERS) $(top_srcdir)/configure \
    5959        config.guess config.sub depcomp install-sh ltmain.sh missing
    60 @HAVE_EXTERNALS_TRUE@am__append_1 = Externals
    61 @HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
     60@HAVE_EXTERNALS_TRUE@am__append_1 = Dependencies
     61@HAVE_EXTERNALS_TRUE@am__append_2 = .Dependencies-stamp
    6262subdir = .
    6363ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    704704@MAINTAINER_MODE_TRUE@  cp $< $@
    705705
    706 # Take care of updating externals (if Externals file exists)
    707 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@$(top_builddir)/Makefile: .Externals-stamp
    708 
    709 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@.Externals-stamp: $(srcdir)/Externals
    710 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn propset svn:externals -F Externals .
    711 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Externals-stamp
    712 
    713 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Externals-stamp
     706# Take care of updating externals (if Dependencies file exists)
     707@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@$(top_builddir)/Makefile: .Dependencies-stamp
     708
     709@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@.Dependencies-stamp: $(srcdir)/Dependencies
     710@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); BuildTools/set_externals Dependencies
     711@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     touch .Dependencies-stamp
     712
     713@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@update-externals: .Dependencies-stamp
    714714@HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@     cd $(srcdir); svn update
    715715
  • ThirdParty/ASL/trunk/configure

    r2051 r2121  
    16721672coin_projectdir=yes
    16731673
    1674 # Set the project's version number
    1675 if test "xASL" != x; then
     1674# Set the project's version numbers
     1675
    16761676
    16771677cat >>confdefs.h <<_ACEOF
     
    16791679_ACEOF
    16801680
    1681 fi
    1682 
    1683 # Set the project's SVN revision number. The complicated sed expression
    1684 # (made worse by quadrigraphs) ensures that things like 4123:4168MS end up
    1685 # as a single number.
    1686 # Extract the first word of "svnversion", so it can be a program name with args.
     1681
     1682  coin_majorver=`echo $PACKAGE_VERSION | sed -n -e 's/^\([0-9]*\).*/\1/gp'`
     1683  coin_minorver=`echo $PACKAGE_VERSION | sed -n -e 's/^[0-9]*\.\([0-9]*\).*/\1/gp'`
     1684  coin_releasever=`echo $PACKAGE_VERSION | sed -n -e 's/^[0-9]*\.[0-9]*\.\([0-9]*\).*/\1/gp'`
     1685  if test "x$coin_majorver" = x ; then coin_majorver=9999 ; fi
     1686  if test "x$coin_minorver" = x ; then coin_minorver=9999 ; fi
     1687  if test "x$coin_releasever" = x ; then coin_releasever=9999 ; fi
     1688
     1689cat >>confdefs.h <<_ACEOF
     1690#define ASL_VERSION_MAJOR $coin_majorver
     1691_ACEOF
     1692
     1693
     1694cat >>confdefs.h <<_ACEOF
     1695#define ASL_VERSION_MINOR $coin_minorver
     1696_ACEOF
     1697
     1698
     1699cat >>confdefs.h <<_ACEOF
     1700#define ASL_VERSION_RELEASE $coin_releasever
     1701_ACEOF
     1702
     1703
     1704  # We use the following variable to have a string with the upper case
     1705  # version of the project name
     1706  COIN_PRJCT=ASL
     1707
     1708  # Set the project's SVN revision number. The complicated sed expression
     1709  # (made worse by quadrigraphs) ensures that things like 4123:4168MS end up
     1710  # as a single number.
     1711  # Extract the first word of "svnversion", so it can be a program name with args.
    16871712set dummy svnversion; ac_word=$2
    16881713echo "$as_me:$LINENO: checking for $ac_word" >&5
     
    17201745fi
    17211746
    1722 if test "x$have_svnversion" = xyes && test "xASL" != x; then
    1723 
    1724   svn_rev_tmp=`cd $srcdir/$coin_has_asl ; svnversion`
    1725   ASL_SVN_REV=`echo $svn_rev_tmp | sed -n -e 's/^[0-9]*://' -e 's/\([0-9]\)[^0-9]*$/\1/p'`
    1726   if test $ASL_SVN_REV != exported; then
     1747  if test "x$have_svnversion" = xyes; then
     1748
     1749    svn_rev_tmp=`cd $srcdir/$coin_has_asl ; svnversion`
     1750    ASL_SVN_REV=`echo $svn_rev_tmp | sed -n -e 's/^[0-9]*://' -e 's/\([0-9]\)[^0-9]*$/\1/p'`
     1751    if test $ASL_SVN_REV != exported; then
    17271752
    17281753cat >>confdefs.h <<_ACEOF
     
    17301755_ACEOF
    17311756
     1757    fi
    17321758  fi
    1733 fi
     1759
     1760
    17341761
    17351762# Capture libtool library version, if given.
     1763
    17361764
    17371765
     
    18261854#define COIN_ASL_CHECKLEVEL $coin_asl_checklevel
    18271855_ACEOF
    1828 
    1829 
    1830 # We use the following variable to have a string with the upper case
    1831 # version of the project name
    1832 COIN_PRJCT=ASL
    18331856
    18341857
     
    28012824        coin_add_cflags="-pipe"
    28022825        coin_dbg_cflags="-g"
    2803         coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas"
     2826        coin_warn_cflags="-Wimplicit -Wparentheses -Wsequence-point -Wreturn-type -Wcast-qual -Wall -Wno-unknown-pragmas -Wno-long-long"
    28042827        case $build in
    28052828          *-darwin*)
     
    36123635
    36133636
     3637
    36143638# AC_MSG_NOTICE([Beginning automake initialisation.])
    36153639# Stuff for automake
     
    41454169
    41464170
    4147   # Check if we have an Externals file
    4148   if test -r $srcdir/Externals; then
     4171  # Check if we have an Dependencies file
     4172  if test -r $srcdir/Dependencies; then
    41494173    coin_have_externals=yes
    41504174  fi
     
    42194243        { { echo "$as_me:$LINENO: error: Cannot find the BuildTools directory" >&5
    42204244echo "$as_me: error: Cannot find the BuildTools directory" >&2;}
    4221    { (exit 1); exit 1; }; }
     4245   { (exit better disable maintainer mode.); exit better disable maintainer mode.; }; }
    42224246      fi
    42234247    fi
    42244248  fi
    42254249
     4250
     4251  # for running automake by make, we need to have Makemain.inc available at the place where it usually can be found during run_autotools
     4252  if test "$BUILDTOOLSDIR" != "$srcdir/BuildTools" ; then
     4253    $LN_S `cd $BUILDTOOLSDIR; pwd` "$srcdir/BuildTools"
     4254  fi
    42264255
    42274256  # The following variable is set to the name of the directory where
     
    48164845*-*-irix6*)
    48174846  # Find out which ABI we are using.
    4818   echo '#line 4818 "configure"' > conftest.$ac_ext
     4847  echo '#line 4847 "configure"' > conftest.$ac_ext
    48194848  if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    48204849  (eval $ac_compile) 2>&5
     
    64156444
    64166445# Provide some information about the compiler.
    6417 echo "$as_me:6417:" \
     6446echo "$as_me:6446:" \
    64186447     "checking for Fortran 77 compiler version" >&5
    64196448ac_compiler=`set X $ac_compile; echo $2`
     
    74827511   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    74837512   -e 's:$: $lt_compiler_flag:'`
    7484    (eval echo "\"\$as_me:7484: $lt_compile\"" >&5)
     7513   (eval echo "\"\$as_me:7513: $lt_compile\"" >&5)
    74857514   (eval "$lt_compile" 2>conftest.err)
    74867515   ac_status=$?
    74877516   cat conftest.err >&5
    7488    echo "$as_me:7488: \$? = $ac_status" >&5
     7517   echo "$as_me:7517: \$? = $ac_status" >&5
    74897518   if (exit $ac_status) && test -s "$ac_outfile"; then
    74907519     # The compiler can only warn and ignore the option if not recognized
     
    77507779   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    77517780   -e 's:$: $lt_compiler_flag:'`
    7752    (eval echo "\"\$as_me:7752: $lt_compile\"" >&5)
     7781   (eval echo "\"\$as_me:7781: $lt_compile\"" >&5)
    77537782   (eval "$lt_compile" 2>conftest.err)
    77547783   ac_status=$?
    77557784   cat conftest.err >&5
    7756    echo "$as_me:7756: \$? = $ac_status" >&5
     7785   echo "$as_me:7785: \$? = $ac_status" >&5
    77577786   if (exit $ac_status) && test -s "$ac_outfile"; then
    77587787     # The compiler can only warn and ignore the option if not recognized
     
    78547883   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    78557884   -e 's:$: $lt_compiler_flag:'`
    7856    (eval echo "\"\$as_me:7856: $lt_compile\"" >&5)
     7885   (eval echo "\"\$as_me:7885: $lt_compile\"" >&5)
    78577886   (eval "$lt_compile" 2>out/conftest.err)
    78587887   ac_status=$?
    78597888   cat out/conftest.err >&5
    7860    echo "$as_me:7860: \$? = $ac_status" >&5
     7889   echo "$as_me:7889: \$? = $ac_status" >&5
    78617890   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    78627891   then
     
    1019910228  lt_status=$lt_dlunknown
    1020010229  cat > conftest.$ac_ext <<EOF
    10201 #line 10201 "configure"
     10230#line 10230 "configure"
    1020210231#include "confdefs.h"
    1020310232
     
    1029910328  lt_status=$lt_dlunknown
    1030010329  cat > conftest.$ac_ext <<EOF
    10301 #line 10301 "configure"
     10330#line 10330 "configure"
    1030210331#include "confdefs.h"
    1030310332
     
    1264312672   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1264412673   -e 's:$: $lt_compiler_flag:'`
    12645    (eval echo "\"\$as_me:12645: $lt_compile\"" >&5)
     12674   (eval echo "\"\$as_me:12674: $lt_compile\"" >&5)
    1264612675   (eval "$lt_compile" 2>conftest.err)
    1264712676   ac_status=$?
    1264812677   cat conftest.err >&5
    12649    echo "$as_me:12649: \$? = $ac_status" >&5
     12678   echo "$as_me:12678: \$? = $ac_status" >&5
    1265012679   if (exit $ac_status) && test -s "$ac_outfile"; then
    1265112680     # The compiler can only warn and ignore the option if not recognized
     
    1274712776   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1274812777   -e 's:$: $lt_compiler_flag:'`
    12749    (eval echo "\"\$as_me:12749: $lt_compile\"" >&5)
     12778   (eval echo "\"\$as_me:12778: $lt_compile\"" >&5)
    1275012779   (eval "$lt_compile" 2>out/conftest.err)
    1275112780   ac_status=$?
    1275212781   cat out/conftest.err >&5
    12753    echo "$as_me:12753: \$? = $ac_status" >&5
     12782   echo "$as_me:12782: \$? = $ac_status" >&5
    1275412783   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1275512784   then
     
    1431714346   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1431814347   -e 's:$: $lt_compiler_flag:'`
    14319    (eval echo "\"\$as_me:14319: $lt_compile\"" >&5)
     14348   (eval echo "\"\$as_me:14348: $lt_compile\"" >&5)
    1432014349   (eval "$lt_compile" 2>conftest.err)
    1432114350   ac_status=$?
    1432214351   cat conftest.err >&5
    14323    echo "$as_me:14323: \$? = $ac_status" >&5
     14352   echo "$as_me:14352: \$? = $ac_status" >&5
    1432414353   if (exit $ac_status) && test -s "$ac_outfile"; then
    1432514354     # The compiler can only warn and ignore the option if not recognized
     
    1442114450   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1442214451   -e 's:$: $lt_compiler_flag:'`
    14423    (eval echo "\"\$as_me:14423: $lt_compile\"" >&5)
     14452   (eval echo "\"\$as_me:14452: $lt_compile\"" >&5)
    1442414453   (eval "$lt_compile" 2>out/conftest.err)
    1442514454   ac_status=$?
    1442614455   cat out/conftest.err >&5
    14427    echo "$as_me:14427: \$? = $ac_status" >&5
     14456   echo "$as_me:14456: \$? = $ac_status" >&5
    1442814457   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1442914458   then
     
    1662816657   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1662916658   -e 's:$: $lt_compiler_flag:'`
    16630    (eval echo "\"\$as_me:16630: $lt_compile\"" >&5)
     16659   (eval echo "\"\$as_me:16659: $lt_compile\"" >&5)
    1663116660   (eval "$lt_compile" 2>conftest.err)
    1663216661   ac_status=$?
    1663316662   cat conftest.err >&5
    16634    echo "$as_me:16634: \$? = $ac_status" >&5
     16663   echo "$as_me:16663: \$? = $ac_status" >&5
    1663516664   if (exit $ac_status) && test -s "$ac_outfile"; then
    1663616665     # The compiler can only warn and ignore the option if not recognized
     
    1689616925   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1689716926   -e 's:$: $lt_compiler_flag:'`
    16898    (eval echo "\"\$as_me:16898: $lt_compile\"" >&5)
     16927   (eval echo "\"\$as_me:16927: $lt_compile\"" >&5)
    1689916928   (eval "$lt_compile" 2>conftest.err)
    1690016929   ac_status=$?
    1690116930   cat conftest.err >&5
    16902    echo "$as_me:16902: \$? = $ac_status" >&5
     16931   echo "$as_me:16931: \$? = $ac_status" >&5
    1690316932   if (exit $ac_status) && test -s "$ac_outfile"; then
    1690416933     # The compiler can only warn and ignore the option if not recognized
     
    1700017029   -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    1700117030   -e 's:$: $lt_compiler_flag:'`
    17002    (eval echo "\"\$as_me:17002: $lt_compile\"" >&5)
     17031   (eval echo "\"\$as_me:17031: $lt_compile\"" >&5)
    1700317032   (eval "$lt_compile" 2>out/conftest.err)
    1700417033   ac_status=$?
    1700517034   cat out/conftest.err >&5
    17006    echo "$as_me:17006: \$? = $ac_status" >&5
     17035   echo "$as_me:17035: \$? = $ac_status" >&5
    1700717036   if (exit $ac_status) && test -s out/conftest2.$ac_objext
    1700817037   then
     
    2000420033  fi
    2000520034  if test -n "$PKG_CONFIG"; then
    20006     _pkg_min_version=0.9.0
     20035    _pkg_min_version=0.16.0
    2000720036    echo "$as_me:$LINENO: checking pkg-config is at least version $_pkg_min_version" >&5
    2000820037echo $ECHO_N "checking pkg-config is at least version $_pkg_min_version... $ECHO_C" >&6
     
    2004520074# unfortunately, ${libdir} expands to ${exec_prefix}/lib and ${exec_prefix} to ${prefix}...
    2004620075if test "x${prefix}" = xNONE ; then
    20047   COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    20048 else
    20049   COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20076  COIN_PKG_CONFIG_PATH="${ac_default_prefix}/lib/pkgconfig:${ac_default_prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20077else
     20078  COIN_PKG_CONFIG_PATH="${prefix}/lib/pkgconfig:${prefix}/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    2005020079fi
    2005120080
     
    2005920088   { (exit 1); exit 1; }; }
    2006020089   fi
    20061    COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:${COIN_PKG_CONFIG_PATH}"
     20090   COIN_PKG_CONFIG_PATH="$withval/lib/pkgconfig:$withval/share/pkgconfig:${COIN_PKG_CONFIG_PATH}"
    2006220091
    2006320092fi;
     
    2009520124
    2009620125
     20126fi
     20127
     20128if test -n "$PKG_CONFIG" && test x$coin_cc_is_cl = xtrue; then
     20129  { echo "$as_me:$LINENO: WARNING: Using pkg-config together with MS or Intel Compiler on Windows is not support by example Makefiles. Consider using --disable-pkg-config." >&5
     20130echo "$as_me: WARNING: Using pkg-config together with MS or Intel Compiler on Windows is not support by example Makefiles. Consider using --disable-pkg-config." >&2;}
    2009720131fi
    2009820132
Note: See TracChangeset for help on using the changeset viewer.