Changeset 30


Ignore:
Timestamp:
May 25, 2006 11:10:53 AM (14 years ago)
Author:
andreasw
Message:

corrected Externals to exclude MSDevStudio; made Clp examples to work

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Makemain.inc

    r11 r30  
    2424        cp $< $@
    2525
    26 if MAINTAINER_SMALL
    27 else
    2826$(AUX_DIR)/config.guess: $(BUILDTOOLSDIR)/config.guess
    2927        cp $< $@
     
    3735$(AUX_DIR)/ltmain.sh: $(BUILDTOOLSDIR)/ltmain.sh
    3836        cp $< $@
    39 endif
    4037
    4138# Take care of updating externals (if Externals file exists)
  • trunk/coin.m4

    r18 r30  
    770770
    771771coin_have_externals=no
    772 coin_maintainer_small=no
    773772if test "$enable_maintainer_mode" = yes; then
    774773
     
    862861  fi
    863862
    864   # Check if this is a limited project (without config.guess)
    865   if test -r $srcdir/config.guess; then :; else
    866     coin_maintainer_small=yes
    867   fi
    868 
    869863  # Find the location of the BuildTools directory
    870864  BUILDTOOLSDIR=
     
    890884fi
    891885AM_CONDITIONAL(HAVE_EXTERNALS,test $coin_have_externals = yes)
    892 AM_CONDITIONAL(MAINTAINER_SMALL,test $coin_maintainer_small = yes)
    893886]) # AC_COIN_INIT_AUTOMAKE
    894887
     
    903896#
    904897# This also defines the AC_SUBST variables:
    905 # pkg_source_dir     absolute path to source code for this package
    906 # pkg_bin_dir        absolute path to the directory where binaries are
     898# abs_source_dir     absolute path to source code for this package
     899# abs_bin_dir        absolute path to the directory where binaries are
    907900#                    going to be installed (prefix/bin)
    908 # pkg_lib_dir        absolute path to the directory where libraries are
     901# abs_lib_dir        absolute path to the directory where libraries are
    909902#                    going to be installed (prefix/lib)
    910 # pkg_include_dir    absolute path to the directory where the header files
     903# abs_include_dir    absolute path to the directory where the header files
    911904#                    are installed (prefix/include)
     905# RPATH_FLAGS        link flags for hardcoding path to shared objects
    912906
    913907# This is a trick to have this code before AC_COIN_PROG_LIBTOOL
     
    952946
    953947# helpful variable for the base directory of this package
    954 pkg_source_dir=`cd $srcdir; pwd`
     948abs_source_dir=`cd $srcdir; pwd`
    955949
    956950# Stuff for example Makefiles
    957 full_prefix=`echo $exec_prefix | pwd`
    958 AC_SUBST(pkg_lib_dir)
    959 pkg_lib_dir=$full_prefix/lib
    960 AC_SUBST(pkg_include_dir)
    961 pkg_include_dir=$full_prefix/include
    962 AC_SUBST(pkg_bin_dir)
    963 pkg_bin_dir=$full_prefix/bin
    964 
     951if test x$prefix = xNONE; then
     952  full_prefix=$ac_default_prefix
     953else
     954  full_prefix=$prefix
     955fi
     956full_prefix=`cd $full_prefix ; pwd`
     957AC_SUBST(abs_lib_dir)
     958abs_lib_dir=$full_prefix/lib
     959AC_SUBST(abs_include_dir)
     960abs_include_dir=$full_prefix/include
     961AC_SUBST(abs_bin_dir)
     962abs_bin_dir=$full_prefix/bin
     963
     964# set RPATH_FLAGS to the compiler link flags required to hardcode location
     965# of the shared objects
     966AC_COIN_RPATH_FLAGS($abs_lib_dir)
    965967]) # AC_COIN_INIT_AUTO_TOOLS
    966968
     
    10611063[RPATH_FLAGS=
    10621064
    1063 if test "$GXX" = "yes"; then
    1064   RPATH_FLAGS=
    1065   for dir in $1; do
    1066     RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
    1067   done
    1068 else
    1069   case $build in
    1070     *-linux-*)
    1071       case "$CXX" in
    1072       icpc | */icpc)
    1073         RPATH_FLAGS=
    1074         for dir in $1; do
    1075           RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
    1076         done
    1077       esac ;;
    1078     *-ibm-*)
    1079       case "$CXX" in
    1080       xlC* | */xlC* | mpxlC* | */mpxlC*)
    1081         RPATH_FLAGS=nothing ;;
    1082       esac ;;
    1083     *-hp-*)
    1084         RPATH_FLAGS=nothing ;;
    1085     *-mingw32)
    1086         RPATH_FLAGS=nothing ;;
    1087     *-sun-*)
    1088         RPATH_FLAGS=
    1089         for dir in $1; do
    1090           RPATH_FLAGS="$RPATH_FLAGS -R$dir"
    1091         done
    1092    esac
    1093 fi
    1094 
    1095 if test "$RPATH_FLAGS" = ""; then
    1096   AC_MSG_WARN([Could not automatically determine how to tell the linker about automatic inclusion of the path for shared libraries.  The test examples might not work if you link against shared objects.  You will need to set the LD_LIBRARY_PATH or LIBDIR variable manually.])
    1097 fi
    1098 if test "$RPATH_FLAGS" = "nothing"; then
    1099   RPATH_FLAGS=
     1065if test $enable_shared = yes; then
     1066  if test "$GXX" = "yes"; then
     1067    RPATH_FLAGS=
     1068    for dir in $1; do
     1069      RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
     1070    done
     1071  else
     1072    case $build in
     1073      *-linux-*)
     1074        case "$CXX" in
     1075        icpc | */icpc)
     1076          RPATH_FLAGS=
     1077          for dir in $1; do
     1078            RPATH_FLAGS="$RPATH_FLAGS -Wl,--rpath -Wl,$dir"
     1079          done
     1080        esac ;;
     1081      *-ibm-*)
     1082        case "$CXX" in
     1083        xlC* | */xlC* | mpxlC* | */mpxlC*)
     1084          RPATH_FLAGS=nothing ;;
     1085        esac ;;
     1086      *-hp-*)
     1087          RPATH_FLAGS=nothing ;;
     1088      *-mingw32)
     1089          RPATH_FLAGS=nothing ;;
     1090      *-sun-*)
     1091          RPATH_FLAGS=
     1092          for dir in $1; do
     1093            RPATH_FLAGS="$RPATH_FLAGS -R$dir"
     1094          done
     1095     esac
     1096  fi
     1097
     1098  if test "$RPATH_FLAGS" = ""; then
     1099    AC_MSG_WARN([Could not automatically determine how to tell the linker about automatic inclusion of the path for shared libraries.  The test examples might not work if you link against shared objects.  You will need to set the LD_LIBRARY_PATH or LIBDIR variable manually.])
     1100  fi
     1101  if test "$RPATH_FLAGS" = "nothing"; then
     1102    RPATH_FLAGS=
     1103  fi
    11001104fi
    11011105
     
    11041108
    11051109###########################################################################
    1106 #                        COIN_VPATH_CONFIG_LINK                           #
     1110#                             COIN_VPATH_LINK                             #
    11071111###########################################################################
    11081112
     
    11111115# if this package is the main package to be installed
    11121116
    1113 AC_DEFUN([AC_COIN_VPATH_LINKS],
     1117AC_DEFUN([AC_COIN_VPATH_LINK],
    11141118[AC_REQUIRE([AC_COIN_CHECK_VPATH])
    11151119if test $coin_vpath_config = yes; then
    11161120  AC_CONFIG_LINKS($1:$1)
    11171121fi
    1118 ]) #AC_COIN_VPATH_CONFIG_LINK
     1122]) #AC_COIN_VPATH_LINK
    11191123
    11201124###########################################################################
Note: See TracChangeset for help on using the changeset viewer.