X-Git-Url: https://www.ginac.de/ginac.git//ginac.git?p=ginac.git;a=blobdiff_plain;f=ginac.m4;h=39ef877205fab7ff1bf8fc8cd9719d703e4fd316;hp=78eb8960cb4c721f46403fa8d6b8faafdce67390;hb=da2ce481c6a4c5f79e3c2d888bbab45b9a476bd4;hpb=46f08989fb0103fe00dd63468dc9dc46dfc9c5f3 diff --git a/ginac.m4 b/ginac.m4 index 78eb8960..39ef8772 100644 --- a/ginac.m4 +++ b/ginac.m4 @@ -54,11 +54,12 @@ dnl Parse required version and the result of ginac-config. sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` GINACLIB_CPPFLAGS=`$GINACLIB_CONFIG $ginac_args --cppflags` GINACLIB_LIBS=`$GINACLIB_CONFIG $ginac_args --libs` - ginac_config_major_version=`$GINACLIB_CONFIG $ginac_args --version | \ + ginac_config_version=`$GINACLIB_CONFIG $ginac_args --version` + ginac_config_major_version=`echo $ginac_config_version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'` - ginac_config_minor_version=`$GINACLIB_CONFIG $ginac_args --version | \ + ginac_config_minor_version=`echo $ginac_config_version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'` - ginac_config_micro_version=`$GINACLIB_CONFIG $ginac_args --version | \ + ginac_config_micro_version=`echo $ginac_config_version | \ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'` dnl Check if the installed GiNaC is sufficiently new according to ginac-config. if test \( $ginac_config_major_version -lt $ginac_min_major_version \) -o \ @@ -122,7 +123,7 @@ int main(void) LIBS="$ac_save_LIBS" fi if test "x$no_ginac" = x ; then - AC_MSG_RESULT([yes, `$GINACLIB_CONFIG $ginac_args --version`]) + AC_MSG_RESULT([yes, $ginac_config_version]) ifelse([$2], , :, [$2]) else AC_MSG_RESULT(no) @@ -138,7 +139,7 @@ int main(void) echo "*** that the run-time linker is not finding GiNaC or finding the wrong" echo "*** version of GiNaC. If it is not finding GiNaC, you'll need to set your" echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point" - echo "*** to the installed location Also, make sure you have run ldconfig if that" + echo "*** to the installed location. Also, make sure you have run ldconfig if that" echo "*** is required on your system."], [ echo "*** The test program failed to compile or link. See the file config.log for the" echo "*** exact error that occured. This usually means GiNaC was incorrectly installed"