Changeset 2107
- Timestamp:
- Feb 20, 2011 3:07:36 PM (10 years ago)
- Location:
- stable/0.7
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
stable/0.7
-
stable/0.7/Makemain.inc
r1950 r2107 55 55 cp $< $@ 56 56 57 # Take care of updating externals (if Externals file exists)57 # Take care of updating externals (if Dependencies file exists) 58 58 if HAVE_EXTERNALS 59 $(top_builddir)/Makefile: . Externals-stamp59 $(top_builddir)/Makefile: .Dependencies-stamp 60 60 61 . Externals-stamp: $(srcdir)/Externals62 cd $(srcdir); svn propset svn:externals -F Externals .63 touch . Externals-stamp61 .Dependencies-stamp: $(srcdir)/Dependencies 62 cd $(srcdir); BuildTools/set_externals Dependencies 63 touch .Dependencies-stamp 64 64 65 update-externals: . Externals-stamp65 update-externals: .Dependencies-stamp 66 66 cd $(srcdir); svn update 67 67 … … 71 71 72 72 if HAVE_EXTERNALS 73 EXTRA_DIST += Externals74 DISTCLEANFILES += . Externals-stamp73 EXTRA_DIST += Dependencies 74 DISTCLEANFILES += .Dependencies-stamp 75 75 endif 76 76 -
stable/0.7/coin.m4
r2104 r2107 82 82 83 83 # Set the project's version number 84 if test "x$1" != x; then 85 AC_DEFINE_UNQUOTED(m4_toupper($1_VERSION), ["$PACKAGE_VERSION"], 86 [Version number of project]) 87 fi 88 89 # Set the project's SVN revision number. The complicated sed expression 90 # (made worse by quadrigraphs) ensures that things like 4123:4168MS end up 91 # as a single number. 92 AC_CHECK_PROG([have_svnversion],[svnversion],[yes],[no]) 93 if test "x$have_svnversion" = xyes && test "x$1" != x; then 94 AC_SUBST(m4_toupper($1_SVN_REV)) 95 svn_rev_tmp=`cd $srcdir/$m4_tolower(coin_has_$1) ; svnversion` 96 m4_toupper($1_SVN_REV)=`echo $svn_rev_tmp | sed -n -e 's/^@<:@0-9@:>@*://' -e 's/\(@<:@0-9@:>@\)@<:@^0-9@:>@*$/\1/p'` 97 if test $m4_toupper($1_SVN_REV) != exported; then 98 AC_DEFINE_UNQUOTED(m4_toupper($1_SVN_REV), $m4_toupper($1_SVN_REV), 99 [SVN revision number of project]) 100 fi 101 fi 84 m4_ifvaln([$1],[ 85 AC_DEFINE_UNQUOTED(m4_toupper($1_VERSION), ["$PACKAGE_VERSION"],[Version number of project]) 86 87 # We use the following variable to have a string with the upper case 88 # version of the project name 89 COIN_PRJCT=m4_toupper($1) 90 91 # Set the project's SVN revision number. The complicated sed expression 92 # (made worse by quadrigraphs) ensures that things like 4123:4168MS end up 93 # as a single number. 94 AC_CHECK_PROG([have_svnversion],[svnversion],[yes],[no]) 95 if test "x$have_svnversion" = xyes; then 96 AC_SUBST(m4_toupper($1_SVN_REV)) 97 svn_rev_tmp=`cd $srcdir/$m4_tolower(coin_has_$1) ; svnversion` 98 m4_toupper($1_SVN_REV)=`echo $svn_rev_tmp | sed -n -e 's/^@<:@0-9@:>@*://' -e 's/\(@<:@0-9@:>@\)@<:@^0-9@:>@*$/\1/p'` 99 if test $m4_toupper($1_SVN_REV) != exported; then 100 AC_DEFINE_UNQUOTED(m4_toupper($1_SVN_REV), $m4_toupper($1_SVN_REV), [SVN revision number of project]) 101 fi 102 fi 103 ]) 102 104 103 105 # Capture libtool library version, if given. 104 106 m4_ifvaln([$2],[coin_libversion=$2],[]) 107 105 108 ]) # AC_COIN_PROJECTDIR_INIT 106 109 … … 189 192 m4_tolower($coin_$1_checklevel), 190 193 [Define to the debug sanity check level (0 is no test)]) 191 192 # We use the following variable to have a string with the upper case193 # version of the project name194 COIN_PRJCT=m4_toupper($1)195 196 194 ]) # m4_ifvaln([$1], 197 195 … … 1422 1420 [AC_MSG_ERROR([I cannot find the libtool.m4 file.])]) 1423 1421 1424 # Check if we have an Externals file1425 if test -r $srcdir/ Externals; then1422 # Check if we have an Dependencies file 1423 if test -r $srcdir/Dependencies; then 1426 1424 coin_have_externals=yes 1427 1425 fi … … 2078 2076 # conditional COIN_HAS_ZLIB and defines the C preprocessor variable 2079 2077 # COIN_HAS_ZLIB. Further, for a (space separated) list of arguments X, 2080 # it adds the linker flag to the variables X_LIBS and X_PCLIBS.2078 # it adds the linker flag to the variables X_LIBS, X_PCLIBS, and X_LIBS_INSTALLED. 2081 2079 2082 2080 AC_DEFUN([AC_COIN_CHECK_GNU_ZLIB], … … 2117 2115 # This macro checks for the libbz2 library. If found, it defines the C 2118 2116 # preprocessor variable COIN_HAS_BZLIB. Further, for a (space separated) list 2119 # of arguments X, it adds the linker flag to the variables X_LIBS and X_PCLIBS.2117 # of arguments X, it adds the linker flag to the variables X_LIBS, X_PCLIBS, and X_LIBS_INSTALLED. 2120 2118 2121 2119 AC_DEFUN([AC_COIN_CHECK_GNU_BZLIB], … … 2157 2155 # in the source file before the #include<readline/readline.h> 2158 2156 # If found, it defines the C preprocessor variable COIN_HAS_READLINE. 2159 # Further, for a (space separated) list of arguments X, it adds the linker flag to the variable X_LIBS and X_PCLIBS. 2157 # Further, for a (space separated) list of arguments X, it adds the 2158 # linker flag to the variable X_LIBS, X_PCLIBS, and X_LIBS_INSTALLED. 2160 2159 2161 2160 AC_DEFUN([AC_COIN_CHECK_GNU_READLINE], … … 2882 2881 # If $2/$1 or $1 is in COIN_SKIP_PROJECTS, do nothing. 2883 2882 # If --with-$1-lib, --with-$1-incdir, or --with-$1-datadir is given, then assume that the package is installed. 2884 # Otherwise, if pkg-config is available, use it to check whether the package is available.2885 # If $4 is given, then pkg-config is asked for the existance of $4, otherwise tolower($1) is used.2886 2883 # Otherwise, if the directory $2/$1 and the file $2/$1/$3 exist, check whether $2/$1/configure exists. 2887 2884 # If so, include this directory into the list of directories where configure and make recourse into. 2888 # tolower(coin_has_$1) is set to notGiven, skipping, installed, the version of an installed project, or the projects main directory (if uninstalled).2889 2890 AC_DEFUN([AC_COIN_MAIN_PACKAGEDIR], 2891 [AC_REQUIRE([AC_COIN_HAS_PKGCONFIG]) 2892 AC_MSG_CHECKING([whether project $1 is available])2893 2894 m4_tolower(coin_has_$1)=no tGiven2885 # tolower(coin_has_$1) is set to a string starting with "no" if the project source is not available or 2886 # will not be compiled. Otherwise, it will be set to a string starting with "yes". 2887 2888 AC_DEFUN([AC_COIN_MAIN_PACKAGEDIR],[ 2889 AC_MSG_CHECKING([whether source of project $1 is available and should be compiled]) 2890 2891 m4_tolower(coin_has_$1)=no 2895 2892 coin_have_project_dir=no 2896 2893 … … 2900 2897 for dir in $COIN_SKIP_PROJECTS; do 2901 2898 if test $dir = "$1"; then 2902 m4_tolower(coin_has_$1)= skipping2899 m4_tolower(coin_has_$1)="no, $1 has been specified in COIN_SKIP_PROJECTS" 2903 2900 fi 2901 m4_ifval($2,[ 2904 2902 if test $dir = "$2/$1"; then 2905 m4_tolower(coin_has_$1)= skipping2906 fi 2903 m4_tolower(coin_has_$1)="no, $2/$1 has been specified in COIN_SKIP_PROJECTS" 2904 fi]) 2907 2905 done 2908 2906 fi … … 2918 2916 [linker flags for using project $1]), 2919 2917 [if test "$withval" = no ; then 2920 m4_tolower(coin_has_$1)= skipping2918 m4_tolower(coin_has_$1)="no, --without-m4_tolower($1)-lib has been specified" 2921 2919 else 2922 m4_tolower(coin_has_$1)=" yes, via --with-m4_tolower($1)-lib"2920 m4_tolower(coin_has_$1)="no, --with-m4_tolower($1)-lib has been specified" 2923 2921 fi], 2924 2922 []) … … 2930 2928 [directory with header files for using project $1]), 2931 2929 [if test "$withval" = no ; then 2932 m4_tolower(coin_has_$1)= skipping2930 m4_tolower(coin_has_$1)="no, --without-m4_tolower($1)-incdir has been specified" 2933 2931 else 2934 m4_tolower(coin_has_$1)=" yes, via --with-m4_tolower($1)-incdir"2932 m4_tolower(coin_has_$1)="no, --with-m4_tolower($1)-incdir has been specified" 2935 2933 fi], 2936 2934 []) … … 2942 2940 [directory with data files for using project $1]), 2943 2941 [if test "$withval" = no ; then 2944 m4_tolower(coin_has_$1)= skipping2942 m4_tolower(coin_has_$1)="no, --without-m4_tolower($1)-datadir has been specified" 2945 2943 else 2946 m4_tolower(coin_has_$1)=" yes, via --with-m4_tolower($1)-datadir"2944 m4_tolower(coin_has_$1)="no, --with-m4_tolower($1)-datadir has been specified" 2947 2945 fi], 2948 2946 []) … … 2957 2955 coin_has_blas=notGiven 2958 2956 elif test x"$withval" = "xno" ; then 2959 coin_has_blas= skipping2957 coin_has_blas="no, --without-blas has been specified" 2960 2958 else 2961 coin_has_blas=" yes, via --with-blas"2959 coin_has_blas="no, --with-blas has been specified" 2962 2960 fi], 2963 2961 []) … … 2973 2971 coin_has_lapack=notGiven 2974 2972 elif test x"$withval" = "xno" ; then 2975 coin_has_lapack= skipping2973 coin_has_lapack="no, --without-lapack has been specified" 2976 2974 else 2977 coin_has_lapack=" yes, via --with-lapack"2975 coin_has_lapack="no, --with-lapack has been specified" 2978 2976 fi], 2979 2977 []) … … 2983 2981 # check if project is available in present directory 2984 2982 if test "$m4_tolower(coin_has_$1)" = notGiven; then 2983 $m4_tolower(coin_has_$1)=no 2985 2984 if test -d $srcdir/$2/$1; then 2986 2985 # If a third argument is given, then we have to check if one one the files given in that third argument is present. … … 3000 2999 fi 3001 3000 3002 # check for project by using pkg-config, if pkg-config is available 3003 if test "$m4_tolower(coin_has_$1)" = notGiven; then 3004 #we are only interested in installed packages here, so we do not search in $COIN_PKG_CONFIG_PATH_UNINSTALLED 3005 if test -n "$PKG_CONFIG" ; then 3006 coin_save_PKG_CONFIG_PATH="$PKG_CONFIG_PATH" 3007 PKG_CONFIG_PATH="$COIN_PKG_CONFIG_PATH" ; export PKG_CONFIG_PATH 3008 m4_ifval([$4], 3009 [AC_COIN_PKG_CHECK_PROJECT_EXISTS([$4], 3010 [m4_tolower(coin_has_$1)="yes, found installed version $m4_toupper([$4])_VERSION"])], 3011 [AC_COIN_PKG_CHECK_PROJECT_EXISTS([$1], 3012 [m4_tolower(coin_has_$1)="yes, found installed version $m4_toupper([$1])_VERSION"])]) 3013 PKG_CONFIG_PATH="$coin_save_PKG_CONFIG_PATH" 3014 export PKG_CONFIG_PATH 3015 fi 3016 fi 3017 3018 if test "$m4_tolower(coin_has_$1)" = notGiven; then 3019 m4_case(m4_tolower($1), 3020 [blas], 3021 [AC_MSG_RESULT([no (but will check for system blas later)])], 3022 [lapack], 3023 [AC_MSG_RESULT([no (but will check for system lapack later)])], 3024 [AC_MSG_RESULT([not given])] 3025 ) 3026 else 3027 AC_MSG_RESULT([$m4_tolower(coin_has_$1)]) 3028 fi 3001 AC_MSG_RESULT([$m4_tolower(coin_has_$1)]) 3029 3002 3030 3003 if test "$coin_have_project_dir" = yes ; then -
stable/0.7/compile_f2c
- Property svn:mergeinfo changed (with no actual effect on merging)
Note: See TracChangeset
for help on using the changeset viewer.