From de47a66cf71c88fafe335602f8f987808200190e Mon Sep 17 00:00:00 2001 From: The Alliance Tool Date: Thu, 22 Jul 2004 18:12:45 +0000 Subject: [PATCH] Vous etes fatigues des autostuff interminables, configure vous sort part les yeux ? Ce commit est pour vous. Desormais autostuff genere un seul configure au niveau d'alliance/src, qui est construit dynamiquement en recherchant tout les Makefile.am dans les repertoires fils. D'ou une reduction de temps (1h --> 6mn sous Linux). Petit inconvenient, il ne faut plus utiliser "top_srcdir" mais "srcdir" dans les Makefile.am (cas d'ocp et mips_asm). J'en revient pas, Christophe m'a demande d'ecrire un generateur de configure.in !! --- alliance/src/Makefile.am | 2 +- alliance/src/autostuff | 292 ++++++- alliance/src/configure.in | 1017 +++++++++++++++++++++-- alliance/src/ctp/src/Makefile.am | 2 +- alliance/src/druc/src/Makefile.am | 2 +- alliance/src/ltmain.sh | 762 ++++++++++------- alliance/src/mbkvhdlg/src/Makefile.am | 2 +- alliance/src/mips_asm/src/Makefile.am | 2 +- alliance/src/nero/src/Makefile.am | 2 +- alliance/src/ocp/src/common/Makefile.am | 2 - alliance/src/ocp/src/placer/Makefile.am | 4 +- alliance/src/sea/src/Makefile.am | 6 +- 12 files changed, 1683 insertions(+), 412 deletions(-) diff --git a/alliance/src/Makefile.am b/alliance/src/Makefile.am index a23e0029..08cac3ca 100644 --- a/alliance/src/Makefile.am +++ b/alliance/src/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = @SUBDIRS@ +SUBDIRS = @TOOLSDIRS@ EXTRA_DIST = autostuff alliance.m4 motif.m4 oldgcc.m4 xpm.m4 build depcomp \ COPYING-2.0 COPYING.LIB-2.0 LICENCE \ diff --git a/alliance/src/autostuff b/alliance/src/autostuff index 1d46c21c..7fd4def4 100755 --- a/alliance/src/autostuff +++ b/alliance/src/autostuff @@ -26,27 +26,285 @@ dirs=`\ls -l $srcdir | grep '^d' | awk '{print $NF}'` else dirs=$* fi +newdirs="" +for dir in $dirs; do + if [ "$dir" == "CVS" ]; then continue; fi + if [ "$dir" == "autom4te.cache" ]; then continue; fi + if [ "$dir" == "Linux" ]; then continue; fi + if [ "$dir" == "Solaris" ]; then continue; fi + newdirs="$newdirs $dir" +done +dirs="$newdirs" + + +## Order directories. +order="mbk mbkal mbkap mbkedif mbkhilo mbkmg mbkspice mbkvhdl mbkvrlog mbkvti \ + mbkvhdlg aut rds rdscif rdsgds elp abl bdd log btr vex ctl ctp abe abt \ + abv fsm fks fvh ftl rtn rtd scl vbh vbl vpn vpd vvh vtl pat ppt phl gcp \ + druc beh bhl bvl" +ordered_dirs="" +for lib in $order; do + if echo "$dirs" | grep $lib > /dev/null ; then + dirs=`echo "$dirs" | sed "s, $lib , ,"` + if [ -z "$ordered_dirs" ]; then + ordered_dirs="$lib" + else + ordered_dirs="$ordered_dirs $lib" + fi + fi +done +ordered_dirs="$ordered_dirs $dirs" + +AC_OUTPUT=`find $ordered_dirs -name Makefile.am | sed "s,\.am,,"` + +rm -f configure.in +echo "" >> configure.in +echo "AC_INIT(./autostuff)" >> configure.in +echo "AM_INIT_AUTOMAKE(alliance, 5.0)" >> configure.in +echo "" >> configure.in +echo "AM_PROG_LEX" >> configure.in +echo "AM_PROG_LIBTOOL" >> configure.in +echo "AC_CHECK_HEADERS(fcntl.h malloc.h strings.h sys/time.h unistd.h)" >> configure.in +echo "AC_CHECK_HEADERS(strings.h unistd.h)" >> configure.in +echo "AC_CHECK_LIB(gen, basename)" >> configure.in +echo "AC_CHECK_LIB(iberty, basename)" >> configure.in +echo "AC_CHECK_LIB(m, exp)" >> configure.in +echo "AC_CHECK_LIB(m, floor)" >> configure.in +echo "AC_CHECK_LIB(m, pow)" >> configure.in +echo "AC_CHECK_LIB(m, sqrt)" >> configure.in +echo "AC_CHECK_PROG(SED, sed, sed)" >> configure.in +echo "AC_CHECK_PROGS(SED, gsed sed)" >> configure.in +echo "AC_C_CONST" >> configure.in +echo "AC_FUNC_VFORK" >> configure.in +echo "AC_HEADER_STDC" >> configure.in +echo "AC_HEADER_SYS_WAIT" >> configure.in +echo "AC_PATH_XTRA" >> configure.in +echo "AC_PROG_CC" >> configure.in +echo "AC_PROG_CPP" >> configure.in +echo "AC_PROG_CXX" >> configure.in +echo "AC_PROG_INSTALL" >> configure.in +echo "AC_PROG_MAKE_SET" >> configure.in +echo "AC_PROG_RANLIB" >> configure.in +echo "AC_PROG_YACC" >> configure.in +echo "AC_TYPE_SIGNAL" >> configure.in + +cat >> configure.in <<"EOF" +dnl +dnl Check for X stuff +dnl +dnl +dnl Check X options +dnl +if test "$with_x" = no; then +AC_MSG_ERROR([requires the X window system to compile and run. + Please do not use the configure option '--without-x'.]) +fi +if test "$with_motif" = no; then +AC_MSG_ERROR([requires Motif to compile and run. + Please do not use the configure option '--without-motif'.]) +fi +dnl +dnl +dnl Check for X libraries +dnl +if test "$with_x" != no; then +ice_save_LIBS="$LIBS" +ice_save_CFLAGS="$CFLAGS" +ice_save_CXXFLAGS="$CXXFLAGS" +ice_save_CPPFLAGS="$CPPFLAGS" +ice_save_LDFLAGS="$LDFLAGS" + +dnl +dnl + +AC_FIND_MOTIF +AC_FIND_XPM + +dnl +dnl +dnl +LIBS="$LIBS $X_EXTRA_LIBS" +CFLAGS="$CFLAGS $X_CFLAGS" +CPPFLAGS="$CPPFLAGS $X_CFLAGS" +LDFLAGS="$LDFLAGS $X_LIBS" +dnl +dnl Check for X library +dnl +X11_LIBS="" +AC_CHECK_LIB(X11, XOpenDisplay, X11_LIBS="-lX11",,${X_PRE_LIBS} ${X_EXTRA_LIBS}) +if test "$X11_LIBS" = ""; then +dnl Not having X is fatal. Let the user fix this. +AC_MSG_ERROR([The X11 library '-lX11' could not be found. + Please use the configure options '--x-includes=DIR' + and '--x-libraries=DIR' to specify the X location.]) +fi +AC_SUBST(X_LIBS) +AC_SUBST(X11_LIBS) +AC_SUBST(X_PRE_LIBS) +dnl +dnl +dnl Check for -lXintl library. Lutz Kittler says +dnl that DLD-Linux with CDE wants `-lXintl' to refine `Xlcmbcurmax'. +dnl Guenther Roehrich says that +dnl we must check for `_Xlcmbcurmax' instead of `Xlcmbcurmax'. +dnl +AC_CHECK_LIB(Xintl, _Xlcmbcurmax, X11_LIBS="${X11_LIBS} -lXintl",, + ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) +dnl +dnl +dnl Check for -lipc library. SCO unix is said to want that. +dnl +AC_CHECK_LIB(ipc, shmap, X11_LIBS="${X11_LIBS} -lipc",, + ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) +dnl +dnl +dnl Check for X toolkit libraries +dnl +XT_LIBS="" +AC_CHECK_LIB(Xt, XtToolkitInitialize, XT_LIBS="-lXt",, + ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) +if test "$XT_LIBS" = ""; then +dnl Not having Xt is fatal. Let the user fix this. +AC_MSG_ERROR([The X toolkit library '-lXt' could not be found. + Please use the configure options '--x-includes=DIR' + and '--x-libraries=DIR' to specify the X location. + See the files 'config.log' and 'ddd/config.log' + for further diagnostics.]) +fi +AC_SUBST(XT_LIBS) +dnl +dnl +dnl Check for X extension libraries +dnl +dnl +XEXT_LIBS="" +AC_CHECK_LIB(Xext, XShapeQueryVersion, XEXT_LIBS="-lXext",, + ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) +AC_SUBST(XEXT_LIBS) +dnl +dnl +dnl +dnl Check for Xpm library and headers +dnl +XPM_LIBS="" +if test "$xpm_includes" != "no" && test "$xpm_libraries" != "no" +then +AC_CHECK_LIB(Xpm, XpmCreatePixmapFromXpmImage, + XPM_LIBS="-lXpm" + AC_DEFINE(HAVE_XPM),,${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) +if test "$XPM_LIBS" != ""; then +AC_CHECK_HEADERS(X11/xpm.h xpm.h) +fi +fi +AC_SUBST(XPM_LIBS) + +dnl Check for Motif widget libraries +dnl + +XM_LIBS="" +XP_LIBS="" +if test "$motif_includes" != "no" && test "$motif_libraries" != "no" +then +dnl Motif 2.1 wants `-lXp' (X11R6.3 print server) +AC_CHECK_LIB(Xp, XpSelectInput, + XP_LIBS="-lXp" + AC_DEFINE(HAVE_XP),, + ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) +dnl +AC_CHECK_LIB(Xm, XmCreateOptionMenu, + XM_LIBS="-lXm" + AC_DEFINE(HAVE_MOTIF),, + ${XP_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) +dnl +AC_CHECK_LIB(Xm, xmUseVersion, + AC_DEFINE(HAVE_XMUSEVERSION),, + ${XP_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) +dnl +AC_CHECK_LIB(Xm, XmInstallImage, + AC_DEFINE(HAVE_XMINSTALLIMAGE),, + ${XP_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) +dnl +AC_CHECK_LIB(Xm, Xm21InstallImage, + AC_DEFINE(HAVE_XM21INSTALLIMAGE),, + ${XP_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) +fi +if test "$XM_LIBS" = ""; then +dnl Without Motif, we won't get far. Let the user fix this. +AC_MSG_ERROR([The Motif library '-lXm' could not be found. + Please use the configure options '--with-motif-includes=DIR' + and '--with-motif-libraries=DIR' to specify the Xm location. + See the files 'config.log' + for further diagnostics.]) +fi + +AC_SUBST(XP_LIBS) +AC_SUBST(XM_LIBS) + +LIBS="$LIBS ${XM_LIBS} ${XP_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}" + + +LIBS="$ice_save_LIBS" +CFLAGS="$ice_save_CFLAGS" +CXXFLAGS="$ice_save_CXXFLAGS" +CPPFLAGS="$ice_save_CPPFLAGS" +LDFLAGS="$ice_save_LDFLAGS" +fi +EOF + +echo "AM_ALLIANCE" >> configure.in +echo "AM_CONDITIONAL([ALLIANCE_BUILD],[(exit 0)])" >> configure.in + +find $ordered_dirs -name configure.in | while read config; do + echo "Scanning $config" + echo "" >> configure.in + echo "dnl Infos extracted from $config" >> configure.in + + for version_line in `grep -h _CUR= $config`; do + echo "$version_line" >> configure.in + version_name=`echo $version_line | sed 's,=.*,,'` + echo "AC_SUBST($version_name)" >> configure.in + done + for version_line in `grep -h _REV= $config`; do + echo "$version_line" >> configure.in + version_name=`echo $version_line | sed 's,=.*,,'` + echo "AC_SUBST($version_name)" >> configure.in + done + for version_line in `grep -h _REL= $config`; do + echo "$version_line" >> configure.in + version_name=`echo $version_line | sed 's,=.*,,'` + echo "AC_SUBST($version_name)" >> configure.in + done + + for dll_line in `grep -h _DLL_VERSION= $config`; do + echo "$dll_line" >> configure.in + dll_name=`echo $dll_line | sed 's,=.*,,'` + echo "AC_SUBST($dll_name)" >> configure.in + done + for version_line in `grep -h _VERSION= $config | grep -v DLL`; do + echo "$version_line" >> configure.in + version_name=`echo $version_line | sed 's,=.*,,'` + echo "AC_SUBST($version_name)" >> configure.in + done +done + +echo "" >> configure.in +echo "TOOLSDIRS=\"$ordered_dirs\"" >> configure.in +echo "AC_SUBST(TOOLSDIRS)" >> configure.in + +echo "" >> configure.in +echo "AC_OUTPUT([" >> configure.in +echo "Makefile" >> configure.in +echo "distrib/etc/alc_env.sh" >> configure.in +echo "distrib/etc/alc_env.csh" >> configure.in +for template in $AC_OUTPUT; do + echo "$template" >> configure.in +done +echo "])" >> configure.in + -## root first aclocal -I . libtoolize --force --copy --automake automake --foreign --add-missing --copy autoconf -## autoconf all dirs -for i in $dirs ; do - cd $i - if test -f configure.in ; then - echo entering $i ... - aclocal -I . -I .. - if grep "^AM_PROG_LIBTOOL" configure.in >/dev/null; then - echo "Running libtoolize..." - libtoolize --force --copy --automake - fi - automake --add-missing --copy --foreign - autoconf - fi - cd .. -done - exit 0 diff --git a/alliance/src/configure.in b/alliance/src/configure.in index 761b3201..5c0f5cb5 100644 --- a/alliance/src/configure.in +++ b/alliance/src/configure.in @@ -1,74 +1,963 @@ -dnl -dnl This file is part of the Alliance CAD System -dnl Copyright (C) Laboratoire LIP6 - Département ASIM -dnl Universite Pierre et Marie Curie -dnl -dnl Home page : http://www-asim.lip6.fr/alliance/ -dnl E-mail : mailto:alliance-users@asim.lip6.fr -dnl -dnl This library is free software; you can redistribute it and/or modify it -dnl under the terms of the GNU Library General Public License as published -dnl by the Free Software Foundation; either version 2 of the License, or (at -dnl your option) any later version. -dnl -dnl Alliance VLSI CAD System is distributed in the hope that it will be -dnl useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General -dnl Public License for more details. -dnl -dnl You should have received a copy of the GNU General Public License along -dnl with the GNU C Library; see the file COPYING. If not, write to the Free -dnl Software Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. -dnl -dnl Purpose : Auto stuffing Alliance -dnl Almost ten years since I wrote this stuff, I just can't -dnl believe it -dnl Date : 01/02/2002 -dnl Author : Frederic Petrot -dnl $Id: configure.in,v 1.30 2002/10/16 18:04:14 jpc Exp $ -dnl -dnl -AC_INIT(./configure.in) + +AC_INIT(./autostuff) AM_INIT_AUTOMAKE(alliance, 5.0) + +AM_PROG_LEX +AM_PROG_LIBTOOL +AC_CHECK_HEADERS(fcntl.h malloc.h strings.h sys/time.h unistd.h) +AC_CHECK_HEADERS(strings.h unistd.h) +AC_CHECK_LIB(gen, basename) +AC_CHECK_LIB(iberty, basename) +AC_CHECK_LIB(m, exp) +AC_CHECK_LIB(m, floor) +AC_CHECK_LIB(m, pow) +AC_CHECK_LIB(m, sqrt) +AC_CHECK_PROG(SED, sed, sed) +AC_CHECK_PROGS(SED, gsed sed) +AC_C_CONST +AC_FUNC_VFORK +AC_HEADER_STDC +AC_HEADER_SYS_WAIT +AC_PATH_XTRA AC_PROG_CC +AC_PROG_CPP +AC_PROG_CXX +AC_PROG_INSTALL +AC_PROG_MAKE_SET +AC_PROG_RANLIB +AC_PROG_YACC +AC_TYPE_SIGNAL +dnl +dnl Check for X stuff +dnl +dnl +dnl Check X options +dnl +if test "$with_x" = no; then +AC_MSG_ERROR([requires the X window system to compile and run. + Please do not use the configure option '--without-x'.]) +fi +if test "$with_motif" = no; then +AC_MSG_ERROR([requires Motif to compile and run. + Please do not use the configure option '--without-motif'.]) +fi +dnl +dnl +dnl Check for X libraries +dnl +if test "$with_x" != no; then +ice_save_LIBS="$LIBS" +ice_save_CFLAGS="$CFLAGS" +ice_save_CXXFLAGS="$CXXFLAGS" +ice_save_CPPFLAGS="$CPPFLAGS" +ice_save_LDFLAGS="$LDFLAGS" -changequote(,)dnl -# Build a compilation order that ensures that the libraries are -# compiled and installed prior to the tools -# Add in the following variable the library name (or part of it, as a -# match is performed) that you what to compile prior to anything +dnl +dnl +AC_FIND_MOTIF +AC_FIND_XPM -libraries="mbk mbkal mbkap mbkedif mbkhilo mbkmg mbkspice mbkvhdl mbkvrlog mbkvti mbkvhdlg aut \ -rds rdscif rdsgds elp abl bdd log btr vex ctl ctp abe abt abv fsm fks fvh ftl rtn rtd scl vbh vbl vpn \ -vpd vvh vtl pat ppt phl gcp druc beh bhl bvl" -dirs=`\ls -l $srcdir | grep '^d' | awk '{print $NF}'` -for l in $libraries ; do - for i in $dirs ; do - if test -d $srcdir/$i ; then - if test "$i" = "$l" ; then - ldirs="$ldirs `basename $i`" - fi - fi - done -done -tdirs=$dirs -for i in $ldirs ; do - cmd="awk '{for(k=1;k<=NF;k++) if(\$k!=\"$i\") printf \"%s \",\$k;}'" - tdirs=`echo $tdirs | eval $cmd` -done -for i in $ldirs $tdirs ; do - if test -f $srcdir/$i/configure.in ; then - sdirs="$sdirs `basename $i`" - fi -done -echo $sdirs -SUBDIRS="$sdirs" -changequote([,])dnl +dnl +dnl +dnl +LIBS="$LIBS $X_EXTRA_LIBS" +CFLAGS="$CFLAGS $X_CFLAGS" +CPPFLAGS="$CPPFLAGS $X_CFLAGS" +LDFLAGS="$LDFLAGS $X_LIBS" +dnl +dnl Check for X library +dnl +X11_LIBS="" +AC_CHECK_LIB(X11, XOpenDisplay, X11_LIBS="-lX11",,${X_PRE_LIBS} ${X_EXTRA_LIBS}) +if test "$X11_LIBS" = ""; then +dnl Not having X is fatal. Let the user fix this. +AC_MSG_ERROR([The X11 library '-lX11' could not be found. + Please use the configure options '--x-includes=DIR' + and '--x-libraries=DIR' to specify the X location.]) +fi +AC_SUBST(X_LIBS) +AC_SUBST(X11_LIBS) +AC_SUBST(X_PRE_LIBS) +dnl +dnl +dnl Check for -lXintl library. Lutz Kittler says +dnl that DLD-Linux with CDE wants `-lXintl' to refine `Xlcmbcurmax'. +dnl Guenther Roehrich says that +dnl we must check for `_Xlcmbcurmax' instead of `Xlcmbcurmax'. +dnl +AC_CHECK_LIB(Xintl, _Xlcmbcurmax, X11_LIBS="${X11_LIBS} -lXintl",, + ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) +dnl +dnl +dnl Check for -lipc library. SCO unix is said to want that. +dnl +AC_CHECK_LIB(ipc, shmap, X11_LIBS="${X11_LIBS} -lipc",, + ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) +dnl +dnl +dnl Check for X toolkit libraries +dnl +XT_LIBS="" +AC_CHECK_LIB(Xt, XtToolkitInitialize, XT_LIBS="-lXt",, + ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) +if test "$XT_LIBS" = ""; then +dnl Not having Xt is fatal. Let the user fix this. +AC_MSG_ERROR([The X toolkit library '-lXt' could not be found. + Please use the configure options '--x-includes=DIR' + and '--x-libraries=DIR' to specify the X location. + See the files 'config.log' and 'ddd/config.log' + for further diagnostics.]) +fi +AC_SUBST(XT_LIBS) +dnl +dnl +dnl Check for X extension libraries +dnl +dnl +XEXT_LIBS="" +AC_CHECK_LIB(Xext, XShapeQueryVersion, XEXT_LIBS="-lXext",, + ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) +AC_SUBST(XEXT_LIBS) +dnl +dnl +dnl +dnl Check for Xpm library and headers +dnl +XPM_LIBS="" +if test "$xpm_includes" != "no" && test "$xpm_libraries" != "no" +then +AC_CHECK_LIB(Xpm, XpmCreatePixmapFromXpmImage, + XPM_LIBS="-lXpm" + AC_DEFINE(HAVE_XPM),,${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) +if test "$XPM_LIBS" != ""; then +AC_CHECK_HEADERS(X11/xpm.h xpm.h) +fi +fi +AC_SUBST(XPM_LIBS) -AC_CONFIG_SUBDIRS($sdirs) -AC_SUBST(SUBDIRS) +dnl Check for Motif widget libraries +dnl + +XM_LIBS="" +XP_LIBS="" +if test "$motif_includes" != "no" && test "$motif_libraries" != "no" +then +dnl Motif 2.1 wants `-lXp' (X11R6.3 print server) +AC_CHECK_LIB(Xp, XpSelectInput, + XP_LIBS="-lXp" + AC_DEFINE(HAVE_XP),, + ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) +dnl +AC_CHECK_LIB(Xm, XmCreateOptionMenu, + XM_LIBS="-lXm" + AC_DEFINE(HAVE_MOTIF),, + ${XP_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) +dnl +AC_CHECK_LIB(Xm, xmUseVersion, + AC_DEFINE(HAVE_XMUSEVERSION),, + ${XP_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) +dnl +AC_CHECK_LIB(Xm, XmInstallImage, + AC_DEFINE(HAVE_XMINSTALLIMAGE),, + ${XP_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) +dnl +AC_CHECK_LIB(Xm, Xm21InstallImage, + AC_DEFINE(HAVE_XM21INSTALLIMAGE),, + ${XP_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}) +fi +if test "$XM_LIBS" = ""; then +dnl Without Motif, we won't get far. Let the user fix this. +AC_MSG_ERROR([The Motif library '-lXm' could not be found. + Please use the configure options '--with-motif-includes=DIR' + and '--with-motif-libraries=DIR' to specify the Xm location. + See the files 'config.log' + for further diagnostics.]) +fi + +AC_SUBST(XP_LIBS) +AC_SUBST(XM_LIBS) + +LIBS="$LIBS ${XM_LIBS} ${XP_LIBS} ${XPM_LIBS} ${XEXT_LIBS} ${XT_LIBS} ${X_PRE_LIBS} ${X11_LIBS} ${X_EXTRA_LIBS}" + + +LIBS="$ice_save_LIBS" +CFLAGS="$ice_save_CFLAGS" +CXXFLAGS="$ice_save_CXXFLAGS" +CPPFLAGS="$ice_save_CPPFLAGS" +LDFLAGS="$ice_save_LDFLAGS" +fi +AM_ALLIANCE +AM_CONDITIONAL([ALLIANCE_BUILD],[(exit 0)]) + +dnl Infos extracted from mbk/configure.in +MBK_CUR=4 +AC_SUBST(MBK_CUR) +MBK_REV=2 +AC_SUBST(MBK_REV) +MBK_REL=0 +AC_SUBST(MBK_REL) +MBK_DLL_VERSION=${MBK_CUR}:${MBK_REV}:${MBK_REL} +AC_SUBST(MBK_DLL_VERSION) +MBK_VERSION=$MBK_CUR.$MBK_REV +AC_SUBST(MBK_VERSION) + +dnl Infos extracted from mbkal/configure.in +MAL_DLL_VERSION=6:0:0 +AC_SUBST(MAL_DLL_VERSION) + +dnl Infos extracted from mbkap/configure.in +MAP_DLL_VERSION=6:0:0 +AC_SUBST(MAP_DLL_VERSION) + +dnl Infos extracted from mbkedif/configure.in +MEL_DLL_VERSION=4:9:0 +AC_SUBST(MEL_DLL_VERSION) + +dnl Infos extracted from mbkhilo/configure.in +MHL_DLL_VERSION=2:1:0 +AC_SUBST(MHL_DLL_VERSION) + +dnl Infos extracted from mbkmg/configure.in +MMG_DLL_VERSION=1:0:0 +AC_SUBST(MMG_DLL_VERSION) + +dnl Infos extracted from mbkspice/configure.in +MSL_DLL_VERSION=7:0:0 +AC_SUBST(MSL_DLL_VERSION) + +dnl Infos extracted from mbkvhdl/configure.in +MVL_DLL_VERSION=4:1:0 +AC_SUBST(MVL_DLL_VERSION) + +dnl Infos extracted from mbkvrlog/configure.in +MGL_DLL_VERSION=0:8:0 +AC_SUBST(MGL_DLL_VERSION) + +dnl Infos extracted from mbkvti/configure.in +MCP_DLL_VERSION=4:9:0 +AC_SUBST(MCP_DLL_VERSION) +MCL_DLL_VERSION=4:9:0 +AC_SUBST(MCL_DLL_VERSION) + +dnl Infos extracted from mbkvhdlg/configure.in +MVG_DLL_VERSION=4:1:0 +AC_SUBST(MVG_DLL_VERSION) + +dnl Infos extracted from aut/configure.in +AUT_DLL_VERSION=1:3:0 +AC_SUBST(AUT_DLL_VERSION) + +dnl Infos extracted from rds/configure.in +RDS_DLL_VERSION=2:1:0 +AC_SUBST(RDS_DLL_VERSION) +RUT_DLL_VERSION=2:1:0 +AC_SUBST(RUT_DLL_VERSION) +RFM_DLL_VERSION=2:1:0 +AC_SUBST(RFM_DLL_VERSION) +RPR_DLL_VERSION=2:1:0 +AC_SUBST(RPR_DLL_VERSION) +RWI_DLL_VERSION=2:1:0 +AC_SUBST(RWI_DLL_VERSION) +RTL_DLL_VERSION=2:1:0 +AC_SUBST(RTL_DLL_VERSION) + +dnl Infos extracted from rdscif/configure.in +RCF_DLL_VERSION=2:1:0 +AC_SUBST(RCF_DLL_VERSION) + +dnl Infos extracted from rdsgds/configure.in +RGS_DLL_VERSION=2:1:0 +AC_SUBST(RGS_DLL_VERSION) + +dnl Infos extracted from elp/configure.in +ELP_DLL_VERSION=1:5:0 +AC_SUBST(ELP_DLL_VERSION) + +dnl Infos extracted from abl/configure.in +ABL_DLL_VERSION=1:3:0 +AC_SUBST(ABL_DLL_VERSION) + +dnl Infos extracted from bdd/configure.in +BDD_DLL_VERSION=1:5:0 +AC_SUBST(BDD_DLL_VERSION) + +dnl Infos extracted from log/configure.in +LOG_DLL_VERSION=2:1:0 +AC_SUBST(LOG_DLL_VERSION) + +dnl Infos extracted from btr/configure.in +BTR_DLL_VERSION=1:3:0 +AC_SUBST(BTR_DLL_VERSION) + +dnl Infos extracted from vex/configure.in +VEX_DLL_VERSION=1:3:0 +AC_SUBST(VEX_DLL_VERSION) + +dnl Infos extracted from ctl/configure.in +CTL_DLL_VERSION=1:1:0 +AC_SUBST(CTL_DLL_VERSION) + +dnl Infos extracted from ctp/configure.in +CTP_DLL_VERSION=1:1:0 +AC_SUBST(CTP_DLL_VERSION) + +dnl Infos extracted from abe/configure.in +ABE_DLL_VERSION=2:1:0 +AC_SUBST(ABE_DLL_VERSION) + +dnl Infos extracted from abt/configure.in +ABT_DLL_VERSION=2:1:0 +AC_SUBST(ABT_DLL_VERSION) + +dnl Infos extracted from abv/configure.in +ABV_DLL_VERSION=2:1:0 +AC_SUBST(ABV_DLL_VERSION) + +dnl Infos extracted from fsm/configure.in +FSM_DLL_VERSION=1:4:0 +AC_SUBST(FSM_DLL_VERSION) + +dnl Infos extracted from fks/configure.in +FKS_DLL_VERSION=1:4:0 +AC_SUBST(FKS_DLL_VERSION) + +dnl Infos extracted from fvh/configure.in +FVH_DLL_VERSION=1:4:0 +AC_SUBST(FVH_DLL_VERSION) + +dnl Infos extracted from ftl/configure.in +FTL_DLL_VERSION=1:4:0 +AC_SUBST(FTL_DLL_VERSION) + +dnl Infos extracted from rtn/configure.in +RTN_DLL_VERSION=1:1:0 +AC_SUBST(RTN_DLL_VERSION) + +dnl Infos extracted from rtd/configure.in +RTD_DLL_VERSION=1:1:0 +AC_SUBST(RTD_DLL_VERSION) + +dnl Infos extracted from scl/configure.in +SCL_DLL_VERSION=1:5:0 +AC_SUBST(SCL_DLL_VERSION) + +dnl Infos extracted from vbh/configure.in +VBH_DLL_VERSION=1:4:0 +AC_SUBST(VBH_DLL_VERSION) + +dnl Infos extracted from vbl/configure.in +VBL_DLL_VERSION=1:4:0 +AC_SUBST(VBL_DLL_VERSION) + +dnl Infos extracted from vpn/configure.in +VPN_DLL_VERSION=1:5:0 +AC_SUBST(VPN_DLL_VERSION) + +dnl Infos extracted from vpd/configure.in +VPD_DLL_VERSION=1:5:0 +AC_SUBST(VPD_DLL_VERSION) + +dnl Infos extracted from vvh/configure.in +VVH_DLL_VERSION=1:5:0 +AC_SUBST(VVH_DLL_VERSION) + +dnl Infos extracted from vtl/configure.in +VTL_DLL_VERSION=1:5:0 +AC_SUBST(VTL_DLL_VERSION) + +dnl Infos extracted from pat/configure.in +PAT_DLL_VERSION=1:9:0 +AC_SUBST(PAT_DLL_VERSION) + +dnl Infos extracted from ppt/configure.in +PPT_DLL_VERSION=1:9:0 +AC_SUBST(PPT_DLL_VERSION) + +dnl Infos extracted from phl/configure.in +PHL_DLL_VERSION=1:9:0 +AC_SUBST(PHL_DLL_VERSION) + +dnl Infos extracted from druc/configure.in +VRD_DLL_VERSION=3:4:0 +AC_SUBST(VRD_DLL_VERSION) + +dnl Infos extracted from beh/configure.in +BEH_DLL_VERSION=1:11:0 +AC_SUBST(BEH_DLL_VERSION) + +dnl Infos extracted from bhl/configure.in +BHL_DLL_VERSION=1:11:0 +AC_SUBST(BHL_DLL_VERSION) + +dnl Infos extracted from bvl/configure.in +BVL_DLL_VERSION=1:14:0 +AC_SUBST(BVL_DLL_VERSION) + +dnl Infos extracted from alcban/configure.in +ALCBANNER_MAJOR_VERSION=1 +AC_SUBST(ALCBANNER_MAJOR_VERSION) +ALCBANNER_MINOR_VERSION=1 +AC_SUBST(ALCBANNER_MINOR_VERSION) +ALCBANNER_VERSION=$ALCBANNER_MAJOR_VERSION.$ALCBANNER_MINOR_VERSION +AC_SUBST(ALCBANNER_VERSION) + +dnl Infos extracted from asimut/configure.in +CST_DLL_VERSION=3:2:0 +AC_SUBST(CST_DLL_VERSION) +SCH_DLL_VERSION=3:2:0 +AC_SUBST(SCH_DLL_VERSION) + +dnl Infos extracted from attila/configure.in +ATTILA_MAJOR_VERSION=0 +AC_SUBST(ATTILA_MAJOR_VERSION) +ATTILA_MINOR_VERSION=1 +AC_SUBST(ATTILA_MINOR_VERSION) +ATTILA_VERSION=$ATTILA_MAJOR_VERSION.$ATTILA_MINOR_VERSION +AC_SUBST(ATTILA_VERSION) + +dnl Infos extracted from b2f/configure.in +B2F_MAJOR_VERSION=1 +AC_SUBST(B2F_MAJOR_VERSION) +B2F_MINOR_VERSION=2 +AC_SUBST(B2F_MINOR_VERSION) +B2F_VERSION=$B2F_MAJOR_VERSION.$B2F_MINOR_VERSION +AC_SUBST(B2F_VERSION) + +dnl Infos extracted from boog/configure.in +BOOG_MAJOR_VERSION=1 +AC_SUBST(BOOG_MAJOR_VERSION) +BOOG_MINOR_VERSION=7 +AC_SUBST(BOOG_MINOR_VERSION) +BOOG_VERSION=$BOOG_MAJOR_VERSION.$BOOG_MINOR_VERSION +AC_SUBST(BOOG_VERSION) + +dnl Infos extracted from boom/configure.in +BOOM_MAJOR_VERSION=1 +AC_SUBST(BOOM_MAJOR_VERSION) +BOOM_MINOR_VERSION=2 +AC_SUBST(BOOM_MINOR_VERSION) +BOOM_VERSION=$BOOM_MAJOR_VERSION.$BOOM_MINOR_VERSION +AC_SUBST(BOOM_VERSION) + +dnl Infos extracted from cells/configure.in + +dnl Infos extracted from distrib/configure.in + +dnl Infos extracted from documentation/configure.in +DOC_MAJOR_VERSION=1 +AC_SUBST(DOC_MAJOR_VERSION) +DOC_MINOR_VERSION=0 +AC_SUBST(DOC_MINOR_VERSION) +DOC_VERSION=$DOC_MAJOR_VERSION.$DOC_MINOR_VERSION +AC_SUBST(DOC_VERSION) + +dnl Infos extracted from dreal/configure.in +DREAL_MAJOR_VERSION=1 +AC_SUBST(DREAL_MAJOR_VERSION) +DREAL_MINOR_VERSION=14 +AC_SUBST(DREAL_MINOR_VERSION) +DREAL_VERSION=$DREAL_MAJOR_VERSION.$DREAL_MINOR_VERSION +AC_SUBST(DREAL_VERSION) + +dnl Infos extracted from exp/configure.in +EXP_MAJOR_VERSION=1 +AC_SUBST(EXP_MAJOR_VERSION) +EXP_MINOR_VERSION=0 +AC_SUBST(EXP_MINOR_VERSION) +EXP_VERSION=$EXP_MAJOR_VERSION.$EXP_MINOR_VERSION +AC_SUBST(EXP_VERSION) + +dnl Infos extracted from flatbeh/configure.in +FLATBEH_MAJOR_VERSION=1 +AC_SUBST(FLATBEH_MAJOR_VERSION) +FLATBEH_MINOR_VERSION=1 +AC_SUBST(FLATBEH_MINOR_VERSION) +FLATBEH_VERSION=$FLATBEH_MAJOR_VERSION.$FLATBEH_MINOR_VERSION +AC_SUBST(FLATBEH_VERSION) + +dnl Infos extracted from flatlo/configure.in + +dnl Infos extracted from flatph/configure.in + +dnl Infos extracted from fmi/configure.in +FMI_MAJOR_VERSION=1 +AC_SUBST(FMI_MAJOR_VERSION) +FMI_MINOR_VERSION=1 +AC_SUBST(FMI_MINOR_VERSION) +FMI_VERSION=$FMI_MAJOR_VERSION.$FMI_MINOR_VERSION +AC_SUBST(FMI_VERSION) + +dnl Infos extracted from fsp/configure.in +FSP_MAJOR_VERSION=1 +AC_SUBST(FSP_MAJOR_VERSION) +FSP_MINOR_VERSION=1 +AC_SUBST(FSP_MINOR_VERSION) +FSP_VERSION=$FSP_MAJOR_VERSION.$FSP_MINOR_VERSION +AC_SUBST(FSP_VERSION) + +dnl Infos extracted from genlib/configure.in +MGN_DLL_VERSION=3:3:0 +AC_SUBST(MGN_DLL_VERSION) + +dnl Infos extracted from genpat/configure.in +PGN_DLL_VERSION=3:3:0 +AC_SUBST(PGN_DLL_VERSION) + +dnl Infos extracted from graal/configure.in +GRAAL_MAJOR_VERSION=1 +AC_SUBST(GRAAL_MAJOR_VERSION) +GRAAL_MINOR_VERSION=27 +AC_SUBST(GRAAL_MINOR_VERSION) +GRAAL_VERSION=$GRAAL_MAJOR_VERSION.$GRAAL_MINOR_VERSION +AC_SUBST(GRAAL_VERSION) + +dnl Infos extracted from k2f/configure.in +K2F_MAJOR_VERSION=1 +AC_SUBST(K2F_MAJOR_VERSION) +K2F_MINOR_VERSION=1 +AC_SUBST(K2F_MINOR_VERSION) +K2F_VERSION=$K2F_MAJOR_VERSION.$K2F_MINOR_VERSION +AC_SUBST(K2F_VERSION) + +dnl Infos extracted from l2p/configure.in +L2P_MAJOR_VERSION=1 +AC_SUBST(L2P_MAJOR_VERSION) +L2P_MINOR_VERSION=12 +AC_SUBST(L2P_MINOR_VERSION) +L2P_VERSION=$L2P_MAJOR_VERSION.$L2P_MINOR_VERSION +AC_SUBST(L2P_VERSION) + +dnl Infos extracted from loon/configure.in +LOON_MAJOR_VERSION=1 +AC_SUBST(LOON_MAJOR_VERSION) +LOON_MINOR_VERSION=7 +AC_SUBST(LOON_MINOR_VERSION) +LOON_VERSION=$LOON_MAJOR_VERSION.$LOON_MINOR_VERSION +AC_SUBST(LOON_VERSION) + +dnl Infos extracted from lvx/configure.in +LVX_MAJOR_VERSION=1 +AC_SUBST(LVX_MAJOR_VERSION) +LVX_MINOR_VERSION=2 +AC_SUBST(LVX_MINOR_VERSION) +LVX_VERSION=$LVX_MAJOR_VERSION.$LVX_MINOR_VERSION +AC_SUBST(LVX_VERSION) + +dnl Infos extracted from lynx/configure.in +LYNX_MAJOR_VERSION=1 +AC_SUBST(LYNX_MAJOR_VERSION) +LYNX_MINOR_VERSION=21 +AC_SUBST(LYNX_MINOR_VERSION) +LYNX_VERSION=$LYNX_MAJOR_VERSION.$LYNX_MINOR_VERSION +AC_SUBST(LYNX_VERSION) + +dnl Infos extracted from m2e/configure.in +M2E_MAJOR_VERSION=1 +AC_SUBST(M2E_MAJOR_VERSION) +M2E_MINOR_VERSION=0 +AC_SUBST(M2E_MINOR_VERSION) +M2E_VERSION=$M2E_MAJOR_VERSION.$M2E_MINOR_VERSION +AC_SUBST(M2E_VERSION) + +dnl Infos extracted from mips_asm/configure.in +MIPS_ASM_MAJOR_VERSION=1 +AC_SUBST(MIPS_ASM_MAJOR_VERSION) +MIPS_ASM_MINOR_VERSION=0 +AC_SUBST(MIPS_ASM_MINOR_VERSION) +MIPS_ASM_VERSION=$MIPS_ASM_MAJOR_VERSION.$MIPS_ASM_MINOR_VERSION +AC_SUBST(MIPS_ASM_VERSION) + +dnl Infos extracted from mocha/configure.in +MOCHA_MAJOR_VERSION=1 +AC_SUBST(MOCHA_MAJOR_VERSION) +MOCHA_MINOR_VERSION=1 +AC_SUBST(MOCHA_MINOR_VERSION) +MOCHA_VERSION=$MOCHA_MAJOR_VERSION.$MOCHA_MINOR_VERSION +AC_SUBST(MOCHA_VERSION) + +dnl Infos extracted from nero/configure.in +NERO_MAJOR_VERSION=1 +AC_SUBST(NERO_MAJOR_VERSION) +NERO_MINOR_VERSION=0 +AC_SUBST(NERO_MINOR_VERSION) +NERO_VERSION=$NERO_MAJOR_VERSION.$NERO_MINOR_VERSION +AC_SUBST(NERO_VERSION) + +dnl Infos extracted from ocp/configure.in +OCP_MAJOR_VERSION=1 +AC_SUBST(OCP_MAJOR_VERSION) +OCP_MINOR_VERSION=0 +AC_SUBST(OCP_MINOR_VERSION) +OCP_VERSION=$OCP_MAJOR_VERSION.$OCP_MINOR_VERSION +AC_SUBST(OCP_VERSION) + +dnl Infos extracted from pat2spi/configure.in +PAT2SPI_MAJOR_VERSION=1 +AC_SUBST(PAT2SPI_MAJOR_VERSION) +PAT2SPI_MINOR_VERSION=1 +AC_SUBST(PAT2SPI_MINOR_VERSION) +PAT2SPI_VERSION=$PAT2SPI_MAJOR_VERSION.$PAT2SPI_MINOR_VERSION +AC_SUBST(PAT2SPI_VERSION) + +dnl Infos extracted from proof/configure.in +PROOF_MAJOR_VERSION=4 +AC_SUBST(PROOF_MAJOR_VERSION) +PROOF_MINOR_VERSION=9 +AC_SUBST(PROOF_MINOR_VERSION) +PROOF_VERSION=$PROOF_MAJOR_VERSION.$PROOF_MINOR_VERSION +AC_SUBST(PROOF_VERSION) + +dnl Infos extracted from ring/configure.in +RING_MAJOR_VERSION=3 +AC_SUBST(RING_MAJOR_VERSION) +RING_MINOR_VERSION=0 +AC_SUBST(RING_MINOR_VERSION) +RING_VERSION=$RING_MAJOR_VERSION.$RING_MINOR_VERSION +AC_SUBST(RING_VERSION) + +dnl Infos extracted from s2r/configure.in +S2R_MAJOR_VERSION=4 +AC_SUBST(S2R_MAJOR_VERSION) +S2R_MINOR_VERSION=4 +AC_SUBST(S2R_MINOR_VERSION) +S2R_VERSION=$S2R_MAJOR_VERSION.$S2R_MINOR_VERSION +AC_SUBST(S2R_VERSION) + +dnl Infos extracted from scapin/configure.in +SCAPIN_MAJOR_VERSION=1 +AC_SUBST(SCAPIN_MAJOR_VERSION) +SCAPIN_MINOR_VERSION=1 +AC_SUBST(SCAPIN_MINOR_VERSION) +SCAPIN_VERSION=$SCAPIN_MAJOR_VERSION.$SCAPIN_MINOR_VERSION +AC_SUBST(SCAPIN_VERSION) + +dnl Infos extracted from sea/configure.in +SEA_MAJOR_VERSION=1 +AC_SUBST(SEA_MAJOR_VERSION) +SEA_MINOR_VERSION=0 +AC_SUBST(SEA_MINOR_VERSION) +SEA_VERSION=$SEA_MAJOR_VERSION.$SEA_MINOR_VERSION +AC_SUBST(SEA_VERSION) + +dnl Infos extracted from syf/configure.in +SYF_MAJOR_VERSION=3 +AC_SUBST(SYF_MAJOR_VERSION) +SYF_MINOR_VERSION=6 +AC_SUBST(SYF_MINOR_VERSION) +SYF_VERSION=$SYF_MAJOR_VERSION.$SYF_MINOR_VERSION +AC_SUBST(SYF_VERSION) + +dnl Infos extracted from vasy/configure.in +VASY_MAJOR_VERSION=1 +AC_SUBST(VASY_MAJOR_VERSION) +VASY_MINOR_VERSION=5 +AC_SUBST(VASY_MINOR_VERSION) +VASY_VERSION=$VASY_MAJOR_VERSION.$VASY_MINOR_VERSION +AC_SUBST(VASY_VERSION) + +dnl Infos extracted from x2y/configure.in + +dnl Infos extracted from xfsm/configure.in +XFSM_MAJOR_VERSION=1 +AC_SUBST(XFSM_MAJOR_VERSION) +XFSM_MINOR_VERSION=4 +AC_SUBST(XFSM_MINOR_VERSION) +XFSM_VERSION=$XFSM_MAJOR_VERSION.$XFSM_MINOR_VERSION +AC_SUBST(XFSM_VERSION) + +dnl Infos extracted from xpat/configure.in +XPAT_MAJOR_VERSION=1 +AC_SUBST(XPAT_MAJOR_VERSION) +XPAT_MINOR_VERSION=4 +AC_SUBST(XPAT_MINOR_VERSION) +XPAT_VERSION=$XPAT_MAJOR_VERSION.$XPAT_MINOR_VERSION +AC_SUBST(XPAT_VERSION) + +dnl Infos extracted from xsch/configure.in +XSCH_MAJOR_VERSION=1 +AC_SUBST(XSCH_MAJOR_VERSION) +XSCH_MINOR_VERSION=4 +AC_SUBST(XSCH_MINOR_VERSION) +XSCH_VERSION=$XSCH_MAJOR_VERSION.$XSCH_MINOR_VERSION +AC_SUBST(XSCH_VERSION) + +dnl Infos extracted from xvpn/configure.in +XVPN_MAJOR_VERSION=1 +AC_SUBST(XVPN_MAJOR_VERSION) +XVPN_MINOR_VERSION=5 +AC_SUBST(XVPN_MINOR_VERSION) +XVPN_VERSION=$XVPN_MAJOR_VERSION.$XVPN_MINOR_VERSION +AC_SUBST(XVPN_VERSION) + +TOOLSDIRS="mbk mbkal mbkap mbkedif mbkhilo mbkmg mbkspice mbkvhdl mbkvrlog mbkvti mbkvhdlg aut rds rdscif rdsgds elp abl bdd log btr vex ctl ctp abe abt abv fsm fks fvh ftl rtn rtd scl vbh vbl vpn vpd vvh vtl pat ppt phl druc beh bhl bvl alcban asimut attila b2f boog boom cells distrib documentation dreal exp flatbeh flatlo flatph fmi fsp genlib genpat graal k2f l2p loon lvx lynx m2e mips_asm mocha nero ocp pat2spi proof ring s2r scapin sea syf vasy x2y xfsm xpat xsch xvpn" +AC_SUBST(TOOLSDIRS) AC_OUTPUT([ Makefile +distrib/etc/alc_env.sh +distrib/etc/alc_env.csh +mbk/Makefile +mbk/man1/Makefile +mbk/man3/Makefile +mbk/man5/Makefile +mbk/src/Makefile +mbkal/Makefile +mbkal/doc/Makefile +mbkal/src/Makefile +mbkap/Makefile +mbkap/src/Makefile +mbkedif/Makefile +mbkedif/src/Makefile +mbkhilo/Makefile +mbkhilo/src/Makefile +mbkmg/Makefile +mbkmg/src/Makefile +mbkspice/Makefile +mbkspice/doc/Makefile +mbkspice/etc/Makefile +mbkspice/src/Makefile +mbkvhdl/Makefile +mbkvhdl/src/Makefile +mbkvrlog/Makefile +mbkvrlog/src/Makefile +mbkvti/Makefile +mbkvti/src/Makefile +mbkvhdlg/Makefile +mbkvhdlg/src/Makefile +aut/Makefile +aut/man1/Makefile +aut/man3/Makefile +aut/src/Makefile +rds/Makefile +rds/etc/Makefile +rds/man3/Makefile +rds/src/Makefile +rdscif/Makefile +rdscif/src/Makefile +rdsgds/Makefile +rdsgds/src/Makefile +elp/Makefile +elp/etc/Makefile +elp/src/Makefile +abl/Makefile +abl/man1/Makefile +abl/man3/Makefile +abl/src/Makefile +bdd/Makefile +bdd/man1/Makefile +bdd/man3/Makefile +bdd/src/Makefile +log/Makefile +log/man1/Makefile +log/man3/Makefile +log/src/Makefile +btr/Makefile +btr/src/Makefile +vex/Makefile +vex/src/Makefile +ctl/Makefile +ctl/man5/Makefile +ctl/src/Makefile +ctp/Makefile +ctp/src/Makefile +abe/Makefile +abe/src/Makefile +abt/Makefile +abt/src/Makefile +abv/Makefile +abv/src/Makefile +fsm/Makefile +fsm/man1/Makefile +fsm/man5/Makefile +fsm/src/Makefile +fks/Makefile +fks/src/Makefile +fvh/Makefile +fvh/src/Makefile +ftl/Makefile +ftl/src/Makefile +rtn/Makefile +rtn/src/Makefile +rtd/Makefile +rtd/src/Makefile +scl/Makefile +scl/src/Makefile +vbh/Makefile +vbh/src/Makefile +vbl/Makefile +vbl/src/Makefile +vpn/Makefile +vpn/src/Makefile +vpd/Makefile +vpd/src/Makefile +vvh/Makefile +vvh/src/Makefile +vtl/Makefile +vtl/src/Makefile +pat/Makefile +pat/doc/Makefile +pat/src/Makefile +ppt/Makefile +ppt/src/Makefile +phl/Makefile +phl/src/Makefile +druc/Makefile +druc/man1/Makefile +druc/src/Makefile +beh/Makefile +beh/man3/Makefile +beh/src/Makefile +bhl/Makefile +bhl/src/Makefile +bvl/Makefile +bvl/src/Makefile +alcban/Makefile +alcban/man1/Makefile +alcban/src/Makefile +asimut/Makefile +asimut/man1/Makefile +asimut/src/Makefile +attila/Makefile +attila/doc/Makefile +attila/doc/attila/Makefile +attila/doc/man1/Makefile +attila/etc/Makefile +attila/src/Makefile +b2f/Makefile +b2f/src/Makefile +boog/Makefile +boog/doc/Makefile +boog/src/Makefile +boom/Makefile +boom/man1/Makefile +boom/src/Makefile +cells/Makefile +cells/doc/Makefile +cells/src/Makefile +cells/src/dp_sxlib/Makefile +cells/src/padlib/Makefile +cells/src/ramlib/Makefile +cells/src/rflib/Makefile +cells/src/romlib/Makefile +cells/src/sxlib/Makefile +distrib/Makefile +distrib/doc/Makefile +distrib/etc/Makefile +documentation/Makefile +documentation/tutorials/Makefile +dreal/Makefile +dreal/etc/Makefile +dreal/man1/Makefile +dreal/src/Makefile +exp/Makefile +exp/doc/Makefile +exp/src/Makefile +flatbeh/Makefile +flatbeh/doc/Makefile +flatbeh/src/Makefile +flatlo/Makefile +flatlo/doc/Makefile +flatlo/src/Makefile +flatph/Makefile +flatph/doc/Makefile +flatph/src/Makefile +fmi/Makefile +fmi/man1/Makefile +fmi/src/Makefile +fsp/Makefile +fsp/man1/Makefile +fsp/src/Makefile +genlib/Makefile +genlib/doc/Makefile +genlib/doc/genlib/Makefile +genlib/man1/Makefile +genlib/man3/Makefile +genlib/src/Makefile +genpat/Makefile +genpat/doc/Makefile +genpat/doc/man1/Makefile +genpat/doc/man3/Makefile +genpat/src/Makefile +graal/Makefile +graal/etc/Makefile +graal/man1/Makefile +graal/src/Makefile +k2f/Makefile +k2f/man1/Makefile +k2f/src/Makefile +l2p/Makefile +l2p/man1/Makefile +l2p/src/Makefile +loon/Makefile +loon/doc/Makefile +loon/src/Makefile +lvx/Makefile +lvx/doc/Makefile +lvx/src/Makefile +lynx/Makefile +lynx/man1/Makefile +lynx/src/Makefile +m2e/Makefile +m2e/doc/Makefile +m2e/doc/man1/Makefile +m2e/src/Makefile +mips_asm/Makefile +mips_asm/src/Makefile +mocha/Makefile +mocha/man1/Makefile +mocha/src/Makefile +nero/Makefile +nero/doc/Makefile +nero/doc/man1/Makefile +nero/doc/nero/Makefile +nero/src/Makefile +ocp/Makefile +ocp/doc/Makefile +ocp/src/Makefile +ocp/src/common/Makefile +ocp/src/placer/Makefile +pat2spi/Makefile +pat2spi/man1/Makefile +pat2spi/src/Makefile +proof/Makefile +proof/man1/Makefile +proof/src/Makefile +ring/Makefile +ring/doc/Makefile +ring/src/Makefile +s2r/Makefile +s2r/doc/Makefile +s2r/src/Makefile +scapin/Makefile +scapin/etc/Makefile +scapin/man1/Makefile +scapin/src/Makefile +sea/Makefile +sea/etc/Makefile +sea/src/Makefile +syf/Makefile +syf/man1/Makefile +syf/src/Makefile +vasy/Makefile +vasy/man1/Makefile +vasy/man5/Makefile +vasy/src/Makefile +x2y/Makefile +x2y/doc/Makefile +x2y/src/Makefile +xfsm/Makefile +xfsm/etc/Makefile +xfsm/src/Makefile +xpat/Makefile +xpat/etc/Makefile +xpat/man1/Makefile +xpat/src/Makefile +xsch/Makefile +xsch/etc/Makefile +xsch/man1/Makefile +xsch/src/Makefile +xvpn/Makefile +xvpn/etc/Makefile +xvpn/src/Makefile ]) diff --git a/alliance/src/ctp/src/Makefile.am b/alliance/src/ctp/src/Makefile.am index 7bdd3202..8c289550 100644 --- a/alliance/src/ctp/src/Makefile.am +++ b/alliance/src/ctp/src/Makefile.am @@ -17,7 +17,7 @@ ctp_l.c : $(srcdir)/ctp_l.l ctp_y.h EXTRA_PROGRAMS = ctptest -ctptest_LDADD = -L$(top_builddir)/src -lCtp \ +ctptest_LDADD = -L. -lCtp \ -lCtl -lVex -lAut -lMut ctptest_SOURCES = main.c diff --git a/alliance/src/druc/src/Makefile.am b/alliance/src/druc/src/Makefile.am index 1ec0e78f..074385fd 100644 --- a/alliance/src/druc/src/Makefile.am +++ b/alliance/src/druc/src/Makefile.am @@ -22,7 +22,7 @@ bin_PROGRAMS = druc AM_CFLAGS = -druc_LDADD = -L$(top_builddir)/src -lVrd \ +druc_LDADD = -L. -lVrd \ -lRtl -lRgs -lRcf -lRfm -lRpr -lRwi -lRut -lRds -lMpu -lMcp -lMap -lMmg -lMph \ -lMut diff --git a/alliance/src/ltmain.sh b/alliance/src/ltmain.sh index 5b79699c..fae0e5d0 100644 --- a/alliance/src/ltmain.sh +++ b/alliance/src/ltmain.sh @@ -1,7 +1,7 @@ # ltmain.sh - Provide generalized library-building support services. # NOTE: Changing this file will not affect anything until you rerun configure. # -# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003 +# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004 # Free Software Foundation, Inc. # Originally by Gordon Matzigkeit , 1996 # @@ -24,6 +24,32 @@ # configuration script generated by Autoconf, you may include it under # the same distribution terms that you use for the rest of that program. +basename="s,^.*/,,g" + +# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh +# is ksh but when the shell is invoked as "sh" and the current value of +# the _XPG environment variable is not equal to 1 (one), the special +# positional parameter $0, within a function call, is the name of the +# function. +progpath="$0" + +# RH: define SED for historic ltconfig's generated by Libtool 1.3 +[ -z "$SED" ] && SED=sed + +# The name of this program: +progname=`echo "$progpath" | $SED $basename` +modename="$progname" + +# Global variables: +EXIT_SUCCESS=0 +EXIT_FAILURE=1 + +PROGRAM=ltmain.sh +PACKAGE=libtool +VERSION=1.5.6 +TIMESTAMP=" (1.1220.2.95 2004/04/11 05:50:42)" + + # Check that we have a working $echo. if test "X$1" = X--no-reexec; then # Discard the --no-reexec flag, and continue. @@ -36,7 +62,7 @@ elif test "X`($echo '\t') 2>/dev/null`" = 'X\t'; then : else # Restart under the correct shell, and then maybe $echo will work. - exec $SHELL "$0" --no-reexec ${1+"$@"} + exec $SHELL "$progpath" --no-reexec ${1+"$@"} fi if test "X$1" = X--fallback-echo; then @@ -45,22 +71,9 @@ if test "X$1" = X--fallback-echo; then cat <&2 $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Global variables. @@ -121,10 +135,13 @@ o2lo="s/\\.${objext}\$/.lo/" # Shell function definitions: # This seems to be the best place for them +# func_win32_libid arg +# return the library type of file 'arg' +# # Need a lot of goo to handle *both* DLLs and import libs # Has to be a shell function in order to 'eat' the argument # that is supplied when $file_magic_command is called. -win32_libid () { +func_win32_libid () { win32_libid_type="unknown" win32_fileres=`file -L $1 2>/dev/null` case $win32_fileres in @@ -133,7 +150,7 @@ win32_libid () { ;; *ar\ archive*) # could be an import, or static if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \ - grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then + $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then win32_nmres=`eval $NM -f posix -A $1 | \ sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'` if test "X$win32_nmres" = "Ximport" ; then @@ -143,7 +160,7 @@ win32_libid () { fi fi ;; - *DLL*) + *DLL*) win32_libid_type="x86 DLL" ;; *executable*) # but shell scripts are "executable" too... @@ -157,9 +174,76 @@ win32_libid () { $echo $win32_libid_type } + +# func_infer_tag arg +# Infer tagged configuration to use if any are available and +# if one wasn't chosen via the "--tag" command line option. +# Only attempt this if the compiler in the base compile +# command doesn't match the default compiler. +# arg is usually of the form 'gcc ...' +func_infer_tag () { + if test -n "$available_tags" && test -z "$tagname"; then + CC_quoted= + for arg in $CC; do + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac + CC_quoted="$CC_quoted $arg" + done + case $@ in + # Blanks in the command may have been stripped by the calling shell, + # but not from the CC environment variable when configure was run. + " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;; + # Blanks at the start of $base_compile will cause this to fail + # if we don't check for them as well. + *) + for z in $available_tags; do + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then + # Evaluate the configuration. + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`" + CC_quoted= + for arg in $CC; do + # Double-quote args containing other shell metacharacters. + case $arg in + *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") + arg="\"$arg\"" + ;; + esac + CC_quoted="$CC_quoted $arg" + done + case "$@ " in + " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) + # The compiler in the base compile command matches + # the one in the tagged configuration. + # Assume this is the tagged configuration we want. + tagname=$z + break + ;; + esac + fi + done + # If $tagname still isn't set, then no tagged configuration + # was found and let the user know that the "--tag" command + # line option must be used. + if test -z "$tagname"; then + $echo "$modename: unable to infer tagged configuration" + $echo "$modename: specify a tag with \`--tag'" 1>&2 + exit $EXIT_FAILURE +# else +# $echo "$modename: using $tagname tagged configuration" + fi + ;; + esac + fi +} # End of Shell function definitions ##################################### +# Darwin sucks +eval std_shrext=\"$shrext_cmds\" + # Parse our command line options once, thoroughly. while test "$#" -gt 0 do @@ -179,12 +263,13 @@ do ;; tag) tagname="$arg" + preserve_args="${preserve_args}=$arg" # Check whether tagname contains only valid characters case $tagname in *[!-_A-Za-z0-9,/]*) $echo "$progname: invalid tag name: $tagname" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac @@ -194,10 +279,10 @@ do # not specially marked. ;; *) - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then + if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then taglist="$taglist $tagname" # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`" + eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`" else $echo "$progname: ignoring unknown tag $tagname" 1>&2 fi @@ -226,21 +311,22 @@ do $echo "Copyright (C) 2003 Free Software Foundation, Inc." $echo "This is free software; see the source for copying conditions. There is NO" $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE." - exit 0 + exit $EXIT_SUCCESS ;; --config) - ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0 + ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath # Now print the configurations for the tags. for tagname in $taglist; do - ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0" + ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath" done - exit 0 + exit $EXIT_SUCCESS ;; --debug) $echo "$progname: enabling shell trace mode" set -x + preserve_args="$preserve_args $arg" ;; --dry-run | -n) @@ -259,7 +345,7 @@ do else $echo "disable static libraries" fi - exit 0 + exit $EXIT_SUCCESS ;; --finish) mode="finish" ;; @@ -271,6 +357,7 @@ do --quiet | --silent) show=: + preserve_args="$preserve_args $arg" ;; --tag) prevopt="--tag" prev=tag ;; @@ -278,6 +365,7 @@ do set tag "$optarg" ${1+"$@"} shift prev=tag + preserve_args="$preserve_args --tag" ;; -dlopen) @@ -288,7 +376,7 @@ do -*) $echo "$modename: unrecognized option \`$arg'" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; *) @@ -301,7 +389,7 @@ done if test -n "$prevopt"; then $echo "$modename: option \`$prevopt' requires an argument" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # If this variable is set in any of the actions, the command in it @@ -357,7 +445,7 @@ if test -z "$show_help"; then if test -n "$execute_dlfiles" && test "$mode" != execute; then $echo "$modename: unrecognized option \`-dlopen'" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Change the help message to a mode-specific one. @@ -372,9 +460,11 @@ if test -z "$show_help"; then # Get the compilation command and the source file. base_compile= srcfile="$nonopt" # always keep a non-empty value in "srcfile" + suppress_opt=yes suppress_output= arg_mode=normal libobj= + later= for arg do @@ -397,24 +487,19 @@ if test -z "$show_help"; then -o) if test -n "$libobj" ; then $echo "$modename: you cannot specify \`-o' more than once" 1>&2 - exit 1 + exit $EXIT_FAILURE fi arg_mode=target continue ;; - -static) - build_old_libs=yes + -static | -prefer-pic | -prefer-non-pic) + later="$later $arg" continue ;; - -prefer-pic) - pic_mode=yes - continue - ;; - - -prefer-non-pic) - pic_mode=no + -no-suppress) + suppress_opt=no continue ;; @@ -427,7 +512,7 @@ if test -z "$show_help"; then args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"` lastarg= save_ifs="$IFS"; IFS=',' - for arg in $args; do + for arg in $args; do IFS="$save_ifs" # Double-quote args containing other shell metacharacters. @@ -477,11 +562,11 @@ if test -z "$show_help"; then case $arg_mode in arg) $echo "$modename: you must specify an argument for -Xcompile" - exit 1 + exit $EXIT_FAILURE ;; target) $echo "$modename: you must specify a target with \`-o'" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; *) # Get the name of the library object. @@ -514,50 +599,30 @@ if test -z "$show_help"; then *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;; *) $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac - # Infer tagged configuration to use if any are available and - # if one wasn't chosen via the "--tag" command line option. - # Only attempt this if the compiler in the base compile - # command doesn't match the default compiler. - if test -n "$available_tags" && test -z "$tagname"; then - case $base_compile in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. - " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) - for z in $available_tags; do - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" - case "$base_compile " in - "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) - # The compiler in the base compile command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. - tagname=$z - break - ;; - esac - fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command - # line option must be used. - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" - $echo "$modename: specify a tag with \`--tag'" 1>&2 - exit 1 -# else -# $echo "$modename: using $tagname tagged configuration" - fi + func_infer_tag $base_compile + + for arg in $later; do + case $arg in + -static) + build_old_libs=yes + continue + ;; + + -prefer-pic) + pic_mode=yes + continue + ;; + + -prefer-non-pic) + pic_mode=no + continue ;; esac - fi + done objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'` xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'` @@ -571,7 +636,7 @@ if test -z "$show_help"; then if test -z "$base_compile"; then $echo "$modename: you must specify a compilation command" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Delete any leftover library objects. @@ -582,7 +647,7 @@ if test -z "$show_help"; then fi $run $rm $removelist - trap "$run $rm $removelist; exit 1" 1 2 15 + trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 # On Cygwin there's no "real" PIC flag so we must build both object types case $host_os in @@ -601,7 +666,7 @@ if test -z "$show_help"; then output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext} lockfile="$output_obj.lock" removelist="$removelist $output_obj $lockfile" - trap "$run $rm $removelist; exit 1" 1 2 15 + trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15 else output_obj= need_locks=no @@ -611,7 +676,7 @@ if test -z "$show_help"; then # Lock this critical section if it is needed # We use this script file to make the link, it avoids creating a new file if test "$need_locks" = yes; then - until $run ln "$0" "$lockfile" 2>/dev/null; do + until $run ln "$progpath" "$lockfile" 2>/dev/null; do $show "Waiting for $lockfile to be removed" sleep 2 done @@ -629,7 +694,7 @@ avoid parallel builds (make -j) in this platform, or get a better compiler." $run $rm $removelist - exit 1 + exit $EXIT_FAILURE fi $echo $srcfile > "$lockfile" fi @@ -684,7 +749,7 @@ EOF if $run eval "$command"; then : else test -n "$output_obj" && $run $rm $removelist - exit 1 + exit $EXIT_FAILURE fi if test "$need_locks" = warn && @@ -704,7 +769,7 @@ avoid parallel builds (make -j) in this platform, or get a better compiler." $run $rm $removelist - exit 1 + exit $EXIT_FAILURE fi # Just move the object if needed, then go on to compile the next one @@ -725,7 +790,9 @@ pic_object='$objdir/$objname' EOF # Allow error messages only from the first compilation. - suppress_output=' >/dev/null 2>&1' + if test "$suppress_opt" = yes; then + suppress_output=' >/dev/null 2>&1' + fi else # No PIC object so indicate it doesn't exist in the libtool # object file. @@ -754,7 +821,7 @@ EOF if $run eval "$command"; then : else $run $rm $removelist - exit 1 + exit $EXIT_FAILURE fi if test "$need_locks" = warn && @@ -774,7 +841,7 @@ avoid parallel builds (make -j) in this platform, or get a better compiler." $run $rm $removelist - exit 1 + exit $EXIT_FAILURE fi # Just move the object if needed @@ -812,7 +879,7 @@ EOF $run $rm "$lockfile" fi - exit 0 + exit $EXIT_SUCCESS ;; # libtool link mode @@ -838,7 +905,7 @@ EOF ;; esac libtool_args="$nonopt" - base_compile="$nonopt" + base_compile="$nonopt $@" compile_command="$nonopt" finalize_command="$nonopt" @@ -870,6 +937,7 @@ EOF no_install=no objs= non_pic_objects= + precious_files_regex= prefer_static_libs=no preload=no prev= @@ -883,6 +951,8 @@ EOF vinfo= vinfo_number=no + func_infer_tag $base_compile + # We need to know -static, to get the right output filenames. for arg do @@ -914,7 +984,6 @@ EOF # Go through the arguments, transforming them on the way. while test "$#" -gt 0; do arg="$1" - base_compile="$base_compile $arg" shift case $arg in *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"") @@ -978,7 +1047,7 @@ EOF export_symbols="$arg" if test ! -f "$arg"; then $echo "$modename: symbol file \`$arg' does not exist" - exit 1 + exit $EXIT_FAILURE fi prev= continue @@ -993,6 +1062,11 @@ EOF prev= continue ;; + precious_regex) + precious_files_regex="$arg" + prev= + continue + ;; release) release="-$arg" prev= @@ -1025,7 +1099,7 @@ EOF test "$pic_object" = none && \ test "$non_pic_object" = none; then $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Extract subdirectory from the argument. @@ -1078,7 +1152,7 @@ EOF # Only an error if not doing a dry-run. if test -z "$run"; then $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit 1 + exit $EXIT_FAILURE else # Dry-run case. @@ -1099,7 +1173,7 @@ EOF done else $echo "$modename: link input file \`$save_arg' does not exist" - exit 1 + exit $EXIT_FAILURE fi arg=$save_arg prev= @@ -1111,7 +1185,7 @@ EOF [\\/]* | [A-Za-z]:[\\/]*) ;; *) $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac if test "$prev" = rpath; then @@ -1151,6 +1225,11 @@ EOF finalize_command="$finalize_command $qarg" continue ;; + shrext) + shrext_cmds="$arg" + prev= + continue + ;; *) eval "$prev=\"\$arg\"" prev= @@ -1199,7 +1278,7 @@ EOF -export-symbols | -export-symbols-regex) if test -n "$export_symbols" || test -n "$export_symbols_regex"; then $echo "$modename: more than one -exported-symbols argument is not allowed" - exit 1 + exit $EXIT_FAILURE fi if test "X$arg" = "X-export-symbols"; then prev=expsyms @@ -1235,7 +1314,7 @@ EOF absdir=`cd "$dir" && pwd` if test -z "$absdir"; then $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi dir="$absdir" ;; @@ -1290,6 +1369,11 @@ EOF continue ;; + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) + deplibs="$deplibs $arg" + continue + ;; + -module) module=yes continue @@ -1354,6 +1438,11 @@ EOF -o) prev=output ;; + -precious-files-regex) + prev=precious_regex + continue + ;; + -release) prev=release continue @@ -1376,7 +1465,7 @@ EOF [\\/]* | [A-Za-z]:[\\/]*) ;; *) $echo "$modename: only absolute run-paths are allowed" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac case "$xrpath " in @@ -1499,7 +1588,7 @@ EOF test "$pic_object" = none && \ test "$non_pic_object" = none; then $echo "$modename: cannot find name of object for \`$arg'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Extract subdirectory from the argument. @@ -1552,7 +1641,7 @@ EOF # Only an error if not doing a dry-run. if test -z "$run"; then $echo "$modename: \`$arg' is not a valid libtool object" 1>&2 - exit 1 + exit $EXIT_FAILURE else # Dry-run case. @@ -1619,48 +1708,7 @@ EOF if test -n "$prev"; then $echo "$modename: the \`$prevarg' option requires an argument" 1>&2 $echo "$help" 1>&2 - exit 1 - fi - - # Infer tagged configuration to use if any are available and - # if one wasn't chosen via the "--tag" command line option. - # Only attempt this if the compiler in the base link - # command doesn't match the default compiler. - if test -n "$available_tags" && test -z "$tagname"; then - case $base_compile in - # Blanks in the command may have been stripped by the calling shell, - # but not from the CC environment variable when configure was run. - "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;; - # Blanks at the start of $base_compile will cause this to fail - # if we don't check for them as well. - *) - for z in $available_tags; do - if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then - # Evaluate the configuration. - eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`" - case $base_compile in - "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) - # The compiler in $compile_command matches - # the one in the tagged configuration. - # Assume this is the tagged configuration we want. - tagname=$z - break - ;; - esac - fi - done - # If $tagname still isn't set, then no tagged configuration - # was found and let the user know that the "--tag" command - # line option must be used. - if test -z "$tagname"; then - $echo "$modename: unable to infer tagged configuration" - $echo "$modename: specify a tag with \`--tag'" 1>&2 - exit 1 -# else -# $echo "$modename: using $tagname tagged configuration" - fi - ;; - esac + exit $EXIT_FAILURE fi if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then @@ -1704,7 +1752,7 @@ EOF "") $echo "$modename: you must specify an output file" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; *.$libext) linkmode=oldlib ;; *.lo | *.$objext) linkmode=obj ;; @@ -1714,7 +1762,7 @@ EOF case $host in *cygwin* | *mingw* | *pw32*) - # don't eliminate duplcations in $postdeps and $predeps + # don't eliminate duplications in $postdeps and $predeps duplicate_compiler_generated_deps=yes ;; *) @@ -1767,7 +1815,7 @@ EOF *.la) ;; *) $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac done @@ -1805,6 +1853,15 @@ EOF lib= found=no case $deplib in + -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe) + if test "$linkmode,$pass" = "prog,link"; then + compile_deplibs="$deplib $compile_deplibs" + finalize_deplibs="$deplib $finalize_deplibs" + else + deplibs="$deplib $deplibs" + fi + continue + ;; -l*) if test "$linkmode" != lib && test "$linkmode" != prog; then $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2 @@ -1816,12 +1873,18 @@ EOF fi name=`$echo "X$deplib" | $Xsed -e 's/^-l//'` for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do - # Search the libtool library - lib="$searchdir/lib${name}.la" - if test -f "$lib"; then - found=yes - break - fi + for search_ext in .la $std_shrext .so .a; do + # Search the libtool library + lib="$searchdir/lib${name}${search_ext}" + if test -f "$lib"; then + if test "$search_ext" = ".la"; then + found=yes + else + found=no + fi + break 2 + fi + done done if test "$found" != yes; then # deplib doesn't seem to be a libtool library @@ -1886,11 +1949,11 @@ EOF fi if test "$pass" = scan; then deplibs="$deplib $deplibs" - newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` else compile_deplibs="$deplib $compile_deplibs" finalize_deplibs="$deplib $finalize_deplibs" fi + newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'` ;; *) $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2 @@ -1969,14 +2032,14 @@ EOF if test "$found" = yes || test -f "$lib"; then : else $echo "$modename: cannot find the library \`$lib'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Check to see that this really is a libtool archive. if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then : else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit 1 + exit $EXIT_FAILURE fi ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'` @@ -2012,7 +2075,7 @@ EOF if test -z "$libdir"; then if test -z "$old_library"; then $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # It is a libtool convenience library, so add in its objects. convenience="$convenience $ladir/$objdir/$old_library" @@ -2029,12 +2092,12 @@ EOF done elif test "$linkmode" != prog && test "$linkmode" != lib; then $echo "$modename: \`$lib' is not a convenience library" 1>&2 - exit 1 + exit $EXIT_FAILURE fi continue fi # $pass = conv - + # Get the name of the library we link against. linklib= for l in $old_library $library_names; do @@ -2042,16 +2105,18 @@ EOF done if test -z "$linklib"; then $echo "$modename: cannot find name of link library for \`$lib'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # This library was specified with -dlopen. if test "$pass" = dlopen; then if test -z "$libdir"; then $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi - if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then + if test -z "$dlname" || + test "$dlopen_support" != yes || + test "$build_libtool_libs" = no; then # If there is no dlname, no dlopen support or we're linking # statically, we need to preload. We also need to preload any # dependent libraries so libltdl's deplib preloader doesn't @@ -2100,7 +2165,7 @@ EOF if test "$pass" = dlpreopen; then if test -z "$libdir"; then $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Prefer using a static library (so that no silly _DYNAMIC symbols # are required to link). @@ -2127,7 +2192,7 @@ EOF continue fi - + if test "$linkmode" = prog && test "$pass" != link; then newlib_search_path="$newlib_search_path $ladir" deplibs="$lib $deplibs" @@ -2167,7 +2232,7 @@ EOF # We need to hardcode the library path if test -n "$shlibpath_var"; then # Make sure the rpath contains only unique directories. - case "$temp_rpath " in + case "$temp_rpath $rpath " in *" $dir "*) ;; *" $absdir "*) ;; *) temp_rpath="$temp_rpath $dir" ;; @@ -2180,7 +2245,7 @@ EOF case " $sys_lib_dlsearch_path " in *" $absdir "*) ;; *) - case "$compile_rpath " in + case "$compile_rpath $rpath " in *" $absdir "*) ;; *) compile_rpath="$compile_rpath $absdir" esac @@ -2189,7 +2254,7 @@ EOF case " $sys_lib_dlsearch_path " in *" $libdir "*) ;; *) - case "$finalize_rpath " in + case "$finalize_rpath $rpath " in *" $libdir "*) ;; *) finalize_rpath="$finalize_rpath $libdir" esac @@ -2214,17 +2279,18 @@ EOF need_relink=yes fi # This is a shared library - - # Warn about portability, can't link against -module's on some systems (darwin) - if test "$shouldnotlink" = yes && test "$pass" = link ; then + + # Warn about portability, can't link against -module's on + # some systems (darwin) + if test "$shouldnotlink" = yes && test "$pass" = link ; then $echo if test "$linkmode" = prog; then $echo "*** Warning: Linking the executable $output against the loadable module" else $echo "*** Warning: Linking the shared library $output against the loadable module" fi - $echo "*** $linklib is not portable!" - fi + $echo "*** $linklib is not portable!" + fi if test "$linkmode" = lib && test "$hardcode_into_libs" = yes; then # Hardcode the library path. @@ -2282,9 +2348,10 @@ EOF else $show "extracting exported symbol list from \`$soname'" save_ifs="$IFS"; IFS='~' - eval cmds=\"$extract_expsyms_cmds\" + cmds=$extract_expsyms_cmds for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? done @@ -2295,9 +2362,10 @@ EOF if test -f "$output_objdir/$newlib"; then :; else $show "generating import library for \`$soname'" save_ifs="$IFS"; IFS='~' - eval cmds=\"$old_archive_from_expsyms_cmds\" + cmds=$old_archive_from_expsyms_cmds for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? done @@ -2320,9 +2388,9 @@ EOF case $host in *-*-sco3.2v5* ) add_dir="-L$dir" ;; *-*-darwin* ) - # if the lib is a module then we can not link against it, someone - # is ignoring the new warnings I added - if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then + # if the lib is a module then we can not link against + # it, someone is ignoring the new warnings I added + if /usr/bin/file -L $add 2> /dev/null | $EGREP "bundle" >/dev/null ; then $echo "** Warning, lib $linklib is a module, not a shared library" if test -z "$old_library" ; then $echo @@ -2330,7 +2398,7 @@ EOF $echo "** The link will probably fail, sorry" else add="$dir/$old_library" - fi + fi fi esac elif test "$hardcode_minus_L" = no; then @@ -2372,7 +2440,7 @@ EOF if test "$lib_linked" != yes; then $echo "$modename: configuration error: unsupported hardcode properties" - exit 1 + exit $EXIT_FAILURE fi if test -n "$add_shlibpath"; then @@ -2415,7 +2483,8 @@ EOF esac add="-l$name" elif test "$hardcode_automatic" = yes; then - if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then + if test -n "$inst_prefix_dir" && + test -f "$inst_prefix_dir$libdir/$linklib" ; then add="$inst_prefix_dir$libdir/$linklib" else add="$libdir/$linklib" @@ -2495,7 +2564,8 @@ EOF if test "$linkmode" = lib; then if test -n "$dependency_libs" && - { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes || + { test "$hardcode_into_libs" != yes || + test "$build_old_libs" = yes || test "$link_static" = yes; }; then # Extract -R from dependency_libs temp_deplibs= @@ -2552,7 +2622,7 @@ EOF eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit 1 + exit $EXIT_FAILURE fi if test "$absdir" != "$libdir"; then $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2 @@ -2562,7 +2632,8 @@ EOF depdepl= case $host in *-*-darwin*) - # we do not want to link against static libs, but need to link against shared + # we do not want to link against static libs, + # but need to link against shared eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib` if test -n "$deplibrary_names" ; then for tmp in $deplibrary_names ; do @@ -2570,39 +2641,42 @@ EOF done if test -f "$path/$depdepl" ; then depdepl="$path/$depdepl" - fi - newlib_search_path="$newlib_search_path $path" - path="" + fi + # do not add paths which are already there + case " $newlib_search_path " in + *" $path "*) ;; + *) newlib_search_path="$newlib_search_path $path";; + esac fi + path="" ;; *) - path="-L$path" + path="-L$path" + ;; + esac ;; - esac - - ;; - -l*) + -l*) case $host in *-*-darwin*) - # Again, we only want to link against shared libraries - eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` - for tmp in $newlib_search_path ; do - if test -f "$tmp/lib$tmp_libs.dylib" ; then - eval depdepl="$tmp/lib$tmp_libs.dylib" - break - fi - done - path="" + # Again, we only want to link against shared libraries + eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"` + for tmp in $newlib_search_path ; do + if test -f "$tmp/lib$tmp_libs.dylib" ; then + eval depdepl="$tmp/lib$tmp_libs.dylib" + break + fi + done + path="" ;; *) continue ;; - esac + esac ;; *) continue ;; esac case " $deplibs " in *" $depdepl "*) ;; - *) deplibs="$deplibs $depdepl" ;; - esac + *) deplibs="$depdepl $deplibs" ;; + esac case " $deplibs " in *" $path "*) ;; *) deplibs="$deplibs $path" ;; @@ -2692,7 +2766,8 @@ EOF eval $var=\"$tmp_libs\" done # for var fi - # Last step: remove runtime libs from dependency_libs (they stay in deplibs) + # Last step: remove runtime libs from dependency_libs + # (they stay in deplibs) tmp_libs= for i in $dependency_libs ; do case " $predeps $postdeps $compiler_lib_search_path " in @@ -2752,19 +2827,19 @@ EOF case $outputname in lib*) name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'` - eval shared_ext=\"$shrext\" + eval shared_ext=\"$shrext_cmds\" eval libname=\"$libname_spec\" ;; *) if test "$module" = no; then $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi if test "$need_lib_prefix" != no; then # Add the "lib" prefix for modules if required name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` - eval shared_ext=\"$shrext\" + eval shared_ext=\"$shrext_cmds\" eval libname=\"$libname_spec\" else libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'` @@ -2775,7 +2850,7 @@ EOF if test -n "$objs"; then if test "$deplibs_check_method" != pass_all; then $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1 - exit 1 + exit $EXIT_FAILURE else $echo $echo "*** Warning: Linking the shared library $output against the non-libtool" @@ -2823,13 +2898,13 @@ EOF if test -n "$8"; then $echo "$modename: too many parameters to \`-version-info'" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # convert absolute version numbers to libtool ages # this retains compatibility with .la files and attempts # to make the code below a bit more comprehensible - + case $vinfo_number in yes) number_major="$2" @@ -2873,7 +2948,7 @@ EOF *) $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac @@ -2882,7 +2957,7 @@ EOF *) $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac @@ -2891,14 +2966,14 @@ EOF *) $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac if test "$age" -gt "$current"; then $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2 $echo "$modename: \`$vinfo' is not valid version information" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Calculate the version variables. @@ -2987,7 +3062,7 @@ EOF *) $echo "$modename: unknown library version type \`$version_type'" 1>&2 $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac @@ -3041,6 +3116,12 @@ EOF *.$objext) ;; $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*) + if test "X$precious_files_regex" != "X"; then + if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1 + then + continue + fi + fi removelist="$removelist $p" ;; *) ;; @@ -3074,7 +3155,7 @@ EOF temp_xrpath="$temp_xrpath -R$libdir" case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; + *) finalize_rpath="$libdir $finalize_rpath" ;; esac done if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then @@ -3520,7 +3601,7 @@ EOF fi # Get the real and link names of the library. - eval shared_ext=\"$shrext\" + eval shared_ext=\"$shrext_cmds\" eval library_names=\"$library_names_spec\" set dummy $library_names realname="$2" @@ -3550,10 +3631,11 @@ EOF $show "generating symbol list for \`$libname.la'" export_symbols="$output_objdir/$libname.exp" $run $rm $export_symbols - eval cmds=\"$export_symbols_cmds\" + cmds=$export_symbols_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" if len=`expr "X$cmd" : ".*"` && test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then $show "$cmd" @@ -3583,12 +3665,12 @@ EOF for test_deplib in $deplibs; do case " $convenience " in *" $test_deplib "*) ;; - *) + *) tmp_deplibs="$tmp_deplibs $test_deplib" ;; esac done - deplibs="$tmp_deplibs" + deplibs="$tmp_deplibs" if test -n "$convenience"; then if test -n "$whole_archive_flag_spec"; then @@ -3670,19 +3752,23 @@ EOF # Do each of the archive commands. if test "$module" = yes && test -n "$module_cmds" ; then if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then - eval cmds=\"$module_expsym_cmds\" + eval test_cmds=\"$module_expsym_cmds\" + cmds=$module_expsym_cmds else - eval cmds=\"$module_cmds\" + eval test_cmds=\"$module_cmds\" + cmds=$module_cmds fi else if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval cmds=\"$archive_expsym_cmds\" + eval test_cmds=\"$archive_expsym_cmds\" + cmds=$archive_expsym_cmds else - eval cmds=\"$archive_cmds\" + eval test_cmds=\"$archive_cmds\" + cmds=$archive_cmds fi fi - if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` && + if test "X$skipped_export" != "X:" && len=`expr "X$test_cmds" : ".*"` && test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then : else @@ -3783,19 +3869,28 @@ EOF # value of $libobjs for piecewise linking. # Do each of the archive commands. - if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then - eval cmds=\"$archive_expsym_cmds\" + if test "$module" = yes && test -n "$module_cmds" ; then + if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then + cmds=$module_expsym_cmds + else + cmds=$module_cmds + fi else - eval cmds=\"$archive_cmds\" + if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then + cmds=$archive_expsym_cmds + else + cmds=$archive_cmds + fi fi # Append the command to remove the reloadable object files # to the just-reset $cmds. - eval cmds=\"\$cmds~$rm $delfiles\" + eval cmds=\"\$cmds~\$rm $delfiles\" fi save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? done @@ -3804,7 +3899,7 @@ EOF # Restore the uninstalled library and exit if test "$mode" = relink; then $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $? - exit 0 + exit $EXIT_SUCCESS fi # Create links to the real library. @@ -3852,7 +3947,7 @@ EOF *.lo) if test -n "$objs$old_deplibs"; then $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2 - exit 1 + exit $EXIT_FAILURE fi libobj="$output" obj=`$echo "X$output" | $Xsed -e "$lo2o"` @@ -3946,10 +4041,11 @@ EOF reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test output="$obj" - eval cmds=\"$reload_cmds\" + cmds=$reload_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? done @@ -3962,7 +4058,7 @@ EOF $run ${rm}r $gentop fi - exit 0 + exit $EXIT_SUCCESS fi if test "$build_libtool_libs" != yes; then @@ -3975,17 +4071,18 @@ EOF # accidentally link it into a program. # $show "echo timestamp > $libobj" # $run eval "echo timestamp > $libobj" || exit $? - exit 0 + exit $EXIT_SUCCESS fi if test -n "$pic_flag" || test "$pic_mode" != default; then # Only do commands if we really have different PIC objects. reload_objs="$libobjs $reload_conv_objs" output="$libobj" - eval cmds=\"$reload_cmds\" + cmds=$reload_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? done @@ -3997,7 +4094,7 @@ EOF $run ${rm}r $gentop fi - exit 0 + exit $EXIT_SUCCESS ;; prog) @@ -4046,7 +4143,7 @@ EOF # This is the magic to use -rpath. case "$finalize_rpath " in *" $libdir "*) ;; - *) finalize_rpath="$finalize_rpath $libdir" ;; + *) finalize_rpath="$libdir $finalize_rpath" ;; esac done fi @@ -4054,7 +4151,7 @@ EOF # Now hardcode the library paths rpath= hardcode_libdirs= - for libdir in $compile_rpath $finalize_rpath; do + for libdir in $finalize_rpath $compile_rpath; do if test -n "$hardcode_libdir_flag_spec"; then if test -n "$hardcode_libdir_separator"; then if test -z "$hardcode_libdirs"; then @@ -4315,7 +4412,7 @@ static const void *lt_preloaded_setup() { ;; *) $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac else @@ -4403,7 +4500,7 @@ static const void *lt_preloaded_setup() { # Link the executable and exit $show "$link_command" $run eval "$link_command" || exit $? - exit 0 + exit $EXIT_SUCCESS fi if test "$hardcode_action" = relink; then @@ -4458,10 +4555,10 @@ static const void *lt_preloaded_setup() { fi # Quote $echo for shipping. - if test "X$echo" = "X$SHELL $0 --fallback-echo"; then - case $0 in - [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";; - *) qecho="$SHELL `pwd`/$0 --fallback-echo";; + if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then + case $progpath in + [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";; + *) qecho="$SHELL `pwd`/$progpath --fallback-echo";; esac qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"` else @@ -4487,7 +4584,7 @@ static const void *lt_preloaded_setup() { cwrappersource=`$echo ${objdir}/lt-${output}.c` cwrapper=`$echo ${output}.exe` $rm $cwrappersource $cwrapper - trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15 + trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15 cat > $cwrappersource < $output "\ #! $SHELL @@ -4796,7 +4893,7 @@ else else $echo \"\$relink_command_output\" >&2 $rm \"\$progdir/\$file\" - exit 1 + exit $EXIT_FAILURE fi fi @@ -4858,20 +4955,20 @@ else esac $echo >> $output "\ \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\" - exit 1 + exit $EXIT_FAILURE fi else # The program doesn't exist. \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2 \$echo \"This script is just a wrapper for \$program.\" 1>&2 $echo \"See the $PACKAGE documentation for more information.\" 1>&2 - exit 1 + exit $EXIT_FAILURE fi fi\ " chmod +x $output fi - exit 0 + exit $EXIT_SUCCESS ;; esac @@ -4957,13 +5054,13 @@ fi\ # Do each command in the archive commands. if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then - eval cmds=\"$old_archive_from_new_cmds\" + cmds=$old_archive_from_new_cmds else eval cmds=\"$old_archive_cmds\" if len=`expr "X$cmds" : ".*"` && test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then - : + cmds=$old_archive_cmds else # the command line is too long to link in one step, link in parts $echo "using piecewise archive linking..." @@ -4990,7 +5087,7 @@ fi\ for obj in $save_oldobjs do last_oldobj=$obj - done + done for obj in $save_oldobjs do oldobjs="$objlist $obj" @@ -5004,7 +5101,7 @@ fi\ oldobjs=$objlist if test "$obj" = "$last_oldobj" ; then RANLIB=$save_RANLIB - fi + fi test -z "$concat_cmds" || concat_cmds=$concat_cmds~ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\" objlist= @@ -5015,12 +5112,13 @@ fi\ if test "X$oldobjs" = "X" ; then eval cmds=\"\$concat_cmds\" else - eval cmds=\"\$concat_cmds~$old_archive_cmds\" + eval cmds=\"\$concat_cmds~\$old_archive_cmds\" fi fi fi save_ifs="$IFS"; IFS='~' for cmd in $cmds; do + eval cmd=\"$cmd\" IFS="$save_ifs" $show "$cmd" $run eval "$cmd" || exit $? @@ -5052,8 +5150,12 @@ fi\ fi done # Quote the link command for shipping. - relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)" + relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)" relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"` + if test "$hardcode_automatic" = yes ; then + relink_command= + fi + # Only create the output if not a dry run. if test -z "$run"; then @@ -5072,7 +5174,7 @@ fi\ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib` if test -z "$libdir"; then $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2 - exit 1 + exit $EXIT_FAILURE fi newdependency_libs="$newdependency_libs $libdir/$name" ;; @@ -5086,7 +5188,7 @@ fi\ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit 1 + exit $EXIT_FAILURE fi newdlfiles="$newdlfiles $libdir/$name" done @@ -5097,11 +5199,30 @@ fi\ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib` if test -z "$libdir"; then $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 - exit 1 + exit $EXIT_FAILURE fi newdlprefiles="$newdlprefiles $libdir/$name" done dlprefiles="$newdlprefiles" + else + newdlfiles= + for lib in $dlfiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac + newdlfiles="$newdlfiles $abs" + done + dlfiles="$newdlfiles" + newdlprefiles= + for lib in $dlprefiles; do + case $lib in + [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;; + *) abs=`pwd`"/$lib" ;; + esac + newdlprefiles="$newdlprefiles $abs" + done + dlprefiles="$newdlprefiles" fi $rm $output # place dlname in correct position for cygwin @@ -5158,7 +5279,7 @@ relink_command=\"$relink_command\"" $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $? ;; esac - exit 0 + exit $EXIT_SUCCESS ;; # libtool install mode @@ -5247,13 +5368,13 @@ relink_command=\"$relink_command\"" if test -z "$install_prog"; then $echo "$modename: you must specify an install program" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi if test -n "$prev"; then $echo "$modename: the \`$prev' option requires an argument" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi if test -z "$files"; then @@ -5263,7 +5384,7 @@ relink_command=\"$relink_command\"" $echo "$modename: you must specify a destination" 1>&2 fi $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Strip any trailing slash from the destination. @@ -5284,7 +5405,7 @@ relink_command=\"$relink_command\"" if test "$#" -gt 2; then $echo "$modename: \`$dest' is not a directory" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi fi case $destdir in @@ -5296,7 +5417,7 @@ relink_command=\"$relink_command\"" *) $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac done @@ -5325,7 +5446,7 @@ relink_command=\"$relink_command\"" else $echo "$modename: \`$file' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi library_names= @@ -5367,7 +5488,7 @@ relink_command=\"$relink_command\"" # but it's something to keep an eye on. if test "$inst_prefix_dir" = "$destdir"; then $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2 - exit 1 + exit $EXIT_FAILURE fi if test -n "$inst_prefix_dir"; then @@ -5382,7 +5503,7 @@ relink_command=\"$relink_command\"" if $run eval "$relink_command"; then : else $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2 - exit 1 + exit $EXIT_FAILURE fi fi @@ -5417,10 +5538,11 @@ relink_command=\"$relink_command\"" # Do each command in the postinstall commands. lib="$destdir/$realname" - eval cmds=\"$postinstall_cmds\" + cmds=$postinstall_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? done @@ -5460,7 +5582,7 @@ relink_command=\"$relink_command\"" *) $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac @@ -5478,7 +5600,7 @@ relink_command=\"$relink_command\"" $show "$install_prog $staticobj $staticdest" $run eval "$install_prog \$staticobj \$staticdest" || exit $? fi - exit 0 + exit $EXIT_SUCCESS ;; *) @@ -5532,7 +5654,7 @@ relink_command=\"$relink_command\"" # Check the variables that should have been set. if test -z "$notinst_deplibs"; then $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi finalize=yes @@ -5572,15 +5694,13 @@ relink_command=\"$relink_command\"" if test "$finalize" = yes && test -z "$run"; then tmpdir="/tmp" test -n "$TMPDIR" && tmpdir="$TMPDIR" - tmpdir_mktemp=`mktemp -d $tmpdir/libtool-XXXXXX 2> /dev/null` - if test "$?" = 0 ; then - tmpdir="$tmpdir_mktemp" - unset tmpdir_mktemp - else - tmpdir="$tmpdir/libtool-$$" - fi - if $mkdir -p "$tmpdir" && chmod 700 "$tmpdir"; then : + tmpdir="$tmpdir/libtool-$$" + save_umask=`umask` + umask 0077 + if $mkdir "$tmpdir"; then + umask $save_umask else + umask $save_umask $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2 continue fi @@ -5639,16 +5759,17 @@ relink_command=\"$relink_command\"" $show "$install_prog $file $oldlib" $run eval "$install_prog \$file \$oldlib" || exit $? - if test -n "$stripme" && test -n "$striplib"; then + if test -n "$stripme" && test -n "$old_striplib"; then $show "$old_striplib $oldlib" $run eval "$old_striplib $oldlib" || exit $? fi # Do each command in the postinstall commands. - eval cmds=\"$old_postinstall_cmds\" + cmds=$old_postinstall_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || exit $? done @@ -5662,9 +5783,9 @@ relink_command=\"$relink_command\"" if test -n "$current_libdirs"; then # Maybe just do a dry run. test -n "$run" && current_libdirs=" -n$current_libdirs" - exec_cmd='$SHELL $0 --finish$current_libdirs' + exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs' else - exit 0 + exit $EXIT_SUCCESS fi ;; @@ -5683,10 +5804,11 @@ relink_command=\"$relink_command\"" for libdir in $libdirs; do if test -n "$finish_cmds"; then # Do each command in the finish commands. - eval cmds=\"$finish_cmds\" + cmds=$finish_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" || admincmds="$admincmds $cmd" @@ -5703,7 +5825,7 @@ relink_command=\"$relink_command\"" fi # Exit here if they wanted silent mode. - test "$show" = : && exit 0 + test "$show" = : && exit $EXIT_SUCCESS $echo "----------------------------------------------------------------------" $echo "Libraries have been installed in:" @@ -5739,7 +5861,7 @@ relink_command=\"$relink_command\"" $echo "See any operating system documentation about shared libraries for" $echo "more information, such as the ld(1) and ld.so(8) manual pages." $echo "----------------------------------------------------------------------" - exit 0 + exit $EXIT_SUCCESS ;; # libtool execute mode @@ -5751,7 +5873,7 @@ relink_command=\"$relink_command\"" if test -z "$cmd"; then $echo "$modename: you must specify a COMMAND" 1>&2 $echo "$help" - exit 1 + exit $EXIT_FAILURE fi # Handle -dlopen flags immediately. @@ -5759,7 +5881,7 @@ relink_command=\"$relink_command\"" if test ! -f "$file"; then $echo "$modename: \`$file' is not a file" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi dir= @@ -5770,7 +5892,7 @@ relink_command=\"$relink_command\"" else $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi # Read the libtool library. @@ -5797,7 +5919,7 @@ relink_command=\"$relink_command\"" dir="$dir/$objdir" else $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2 - exit 1 + exit $EXIT_FAILURE fi ;; @@ -5877,7 +5999,7 @@ relink_command=\"$relink_command\"" $echo "export $shlibpath_var" fi $echo "$cmd$args" - exit 0 + exit $EXIT_SUCCESS fi ;; @@ -5905,7 +6027,7 @@ relink_command=\"$relink_command\"" if test -z "$rm"; then $echo "$modename: you must specify an RM program" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi rmdirs= @@ -5960,10 +6082,11 @@ relink_command=\"$relink_command\"" if test "$mode" = uninstall; then if test -n "$library_names"; then # Do each command in the postuninstall commands. - eval cmds=\"$postuninstall_cmds\" + cmds=$postuninstall_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" if test "$?" -ne 0 && test "$rmforce" != yes; then @@ -5975,10 +6098,11 @@ relink_command=\"$relink_command\"" if test -n "$old_library"; then # Do each command in the old_postuninstall commands. - eval cmds=\"$old_postuninstall_cmds\" + cmds=$old_postuninstall_cmds save_ifs="$IFS"; IFS='~' for cmd in $cmds; do IFS="$save_ifs" + eval cmd=\"$cmd\" $show "$cmd" $run eval "$cmd" if test "$?" -ne 0 && test "$rmforce" != yes; then @@ -6017,7 +6141,7 @@ relink_command=\"$relink_command\"" if test "$mode" = clean ; then noexename=$name case $file in - *.exe) + *.exe) file=`$echo $file|${SED} 's,.exe$,,'` noexename=`$echo $name|${SED} 's,.exe$,,'` # $file with .exe has already been added to rmfiles, @@ -6062,20 +6186,20 @@ relink_command=\"$relink_command\"" "") $echo "$modename: you must specify a MODE" 1>&2 $echo "$generic_help" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac if test -z "$exec_cmd"; then $echo "$modename: invalid operation mode \`$mode'" 1>&2 $echo "$generic_help" 1>&2 - exit 1 + exit $EXIT_FAILURE fi fi # test -z "$show_help" if test -n "$exec_cmd"; then eval exec $exec_cmd - exit 1 + exit $EXIT_FAILURE fi # We need to display help for each of the modes. @@ -6111,7 +6235,7 @@ MODE-ARGS vary depending on the MODE. Try \`$modename --help --mode=MODE' for a more detailed description of MODE. Report bugs to ." - exit 0 + exit $EXIT_SUCCESS ;; clean) @@ -6223,6 +6347,8 @@ The following components of LINK-COMMAND are treated specially: -no-undefined declare that a library does not refer to external symbols -o OUTPUT-FILE create OUTPUT-FILE from the specified objects -objectlist FILE Use a list of object files found in FILE to specify objects + -precious-files-regex REGEX + don't remove output files matching REGEX -release RELEASE specify package release information -rpath LIBDIR the created library will eventually be installed in LIBDIR -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries @@ -6264,14 +6390,14 @@ Otherwise, only FILE itself is deleted using RM." *) $echo "$modename: invalid operation mode \`$mode'" 1>&2 $echo "$help" 1>&2 - exit 1 + exit $EXIT_FAILURE ;; esac $echo $echo "Try \`$modename --help' for more information about other modes." -exit 0 +exit $EXIT_SUCCESS # The TAGs below are defined such that we never get into a situation # in which we disable both kinds of libraries. Given conflicting diff --git a/alliance/src/mbkvhdlg/src/Makefile.am b/alliance/src/mbkvhdlg/src/Makefile.am index 80451da8..ce34435d 100644 --- a/alliance/src/mbkvhdlg/src/Makefile.am +++ b/alliance/src/mbkvhdlg/src/Makefile.am @@ -28,7 +28,7 @@ x2vy_LDADD = -lMlu \ -lMal \ -lMsl \ -lMgl \ - -L$(top_builddir)/src -lMvg \ + -L. -lMvg \ -lMlo \ -lMut \ -lRcn diff --git a/alliance/src/mips_asm/src/Makefile.am b/alliance/src/mips_asm/src/Makefile.am index 7f32a518..b1c801b4 100644 --- a/alliance/src/mips_asm/src/Makefile.am +++ b/alliance/src/mips_asm/src/Makefile.am @@ -2,7 +2,7 @@ YACC = @YACC@ -d -INCLUDES = -I$(top_srcdir)/src +#INCLUDES = -I$(srcdir) AM_CXXFLAGS = @ALLIANCE_CFLAGS@ AM_CFLAGS = @ALLIANCE_CFLAGS@ diff --git a/alliance/src/nero/src/Makefile.am b/alliance/src/nero/src/Makefile.am index 1b891591..e486bc31 100644 --- a/alliance/src/nero/src/Makefile.am +++ b/alliance/src/nero/src/Makefile.am @@ -11,7 +11,7 @@ bin_PROGRAMS = nero pdv #noinst_PROGRAMS = debug nero_LDADD = -L$(libdir) @ALLIANCE_LIBS@ \ - $(top_builddir)/src/libU.a \ + ./libU.a \ -lMpu -lMlu \ -lMcl -lMcp \ -lMal -lMap \ diff --git a/alliance/src/ocp/src/common/Makefile.am b/alliance/src/ocp/src/common/Makefile.am index b00e232e..40ec0ddb 100644 --- a/alliance/src/ocp/src/common/Makefile.am +++ b/alliance/src/ocp/src/common/Makefile.am @@ -1,7 +1,5 @@ ## Process this file with automake to produce Makefile.in -INCLUDES = -I$(top_srcdir)/src/common - AM_CXXFLAGS = @ALLIANCE_CFLAGS@ noinst_LIBRARIES = libPCommon.a diff --git a/alliance/src/ocp/src/placer/Makefile.am b/alliance/src/ocp/src/placer/Makefile.am index e3643c47..064783a0 100644 --- a/alliance/src/ocp/src/placer/Makefile.am +++ b/alliance/src/ocp/src/placer/Makefile.am @@ -2,7 +2,7 @@ YACC = @YACC@ -d -INCLUDES = -I$(top_srcdir)/src/common -I$(top_srcdir)/src/placer +INCLUDES = -I$(srcdir)/../common AM_CXXFLAGS = @ALLIANCE_CFLAGS@ AM_CFLAGS = @ALLIANCE_CFLAGS@ @@ -15,7 +15,7 @@ libOcp_a_SOURCES = PElem.cpp PIns.cpp PNet.cpp \ PCon.cpp ocp_LDADD = @ALLIANCE_LIBS@ \ - $(top_builddir)/src/common/libPCommon.a \ + ../common/libPCommon.a \ -lMpu -lMlu \ -lMcl -lMcp \ -lMal -lMap \ diff --git a/alliance/src/sea/src/Makefile.am b/alliance/src/sea/src/Makefile.am index a0f36f7d..b60f7d55 100644 --- a/alliance/src/sea/src/Makefile.am +++ b/alliance/src/sea/src/Makefile.am @@ -9,7 +9,7 @@ bin_PROGRAMS = a2def def2a sxlib2lef bin_SCRIPTS = sea seroute seplace a2lef a2def_LDADD = @ALLIANCE_LIBS@ \ - $(top_builddir)/src/libUtil.a \ + ./libUtil.a \ -lMpu -lMlu \ -lMcl -lMcp \ -lMal -lMap \ @@ -24,7 +24,7 @@ a2def_LDADD = @ALLIANCE_LIBS@ \ -lAut def2a_LDADD = @ALLIANCE_LIBS@ \ - $(top_builddir)/src/libUtil.a \ + ./libUtil.a \ -lMpu -lMlu \ -lMcl -lMcp \ -lMal -lMap \ @@ -39,7 +39,7 @@ def2a_LDADD = @ALLIANCE_LIBS@ \ -lAut sxlib2lef_LDADD = @ALLIANCE_LIBS@ \ - $(top_builddir)/src/libUtil.a \ + ./libUtil.a \ -lMpu -lMlu \ -lMcl -lMcp \ -lMal -lMap \