Changeset 435


Ignore:
Timestamp:
Aug 11, 2005 2:17:31 PM (14 years ago)
Author:
andreasw
Message:
  • added AR_X as variable to be set by configure (for the command for extracting an archice)
  • minor changes
Location:
branches/dev
Files:
22 edited

Legend:

Unmodified
Added
Removed
  • branches/dev/Algorithm/LinearSolvers/Makefile.in

    r430 r435  
    102102AR = @AR@
    103103ARFLAGS = @ARFLAGS@
     104AR_X = @AR_X@
    104105ASLLIB = @ASLLIB@
    105106ASLMAKEFILECMDS = @ASLMAKEFILECMDS@
  • branches/dev/Algorithm/Makefile.in

    r430 r435  
    117117AR = @AR@
    118118ARFLAGS = @ARFLAGS@
     119AR_X = @AR_X@
    119120ASLLIB = @ASLLIB@
    120121ASLMAKEFILECMDS = @ASLMAKEFILECMDS@
  • branches/dev/Apps/AmplSolver/Makefile.in

    r430 r435  
    9797AR = @AR@
    9898ARFLAGS = @ARFLAGS@
     99AR_X = @AR_X@
    99100ASLLIB = @ASLLIB@
    100101ASLMAKEFILECMDS = @ASLMAKEFILECMDS@
  • branches/dev/Apps/CUTErInterface/Makefile.in

    r430 r435  
    7373AR = @AR@
    7474ARFLAGS = @ARFLAGS@
     75AR_X = @AR_X@
    7576ASLLIB = @ASLLIB@
    7677ASLMAKEFILECMDS = @ASLMAKEFILECMDS@
  • branches/dev/Apps/CompositeInterface/Makefile.in

    r430 r435  
    9999AR = @AR@
    100100ARFLAGS = @ARFLAGS@
     101AR_X = @AR_X@
    101102ASLLIB = @ASLLIB@
    102103ASLMAKEFILECMDS = @ASLMAKEFILECMDS@
  • branches/dev/Apps/Makefile.in

    r432 r435  
    7070AR = @AR@
    7171ARFLAGS = @ARFLAGS@
     72AR_X = @AR_X@
    7273ASLLIB = @ASLLIB@
    7374ASLMAKEFILECMDS = @ASLMAKEFILECMDS@
  • branches/dev/Common/Makefile.in

    r431 r435  
    9595AR = @AR@
    9696ARFLAGS = @ARFLAGS@
     97AR_X = @AR_X@
    9798ASLLIB = @ASLLIB@
    9899ASLMAKEFILECMDS = @ASLMAKEFILECMDS@
  • branches/dev/Docs/documentation.tex

    • Property svn:eol-style set to native
    • Property svn:keywords set to Author Date Id Revision
  • branches/dev/Extern/ASL/Makefile.in

    r430 r435  
    5858AR = @AR@
    5959ARFLAGS = @ARFLAGS@
     60AR_X = @AR_X@
    6061ASLLIB = @ASLLIB@
    6162ASLMAKEFILECMDS = @ASLMAKEFILECMDS@
  • branches/dev/Extern/HSL/Makefile.in

    r430 r435  
    7777AR = @AR@
    7878ARFLAGS = @ARFLAGS@
     79AR_X = @AR_X@
    7980ASLLIB = @ASLLIB@
    8081ASLMAKEFILECMDS = @ASLMAKEFILECMDS@
  • branches/dev/Extern/Makefile.in

    r430 r435  
    7070AR = @AR@
    7171ARFLAGS = @ARFLAGS@
     72AR_X = @AR_X@
    7273ASLLIB = @ASLLIB@
    7374ASLMAKEFILECMDS = @ASLMAKEFILECMDS@
  • branches/dev/Extern/blas/Makefile.in

    r430 r435  
    127127AR = @AR@
    128128ARFLAGS = @ARFLAGS@
     129AR_X = @AR_X@
    129130ASLLIB = @ASLLIB@
    130131ASLMAKEFILECMDS = @ASLMAKEFILECMDS@
  • branches/dev/Interfaces/IpStdCInterface.cpp

    r433 r435  
    1111#include "IpOptionsList.hpp"
    1212#include "IpIpoptApplication.hpp"
    13 #include "IpBlas.hpp"
    1413
    1514#ifdef OLD_C_HEADERS
  • branches/dev/Interfaces/Makefile.am

    • Property svn:eol-style set to native
    r433 r435  
    1313        IpAlgTypes.hpp \
    1414        IpIpoptApplication.hpp \
     15        IpNLP.hpp \
    1516        IpReturnCodes.h \
    1617        IpReturnCodes.inc \
  • branches/dev/Interfaces/Makefile.in

    • Property svn:eol-style set to native
    r433 r435  
    9595AR = @AR@
    9696ARFLAGS = @ARFLAGS@
     97AR_X = @AR_X@
    9798ASLLIB = @ASLLIB@
    9899ASLMAKEFILECMDS = @ASLMAKEFILECMDS@
     
    218219        IpAlgTypes.hpp \
    219220        IpIpoptApplication.hpp \
     221        IpNLP.hpp \
    220222        IpReturnCodes.h \
    221223        IpReturnCodes.inc \
  • branches/dev/LinAlg/Makefile.in

    r430 r435  
    107107AR = @AR@
    108108ARFLAGS = @ARFLAGS@
     109AR_X = @AR_X@
    109110ASLLIB = @ASLLIB@
    110111ASLMAKEFILECMDS = @ASLMAKEFILECMDS@
  • branches/dev/LinAlg/TMatrices/Makefile.am

    • Property svn:eol-style set to native
  • branches/dev/LinAlg/TMatrices/Makefile.in

    • Property svn:eol-style set to native
    r430 r435  
    8383AR = @AR@
    8484ARFLAGS = @ARFLAGS@
     85AR_X = @AR_X@
    8586ASLLIB = @ASLLIB@
    8687ASLMAKEFILECMDS = @ASLMAKEFILECMDS@
  • branches/dev/Makefile.am

    r430 r435  
    1 # Copyright (C) 2004, International Business Machines and others.
     1# Copyright (C) 2004, 2005 International Business Machines and others.
    22# All Rights Reserved.
    33# This file is distributed under the Common Public License.
     
    3535        for lib in $(IPALLLIBS); \
    3636        do \
    37           ar x $$basdir/$$lib; \
     37          $(AR_X) $$basdir/$$lib; \
    3838        done; \
    3939        $(AR) $(ARFLAGS) $(libipopt) *.$(OBJEXT)
  • branches/dev/Makefile.in

    r430 r435  
    1515@SET_MAKE@
    1616
    17 # Copyright (C) 2004, International Business Machines and others.
     17# Copyright (C) 2004, 2005 International Business Machines and others.
    1818# All Rights Reserved.
    1919# This file is distributed under the Common Public License.
     
    8787AR = @AR@
    8888ARFLAGS = @ARFLAGS@
     89AR_X = @AR_X@
    8990ASLLIB = @ASLLIB@
    9091ASLMAKEFILECMDS = @ASLMAKEFILECMDS@
     
    655656        for lib in $(IPALLLIBS); \
    656657        do \
    657           ar x $$basdir/$$lib; \
     658          $(AR_X) $$basdir/$$lib; \
    658659        done; \
    659660        $(AR) $(ARFLAGS) $(libipopt) *.$(OBJEXT)
  • branches/dev/configure

    r430 r435  
    1111#
    1212#
    13 # Copyright 2004 International Business Machines and others.
     13# Copyright 2004, 2005 International Business Machines and others.
    1414# All Rights Reserved.
    1515# This file is part of the open source package IPOPT which is distributed
     
    320320#endif"
    321321
    322 ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os AR ARFLAGS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT F77 FFLAGS ac_ct_F77 FLIBS IPADDLIBS TAUCS_INCFLAGS ASLMAKEFLAGS ASLMAKEFILECMDS CPP EGREP CXXLIBS ASTYLE ASTYLEFLAGS ipoptlib AMPL_CPPFLAGS IPALLLIBS BUILDBLAS_TRUE BUILDBLAS_FALSE BUILDHSL_TRUE BUILDHSL_FALSE BUILDMA27_TRUE BUILDMA27_FALSE BUILDMC19_TRUE BUILDMC19_FALSE BUILDBLASDIR_TRUE BUILDBLASDIR_FALSE BUILDHSLDIR_TRUE BUILDHSLDIR_FALSE HAVE_PARDISO_TRUE HAVE_PARDISO_FALSE HAVE_TAUCS_TRUE HAVE_TAUCS_FALSE BUILDASLDIR_TRUE BUILDASLDIR_FALSE BUILDAMPLINTERFACE_TRUE BUILDAMPLINTERFACE_FALSE ASLLIB LIBOBJS LTLIBOBJS'
     322ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os AR ARFLAGS AR_X CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CXX CXXFLAGS ac_ct_CXX RANLIB ac_ct_RANLIB LN_S INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT F77 FFLAGS ac_ct_F77 FLIBS IPADDLIBS TAUCS_INCFLAGS ASLMAKEFLAGS ASLMAKEFILECMDS CPP EGREP CXXLIBS ASTYLE ASTYLEFLAGS ipoptlib AMPL_CPPFLAGS IPALLLIBS BUILDBLAS_TRUE BUILDBLAS_FALSE BUILDHSL_TRUE BUILDHSL_FALSE BUILDMA27_TRUE BUILDMA27_FALSE BUILDMC19_TRUE BUILDMC19_FALSE BUILDBLASDIR_TRUE BUILDBLASDIR_FALSE BUILDHSLDIR_TRUE BUILDHSLDIR_FALSE HAVE_PARDISO_TRUE HAVE_PARDISO_FALSE HAVE_TAUCS_TRUE HAVE_TAUCS_FALSE BUILDASLDIR_TRUE BUILDASLDIR_FALSE BUILDAMPLINTERFACE_TRUE BUILDAMPLINTERFACE_FALSE ASLLIB LIBOBJS LTLIBOBJS'
    323323ac_subst_files=''
    324324
     
    769769ac_cv_env_ARFLAGS_set=${ARFLAGS+set}
    770770ac_cv_env_ARFLAGS_value=$ARFLAGS
     771ac_env_AR_X_set=${AR_X+set}
     772ac_env_AR_X_value=$AR_X
     773ac_cv_env_AR_X_set=${AR_X+set}
     774ac_cv_env_AR_X_value=$AR_X
    771775ac_env_CC_set=${CC+set}
    772776ac_env_CC_value=$CC
     
    915919Some influential environment variables:
    916920  AR          Command for handling archives (default is `ar')
    917   ARFLAGS     Flags for archive command (default is `crv')
     921  ARFLAGS     Flags for adding file for archive command (default is `crv')
     922  AR_X        Command for extracing an archive (default is `ar x')
    918923  CC          C compiler command
    919924  CFLAGS      C compiler flags
     
    10411046
    10421047
    1043 Copyright 2004 International Business Machines and others.
     1048Copyright 2004, 2005 International Business Machines and others.
    10441049All Rights Reserved.
    10451050This file is part of the open source package IPOPT which is distributed
     
    14551460
    14561461
     1462# Set variables for the archiver
    14571463if test -z "$AR"; then
    14581464  AR="ar"
     
    14611467if test -z "$ARFLAGS"; then
    14621468  ARFLAGS="cru"
     1469fi
     1470
     1471if test -z "$AR_X"; then
     1472  AR_X="ar x"
    14631473fi
    14641474
     
    37263736
    37273737# Provide some information about the compiler.
    3728 echo "$as_me:3728:" \
     3738echo "$as_me:3738:" \
    37293739     "checking for Fortran 77 compiler version" >&5
    37303740ac_compiler=`set X $ac_compile; echo $2`
     
    39233933ac_save_FFLAGS=$FFLAGS
    39243934FFLAGS="$FFLAGS $ac_verb"
    3925 (eval echo $as_me:3925: \"$ac_link\") >&5
     3935(eval echo $as_me:3935: \"$ac_link\") >&5
    39263936ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    39273937echo "$ac_f77_v_output" >&5
     
    40014011ac_save_FFLAGS=$FFLAGS
    40024012FFLAGS="$FFLAGS $ac_cv_prog_f77_v"
    4003 (eval echo $as_me:4003: \"$ac_link\") >&5
     4013(eval echo $as_me:4013: \"$ac_link\") >&5
    40044014ac_f77_v_output=`eval $ac_link 5>&1 2>&1 | grep -v 'Driving:'`
    40054015echo "$ac_f77_v_output" >&5
     
    85588568s,@AR@,$AR,;t t
    85598569s,@ARFLAGS@,$ARFLAGS,;t t
     8570s,@AR_X@,$AR_X,;t t
    85608571s,@CC@,$CC,;t t
    85618572s,@CFLAGS@,$CFLAGS,;t t
  • branches/dev/configure.ac

    r430 r435  
    1 # Copyright (C) 2004, International Business Machines and others.
     1# Copyright (C) 2004, 2005, International Business Machines and others.
    22# All Rights Reserved.
    33# This file is distributed under the Common Public License.
     
    77# Authors:  Carl Laird, Andreas Waechter     IBM    2004-08-13
    88
    9 ## SGI: ./configure CC=cc F77=f77 CXX=CC CXXFLAGS="-g -LANG:std -DOLD_C_HEADERS" AR="CC -ar" ARFLAGS="-o " FFLAGS=-g CFLAGS=-g CXXLIBS='-lCsup -lC -lCio'
     9## SGI: ./configure CC=cc F77=f77 CXX=CC CXXFLAGS="-g -LANG:std -DOLD_C_HEADERS" AR="CC -ar" ARFLAGS="-o " AR_X="ar x" FFLAGS=-g CFLAGS=-g CXXLIBS='-lCsup -lC -lCio'
    1010## AIX: ./configure CC=xlc F77=xlf CXX=xlC --with-lapack=$HOME/lib/liblapack.a CFLAGS=-g FFLAGS=-g CXXFLAGS="-g -qrtti=dyna" CXXLIBS="-lC -lc"
    1111## HP1: configure --with-asl=$HOME/COIN/OBJhp1/OTHERS/ASL/amplsolver.a --with-blas=/opt/fortran/lib/libblas.a --with-hsl=$HOME/COIN/OBJhp1/OTHERS/HSL/libiphsl.a --with-lapack=$HOME/COIN/OBJhp1/OTHERS/lapack/libiplapack.a F77=/opt/fortran/bin/fort77 CC=/opt/ansic/bin/cc CXX=/opt/aCC/bin/aCC FFLAGS='-g' CFLAGS='-g' CXXFLAGS='-AA -DMY_C_FINITE=isfinite -g' CXXLIBS='-L/opt/aCC/lib -l++ -lstd_v2 -lCsup_v2 -lm -lcl -lc'
     
    1616
    1717AC_COPYRIGHT([
    18 Copyright 2004 International Business Machines and others.
     18Copyright 2004, 2005 International Business Machines and others.
    1919All Rights Reserved.
    2020This file is part of the open source package IPOPT which is distributed
     
    2828AC_CANONICAL_BUILD
    2929
     30# Set variables for the archiver
    3031if test -z "$AR"; then
    3132  AR="ar"
     
    3536  ARFLAGS="cru"
    3637fi
    37 AC_ARG_VAR(ARFLAGS,[Flags for archive command (default is `crv')])
     38AC_ARG_VAR(ARFLAGS,[Flags for adding file for archive command (default is `crv')])
     39if test -z "$AR_X"; then
     40  AR_X="ar x"
     41fi
     42AC_ARG_VAR(AR_X,[Command for extracing an archive (default is `ar x')])
    3843
    3944# Check if user wants to produce debugging code
Note: See TracChangeset for help on using the changeset viewer.