Changeset 787


Ignore:
Timestamp:
Jun 1, 2006 12:41:29 AM (13 years ago)
Author:
andreasw
Message:

reran autotools

Location:
trunk
Files:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makefile.am

    • Property svn:keywords changed from "Author Date Id Revision" to Author Date Id Revision
  • trunk/Makefile.in

    r767 r787  
    5454        $(top_srcdir)/configure config.guess config.sub depcomp \
    5555        install-sh ltmain.sh missing
    56 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@am__append_1 = .Externals-stamp
    57 @HAVE_EXTERNALS_TRUE@@MAINTAINER_MODE_TRUE@am__append_2 = Externals
     56@HAVE_EXTERNALS_TRUE@am__append_1 = Externals
     57@HAVE_EXTERNALS_TRUE@am__append_2 = .Externals-stamp
    5858subdir = .
    5959ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
     
    115115MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
    116116MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
    117 MAINTAINER_SMALL_FALSE = @MAINTAINER_SMALL_FALSE@
    118 MAINTAINER_SMALL_TRUE = @MAINTAINER_SMALL_TRUE@
    119117MAKEINFO = @MAKEINFO@
    120118PACKAGE = @PACKAGE@
     
    129127STRIP = @STRIP@
    130128VERSION = @VERSION@
     129VPATH_DISTCLEANFILES = @VPATH_DISTCLEANFILES@
    131130ac_ct_STRIP = @ac_ct_STRIP@
    132131am__leading_dot = @am__leading_dot@
     
    157156target_alias = @target_alias@
    158157AUTOMAKE_OPTIONS = foreign
    159 EXTRA_DIST = $(am__append_2)
     158EXTRA_DIST = $(am__append_1)
    160159
    161160########################################################################
     
    172171
    173172# Files that are generated and should be cleaned with make distclean
    174 DISTCLEANFILES = $(am__append_1)
     173DISTCLEANFILES = $(am__append_2) $(VPATH_DISTCLEANFILES)
    175174all: all-recursive
    176175
     
    612611@MAINTAINER_MODE_TRUE@  cp $< $@
    613612
    614 @MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@$(AUX_DIR)/config.guess: $(BUILDTOOLSDIR)/config.guess
    615 @MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@  cp $< $@
    616 
    617 @MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@$(AUX_DIR)/config.sub: $(BUILDTOOLSDIR)/config.sub
    618 @MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@  cp $< $@
    619 
    620 @MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@$(AUX_DIR)/depcomp: $(BUILDTOOLSDIR)/depcomp
    621 @MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@  cp $< $@
    622 
    623 @MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@$(AUX_DIR)/ltmain.sh: $(BUILDTOOLSDIR)/ltmain.sh
    624 @MAINTAINER_MODE_TRUE@@MAINTAINER_SMALL_FALSE@  cp $< $@
     613@MAINTAINER_MODE_TRUE@$(AUX_DIR)/config.guess: $(BUILDTOOLSDIR)/config.guess
     614@MAINTAINER_MODE_TRUE@  cp $< $@
     615
     616@MAINTAINER_MODE_TRUE@$(AUX_DIR)/config.sub: $(BUILDTOOLSDIR)/config.sub
     617@MAINTAINER_MODE_TRUE@  cp $< $@
     618
     619@MAINTAINER_MODE_TRUE@$(AUX_DIR)/depcomp: $(BUILDTOOLSDIR)/depcomp
     620@MAINTAINER_MODE_TRUE@  cp $< $@
     621
     622@MAINTAINER_MODE_TRUE@$(AUX_DIR)/ltmain.sh: $(BUILDTOOLSDIR)/ltmain.sh
     623@MAINTAINER_MODE_TRUE@  cp $< $@
    625624
    626625# Take care of updating externals (if Externals file exists)
  • trunk/config.guess

    r754 r787  
    22# Attempt to guess a canonical system name.
    33#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    4 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
    5 
    6 timestamp='2005-07-08'
     4#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
     5#   Inc.
     6
     7timestamp='2006-05-13'
    78
    89# This file is free software; you can redistribute it and/or modify it
     
    107108trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
    108109: ${TMPDIR=/tmp} ;
    109  { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
     110 { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
    110111 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
    111112 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
     
    207208        echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
    208209        exit ;;
     210    *:SolidBSD:*:*)
     211        echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
     212        exit ;;
    209213    macppc:MirBSD:*:*)
    210214        echo powerppc-unknown-mirbsd${UNAME_RELEASE}
     
    765769        exit ;;
    766770    *:FreeBSD:*:*)
    767         echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
     771        case ${UNAME_MACHINE} in
     772            pc98)
     773                echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
     774            amd64)
     775                echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
     776            *)
     777                echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
     778        esac
    768779        exit ;;
    769780    i*:CYGWIN*:*)
     
    780791        echo ${UNAME_MACHINE}-pc-pw32
    781792        exit ;;
    782     x86:Interix*:[34]*)
    783         echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
     793    x86:Interix*:[345]*)
     794        echo i586-pc-interix${UNAME_RELEASE}
     795        exit ;;
     796    EM64T:Interix*:[345]*)
     797        echo x86_64-unknown-interix${UNAME_RELEASE}
    784798        exit ;;
    785799    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
     
    795809        echo ${UNAME_MACHINE}-pc-uwin
    796810        exit ;;
    797     amd64:CYGWIN*:*:*)
     811    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
    798812        echo x86_64-unknown-cygwin
    799813        exit ;;
     
    852866        #endif
    853867EOF
    854         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
     868        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
     869            /^CPU/{
     870                s: ::g
     871                p
     872            }'`"
    855873        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
    856874        ;;
     
    871889        #endif
    872890EOF
    873         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
     891        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
     892            /^CPU/{
     893                s: ::g
     894                p
     895            }'`"
    874896        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
    875897        ;;
     898    or32:Linux:*:*)
     899        echo or32-unknown-linux-gnu
     900        exit ;;
    876901    ppc:Linux:*:*)
    877902        echo powerpc-unknown-linux-gnu
     
    916941    sparc:Linux:*:* | sparc64:Linux:*:*)
    917942        echo ${UNAME_MACHINE}-unknown-linux-gnu
     943        exit ;;
     944    vax:Linux:*:*)
     945        echo ${UNAME_MACHINE}-dec-linux-gnu
    918946        exit ;;
    919947    x86_64:Linux:*:*)
     
    962990        # endif
    963991        #else
    964         #ifdef __INTEL_COMPILER
     992        #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
    965993        LIBC=gnu
    966994        #else
     
    9721000        #endif
    9731001EOF
    974         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
     1002        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
     1003            /^LIBC/{
     1004                s: ::g
     1005                p
     1006            }'`"
    9751007        test x"${LIBC}" != x && {
    9761008                echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
     
    11831215        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
    11841216        case $UNAME_PROCESSOR in
    1185             *86) UNAME_PROCESSOR=i686 ;;
    11861217            unknown) UNAME_PROCESSOR=powerpc ;;
    11871218        esac
     
    12611292    i*86:skyos:*:*)
    12621293        echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
     1294        exit ;;
     1295    i*86:rdos:*:*)
     1296        echo ${UNAME_MACHINE}-pc-rdos
    12631297        exit ;;
    12641298esac
  • trunk/config.sub

    r754 r787  
    22# Configuration validation subroutine script.
    33#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
    4 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
    5 
    6 timestamp='2005-07-08'
     4#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
     5#   Inc.
     6
     7timestamp='2006-05-13'
    78
    89# This file is (in principle) common to ALL GNU software.
     
    120121maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
    121122case $maybe_os in
    122   nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
    123   kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
     123  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
     124  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
     125  storm-chaos* | os2-emx* | rtmk-nova*)
    124126    os=-$maybe_os
    125127    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     
    172174                os=-hiuxwe2
    173175                ;;
     176        -sco6)
     177                os=-sco5v6
     178                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
     179                ;;
    174180        -sco5)
    175181                os=-sco3.2v5
     
    185191                ;;
    186192        -sco3.2v[4-9]*)
     193                # Don't forget version if it is 3.2v4 or newer.
     194                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
     195                ;;
     196        -sco5v6*)
    187197                # Don't forget version if it is 3.2v4 or newer.
    188198                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
     
    240250        | i370 | i860 | i960 | ia64 \
    241251        | ip2k | iq2000 \
    242         | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
     252        | m32c | m32r | m32rle | m68000 | m68k | m88k \
     253        | maxq | mb | microblaze | mcore \
    243254        | mips | mipsbe | mipseb | mipsel | mipsle \
    244255        | mips16 \
     
    258269        | mipstx39 | mipstx39el \
    259270        | mn10200 | mn10300 \
    260         | ms1 \
     271        | mt \
    261272        | msp430 \
     273        | nios | nios2 \
    262274        | ns16k | ns32k \
    263275        | or32 \
     
    265277        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
    266278        | pyramid \
    267         | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
     279        | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
    268280        | sh64 | sh64le \
    269         | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
    270         | sparcv8 | sparcv9 | sparcv9b \
    271         | strongarm \
     281        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
     282        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
     283        | spu | strongarm \
    272284        | tahoe | thumb | tic4x | tic80 | tron \
    273285        | v850 | v850e \
     
    277289                basic_machine=$basic_machine-unknown
    278290                ;;
    279         m32c)
    280                 basic_machine=$basic_machine-unknown
    281                 ;;
    282291        m6811 | m68hc11 | m6812 | m68hc12)
    283292                # Motorola 68HC11/12.
     
    286295                ;;
    287296        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
     297                ;;
     298        ms1)
     299                basic_machine=mt-unknown
    288300                ;;
    289301
     
    317329        | i*86-* | i860-* | i960-* | ia64-* \
    318330        | ip2k-* | iq2000-* \
    319         | m32r-* | m32rle-* \
     331        | m32c-* | m32r-* | m32rle-* \
    320332        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
    321333        | m88110-* | m88k-* | maxq-* | mcore-* \
     
    337349        | mipstx39-* | mipstx39el-* \
    338350        | mmix-* \
    339         | ms1-* \
     351        | mt-* \
    340352        | msp430-* \
     353        | nios-* | nios2-* \
    341354        | none-* | np1-* | ns16k-* | ns32k-* \
    342355        | orion-* \
     
    345358        | pyramid-* \
    346359        | romp-* | rs6000-* \
    347         | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
     360        | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
    348361        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
    349         | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
     362        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
    350363        | sparclite-* \
    351         | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
     364        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
    352365        | tahoe-* | thumb-* \
    353366        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
     
    360373        | z8k-*)
    361374                ;;
    362         m32c-*)
    363                 ;;
    364375        # Recognize the various machine names and aliases which stand
    365376        # for a CPU type and a company and sometimes even an OS.
     
    696707                basic_machine=i386-pc
    697708                os=-msdos
     709                ;;
     710        ms1-*)
     711                basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
    698712                ;;
    699713        mvs)
     
    804818                basic_machine=ns32k-pc532
    805819                ;;
     820        pc98)
     821                basic_machine=i386-pc
     822                ;;
     823        pc98-*)
     824                basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
     825                ;;
    806826        pentium | p5 | k5 | k6 | nexgen | viac3)
    807827                basic_machine=i586-pc
     
    859879                basic_machine=i586-unknown
    860880                os=-pw32
     881                ;;
     882        rdos)
     883                basic_machine=i386-pc
     884                os=-rdos
    861885                ;;
    862886        rom68k)
     
    11021126                basic_machine=sh-unknown
    11031127                ;;
    1104         sparc | sparcv8 | sparcv9 | sparcv9b)
     1128        sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
    11051129                basic_machine=sparc-sun
    11061130                ;;
     
    11751199              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
    11761200              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
    1177               | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
     1201              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
     1202              | -openbsd* | -solidbsd* \
    11781203              | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
    11791204              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
     
    11821207              | -chorusos* | -chorusrdb* \
    11831208              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
    1184               | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
     1209              | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
     1210              | -uxpv* | -beos* | -mpeix* | -udk* \
    11851211              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
    11861212              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
     
    11891215              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
    11901216              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
    1191               | -skyos* | -haiku*)
     1217              | -skyos* | -haiku* | -rdos*)
    11921218        # Remember, each alternative MUST END IN *, to match a version number.
    11931219                ;;
     
    13411367
    13421368case $basic_machine in
     1369        spu-*)
     1370                os=-elf
     1371                ;;
    13431372        *-acorn)
    13441373                os=-riscix1.2
     
    13501379                os=-aout
    13511380                ;;
    1352     c4x-* | tic4x-*)
    1353         os=-coff
    1354         ;;
     1381        c4x-* | tic4x-*)
     1382                os=-coff
     1383                ;;
    13551384        # This must come before the *-dec entry.
    13561385        pdp10-*)
  • trunk/configure

    r761 r787  
    287287ac_subdirs_all="$ac_subdirs_all Data/Sample"
    288288ac_subdirs_all="$ac_subdirs_all Clp"
    289 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 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 MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake BUILDTOOLSDIR AUX_DIR HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE MAINTAINER_SMALL_TRUE MAINTAINER_SMALL_FALSE subdirs LIBOBJS LTLIBOBJS'
     289ac_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 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 MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT LIBTOOLM4 have_autoconf have_automake BUILDTOOLSDIR AUX_DIR HAVE_EXTERNALS_TRUE HAVE_EXTERNALS_FALSE subdirs LIBOBJS LTLIBOBJS VPATH_DISTCLEANFILES'
    290290ac_subst_files=''
    291291
     
    17601760
    17611761coin_have_externals=no
    1762 coin_maintainer_small=no
    17631762if test "$enable_maintainer_mode" = yes; then
    17641763
     
    20092008  fi
    20102009
    2011   # Check if this is a limited project (without config.guess)
    2012   if test -r $srcdir/config.guess; then :; else
    2013     coin_maintainer_small=yes
    2014   fi
    2015 
    20162010  # Find the location of the BuildTools directory
    20172011  BUILDTOOLSDIR=
     
    20502044
    20512045
    2052 if test $coin_maintainer_small = yes; then
    2053   MAINTAINER_SMALL_TRUE=
    2054   MAINTAINER_SMALL_FALSE='#'
    2055 else
    2056   MAINTAINER_SMALL_TRUE='#'
    2057   MAINTAINER_SMALL_FALSE=
    2058 fi
    2059 
    2060 
    2061 
    20622046#############################################################################
    20632047#                  Check which subprojects are there                        #
     
    21792163
    21802164# Finally, we let configure write all the output...
     2165
    21812166cat >confcache <<\_ACEOF
    21822167# This file is a shell script that caches the results of configure
     
    23122297Usually this means the macro was only invoked conditionally." >&5
    23132298echo "$as_me: error: conditional \"HAVE_EXTERNALS\" was never defined.
    2314 Usually this means the macro was only invoked conditionally." >&2;}
    2315    { (exit 1); exit 1; }; }
    2316 fi
    2317 if test -z "${MAINTAINER_SMALL_TRUE}" && test -z "${MAINTAINER_SMALL_FALSE}"; then
    2318   { { echo "$as_me:$LINENO: error: conditional \"MAINTAINER_SMALL\" was never defined.
    2319 Usually this means the macro was only invoked conditionally." >&5
    2320 echo "$as_me: error: conditional \"MAINTAINER_SMALL\" was never defined.
    23212299Usually this means the macro was only invoked conditionally." >&2;}
    23222300   { (exit 1); exit 1; }; }
     
    28682846s,@HAVE_EXTERNALS_TRUE@,$HAVE_EXTERNALS_TRUE,;t t
    28692847s,@HAVE_EXTERNALS_FALSE@,$HAVE_EXTERNALS_FALSE,;t t
    2870 s,@MAINTAINER_SMALL_TRUE@,$MAINTAINER_SMALL_TRUE,;t t
    2871 s,@MAINTAINER_SMALL_FALSE@,$MAINTAINER_SMALL_FALSE,;t t
    28722848s,@subdirs@,$subdirs,;t t
    28732849s,@LIBOBJS@,$LIBOBJS,;t t
     
    33193295
    33203296
    3321 # ...and tell the user, that the configuration finished
    3322 { echo "$as_me:$LINENO: Clp main configuration successful" >&5
    3323 echo "$as_me: Clp main configuration successful" >&6;}
     3297if test x"$coin_vpath_link_files" = x; then : ; else
     3298  { echo "$as_me:$LINENO: Creating VPATH links for data files" >&5
     3299echo "$as_me: Creating VPATH links for data files" >&6;}
     3300  for file in $coin_vpath_link_files; do
     3301    rm -f $file
     3302    $LN_S $srcdir/$file $file
     3303  done
     3304fi
     3305
     3306# Define VPATH_DISTCLEANFILES to be everything that needs to be
     3307# cleaned for distclean in a vpath configuration
     3308
     3309VPATH_DISTCLEANFILES="$coin_vpath_link_files"
     3310
     3311if test x$coin_projectdir = xyes; then
     3312  { echo "$as_me:$LINENO: Configuration of $PACKAGE_NAME successful" >&5
     3313echo "$as_me: Configuration of $PACKAGE_NAME successful" >&6;}
     3314else
     3315  { echo "$as_me:$LINENO: Main configuration of $PACKAGE_NAME successful" >&5
     3316echo "$as_me: Main configuration of $PACKAGE_NAME successful" >&6;}
     3317fi
     3318
  • trunk/configure.ac

    • Property svn:keywords set to Author Date Id Revision
    r761 r787  
    33# This file is distributed under the Common Public License.
    44
    5 ## $Id: configure.ac,v 1.1.2.1 2006/04/19 23:25:12 andreasw Exp $
     5## $Id$
    66
    77# Author:  Andreas Waechter            IBM    2006-04-13
     
    5858
    5959# Finally, we let configure write all the output...
    60 AC_OUTPUT
    61 
    62 # ...and tell the user, that the configuration finished
    63 AC_MSG_NOTICE([Clp main configuration successful])
     60AC_COIN_FINALIZE
Note: See TracChangeset for help on using the changeset viewer.