Changeset 44


Ignore:
Timestamp:
Jun 13, 2006 2:13:42 PM (14 years ago)
Author:
andreasw
Message:

moved assignment of asb_... variables from INIT_AUTOTOOLS to INIT_AUTOMAKE macro

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/coin.m4

    r43 r44  
    825825# that are used in the maintainer parts of the makfile.  It also
    826826# checks if the correct versions of the autotools are used.
     827#
     828# This also defines the AC_SUBST variables:
     829# abs_source_dir     absolute path to source code for this package
     830# abs_bin_dir        absolute path to the directory where binaries are
     831#                    going to be installed (prefix/bin)
     832# abs_lib_dir        absolute path to the directory where libraries are
     833#                    going to be installed (prefix/lib)
     834# abs_include_dir    absolute path to the directory where the header files
     835#                    are installed (prefix/include)
    827836
    828837AC_DEFUN([AC_COIN_INIT_AUTOMAKE],
     
    985994fi
    986995
    987 
     996# helpful variable for the base directory of this package
     997abs_source_dir=`cd $srcdir; pwd`
     998AC_SUBST(abs_source_dir)
     999
     1000# Stuff for example Makefiles
     1001if test x$prefix = xNONE; then
     1002  full_prefix=$ac_default_prefix
     1003else
     1004  full_prefix=$prefix
     1005fi
     1006full_prefix=`cd $full_prefix ; pwd`
     1007AC_SUBST(abs_lib_dir)
     1008abs_lib_dir=$full_prefix/lib
     1009AC_SUBST(abs_include_dir)
     1010abs_include_dir=$full_prefix/include
     1011AC_SUBST(abs_bin_dir)
     1012abs_bin_dir=$full_prefix/bin
    9881013
    9891014AM_CONDITIONAL(HAVE_EXTERNALS,
     
    9981023# modifications we want for COIN packages.
    9991024#
    1000 # This also defines the AC_SUBST variables:
    1001 # abs_source_dir     absolute path to source code for this package
    1002 # abs_bin_dir        absolute path to the directory where binaries are
    1003 #                    going to be installed (prefix/bin)
    1004 # abs_lib_dir        absolute path to the directory where libraries are
    1005 #                    going to be installed (prefix/lib)
    1006 # abs_include_dir    absolute path to the directory where the header files
    1007 #                    are installed (prefix/include)
    10081025# RPATH_FLAGS        link flags for hardcoding path to shared objects
    10091026
     
    10471064# Stuff for libtool
    10481065AC_COIN_PROG_LIBTOOL
    1049 
    1050 # helpful variable for the base directory of this package
    1051 abs_source_dir=`cd $srcdir; pwd`
    1052 AC_SUBST(abs_source_dir)
    1053 
    1054 # Stuff for example Makefiles
    1055 if test x$prefix = xNONE; then
    1056   full_prefix=$ac_default_prefix
    1057 else
    1058   full_prefix=$prefix
    1059 fi
    1060 full_prefix=`cd $full_prefix ; pwd`
    1061 AC_SUBST(abs_lib_dir)
    1062 abs_lib_dir=$full_prefix/lib
    1063 AC_SUBST(abs_include_dir)
    1064 abs_include_dir=$full_prefix/include
    1065 AC_SUBST(abs_bin_dir)
    1066 abs_bin_dir=$full_prefix/bin
    10671066
    10681067# set RPATH_FLAGS to the compiler link flags required to hardcode location
Note: See TracChangeset for help on using the changeset viewer.