[GRASS5] Fw: [DebianGIS-dev] Bug#336498: grass: broken macro
LOC_CHECK_VERSION (also FTBFS on GNU/FreeBSD)
Petr Salinger
Petr.Salinger at t-systems.cz
Thu Nov 3 15:50:53 UTC 2005
Thanks for your quick reply.
I am sending proposed changes here.
> Does anyone know how to modify 'configure.in' for this problem?
1) Drop from aclocal.m4 definition of function LOC_CHECK_VERSION
and put the two following functions instead.
*******************************
AC_DEFUN(LOC_CHECK_VERSION_STRING,[
AC_MSG_CHECKING($3 version)
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$5 $CPPFLAGS"
AC_TRY_RUN([
#include <stdio.h>
#include <$1>
int main(void) {
FILE *fp = fopen("conftestdata","w");
fputs($2, fp);
return 0;
}
],
[ $4=`cat conftestdata`
AC_MSG_RESULT($$4)],
[ AC_MSG_ERROR([*** Could not determine $3 version.]) ],
[ $4=$6
AC_MSG_RESULT([unknown (cross-compiling)]) ])
CPPFLAGS=$ac_save_cppflags
])
AC_DEFUN(LOC_CHECK_VERSION_NUMBER,[
AC_MSG_CHECKING($3 version)
ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$5 $CPPFLAGS"
AC_TRY_RUN([
#include <stdio.h>
#include <$1>
int main(void) {
FILE *fp = fopen("conftestdata","w");
fprintf(fp, "%d", $2);
return 0;
}
],
[ $4=`cat conftestdata`
AC_MSG_RESULT($$4)],
[ AC_MSG_ERROR([*** Could not determine $3 version.]) ],
[ $4=$6
AC_MSG_RESULT([unknown (cross-compiling)]) ])
CPPFLAGS=$ac_save_cppflags
])
******************************************
2) in configure.in
use LOC_CHECK_VERSION_STRING for checking of TCL_VERSION and TK_VERSION
use LOC_CHECK_VERSION_NUMBER for checking of PJ_VERSION
diff looks like:
--- configure.in~ 2005-11-03 16:14:06.000000000 +0100
+++ configure.in 2005-11-03 16:14:06.000000000 +0100
@@ -506,7 +506,7 @@
# PROJ version check
-LOC_CHECK_VERSION(proj_api.h,PJ_VERSION,External PROJ.4,proj_ver,$PROJINC,UNKNOWN)
+LOC_CHECK_VERSION_NUMBER(proj_api.h,PJ_VERSION,External PROJ.4,proj_ver,$PROJINC,UNKNOWN)
if test `expr "$proj_ver" \< 446` = 1 ; then
AC_MSG_ERROR([*** PROJ.4.4.6 or later is required.])
@@ -717,9 +717,9 @@
# Tcl/Tk version checks
-LOC_CHECK_VERSION(tcl.h,TCL_VERSION,Tcl,tcl_ver,$TCLINCDIR,UNKNOWN)
+LOC_CHECK_VERSION_STRING(tcl.h,TCL_VERSION,Tcl,tcl_ver,$TCLINCDIR,UNKNOWN)
-LOC_CHECK_VERSION(tk.h,TK_VERSION,Tk,tk_ver,$TCLINCDIR $X_CFLAGS,UNKNOWN)
+LOC_CHECK_VERSION_STRING(tk.h,TK_VERSION,Tk,tk_ver,$TCLINCDIR $X_CFLAGS,UNKNOWN)
if test "$tcl_ver" = "$tk_ver" ; then
tcltk_ver=$tcl_ver
Thanks
Petr
More information about the Pkg-grass-devel
mailing list