From: EMC C. s. <cv...@cv...> - 2006-08-29 12:11:11
|
Modified file emc2/src/configure Full file: <http://cvs.linuxcnc.org/cvs/emc2/src/configure?rev=1.73> Difference: <http://cvs.linuxcnc.org/cvs/emc2/src/configure.diff?r1=1.72;r2=1.73> Branch: HEAD Log: revision 1.73 date: 2006/08/29 12:11:02; author: jepler; state: Exp; lines: +63 -1 test for xgettext path and version --- configure 2006/08/29 01:29:58 1.72 +++ configure 2006/08/29 12:11:02 1.73 @@ -312,7 +312,7 @@ # include <unistd.h> #endif" -ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE EMC2VERSION SIMULATOR RTNAME RTAI RTLINUX RTLINUXPRO RTPREFIX KERNELDIR RTFLAGS RTDIR EMC2_HOME AUTODIRS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP WFLAGS DEPSTYLE EGREP KERNEL_VERS MODEXT BUILD_SYS EXT_RTFLAGS MODULE_DIR RIP_MODULE_DIR RUN_IN_PLACE EMC2_BIN_DIR EMC2_TCL_DIR EMC2_HELP_DIR EMC2_RTLIB_DIR EMC2_LANG_DIR EMC2_CONFIG_PATH EMC2_NCFILES_DIR REALTIME EMC2_IMAGE_DIR GTK_VER GTK_LIBS GTK_CFLAGS CXX CXXFLAGS ac_ct_CXX SET_MAKE RANLIB ac_ct_RANLIB AR GREP INSTALL SED PS KILL WHOAMI AWK INSMOD RMMOD LSMOD PIDOF IPCS FUSER PYTHON LYX PDFLATEX LATEX2HTML ESPTOPDF BUILD_DOCS USE_LIBM USE_STUBS USE_RTLIBM MATHINC MATH! LIB RTAI3_MOD RTAI_MOD RTL_MOD MODPATH_adeos MODPATH_rtai_hal MODPATH_rtai_ksched MODPATH_rtai_fifos MODPATH_rtai_shm MODPATH_rtai_sem MODPATH_rtai_math MODPATH_rtai MODPATH_rt_mem_mgr MODPATH_rtai_sched MODPATH_rtai_libm MODPATH_rtl MODPATH_mbuff MODPATH_rtl_time MODPATH_rtl_sched MODPATH_rtl_posixio MODPATH_rtl_fifo TCL_DBGX TK_DBGX TCL_CFLAGS TK_CFLAGS TCL_LIBS TK_LIBS DATE HAVE_XAW XAW_LIBS HAVE_READLINE READLINE_LIBS HAVE_NCURSES NCURSES_LIBS USE_NLS HAVE_LOCALE_H LANGUAGES HAVE_LIBINTL_H HAVE_LIBINTL LOCALEDIR MSGFMT MSGFMT_TCL_WORKS BUILD_AXIS BUILD_PYTHON INCLUDEPY SITEPY LIBOBJS LTLIBOBJS' +ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS PACKAGE EMC2VERSION SIMULATOR RTNAME RTAI RTLINUX RTLINUXPRO RTPREFIX KERNELDIR RTFLAGS RTDIR EMC2_HOME AUTODIRS CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP WFLAGS DEPSTYLE EGREP KERNEL_VERS MODEXT BUILD_SYS EXT_RTFLAGS MODULE_DIR RIP_MODULE_DIR RUN_IN_PLACE EMC2_BIN_DIR EMC2_TCL_DIR EMC2_HELP_DIR EMC2_RTLIB_DIR EMC2_LANG_DIR EMC2_CONFIG_PATH EMC2_NCFILES_DIR REALTIME EMC2_IMAGE_DIR GTK_VER GTK_LIBS GTK_CFLAGS CXX CXXFLAGS ac_ct_CXX SET_MAKE RANLIB ac_ct_RANLIB AR GREP INSTALL SED PS KILL WHOAMI AWK INSMOD RMMOD LSMOD PIDOF IPCS FUSER PYTHON LYX PDFLATEX LATEX2HTML ESPTOPDF BUILD_DOCS USE_LIBM USE_STUBS USE_RTLIBM MATHINC MATH! LIB RTAI3_MOD RTAI_MOD RTL_MOD MODPATH_adeos MODPATH_rtai_hal MODPATH_rtai_ksched MODPATH_rtai_fifos MODPATH_rtai_shm MODPATH_rtai_sem MODPATH_rtai_math MODPATH_rtai MODPATH_rt_mem_mgr MODPATH_rtai_sched MODPATH_rtai_libm MODPATH_rtl MODPATH_mbuff MODPATH_rtl_time MODPATH_rtl_sched MODPATH_rtl_posixio MODPATH_rtl_fifo TCL_DBGX TK_DBGX TCL_CFLAGS TK_CFLAGS TCL_LIBS TK_LIBS DATE HAVE_XAW XAW_LIBS HAVE_READLINE READLINE_LIBS HAVE_NCURSES NCURSES_LIBS USE_NLS HAVE_LOCALE_H LANGUAGES HAVE_LIBINTL_H HAVE_LIBINTL LOCALEDIR XGETTEXT XGETTEXT_TCL_WORKS MSGFMT MSGFMT_TCL_WORKS BUILD_AXIS BUILD_PYTHON INCLUDEPY SITEPY LIBOBJS LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -7462,6 +7462,66 @@ fi +# Extract the first word of "xgettext", so it can be a program name with args. +set dummy xgettext; ac_word=$2 +echo "$as_me:$LINENO: checking for $ac_word" >&5 +echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6 +if test "${ac_cv_path_XGETTEXT+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + case $XGETTEXT in + [\\/]* | ?:[\\/]*) + ac_cv_path_XGETTEXT="$XGETTEXT" # Let the user override the test with a path. + ;; + *) + as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +as_dummy="/bin:/usr/bin:/usr/local/bin" +for as_dir in $as_dummy +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_path_XGETTEXT="$as_dir/$ac_word$ac_exec_ext" + echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done + + test -z "$ac_cv_path_XGETTEXT" && ac_cv_path_XGETTEXT="none" + ;; +esac +fi +XGETTEXT=$ac_cv_path_XGETTEXT + +if test -n "$XGETTEXT"; then + echo "$as_me:$LINENO: result: $XGETTEXT" >&5 +echo "${ECHO_T}$XGETTEXT" >&6 +else + echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6 +fi + +XGETTEXT_TCL_WORKS=no +if test "$XGETTEXT" != "none"; then + echo "$as_me:$LINENO: checking for xgettext tcl bug" >&5 +echo $ECHO_N "checking for xgettext tcl bug... $ECHO_C" >&6 + set -- $(xgettext --version | head -1) + set -- $(echo $4 | tr . " ") + if test $1 -gt 0 -o \( $1 -eq 0 -a \( $2 -gt 14 -o \( $2 -eq 14 -a $3 -ge 5 \) \) \) + then + XGETTEXT_TCL_WORKS=yes + echo "$as_me:$LINENO: result: xgettext version $1.$2.$3 OK" >&5 +echo "${ECHO_T}xgettext version $1.$2.$3 OK" >&6 + else + echo "$as_me:$LINENO: result: xgettext version $1.$2.$3 buggy -- need at least 0.14.5" >&5 +echo "${ECHO_T}xgettext version $1.$2.$3 buggy -- need at least 0.14.5" >&6 + fi +fi + + + # Extract the first word of "msgfmt", so it can be a program name with args. set dummy msgfmt; ac_word=$2 echo "$as_me:$LINENO: checking for $ac_word" >&5 @@ -8631,6 +8691,8 @@ s,@HAVE_LIBINTL_H@,$HAVE_LIBINTL_H,;t t s,@HAVE_LIBINTL@,$HAVE_LIBINTL,;t t s,@LOCALEDIR@,$LOCALEDIR,;t t +s,@XGETTEXT@,$XGETTEXT,;t t +s,@XGETTEXT_TCL_WORKS@,$XGETTEXT_TCL_WORKS,;t t s,@MSGFMT@,$MSGFMT,;t t s,@MSGFMT_TCL_WORKS@,$MSGFMT_TCL_WORKS,;t t s,@BUILD_AXIS@,$BUILD_AXIS,;t t Modified file emc2/src/configure.in Full file: <http://cvs.linuxcnc.org/cvs/emc2/src/configure.in?rev=1.76> Difference: <http://cvs.linuxcnc.org/cvs/emc2/src/configure.in.diff?r1=1.75;r2=1.76> Branch: HEAD Log: revision 1.76 date: 2006/08/29 12:11:03; author: jepler; state: Exp; lines: +21 -4 test for xgettext path and version --- configure.in 2006/08/29 01:29:59 1.75 +++ configure.in 2006/08/29 12:11:03 1.76 @@ -13,9 +13,9 @@ # Copyright (c) 2004 All rights reserved. # # Last change: -# $Revision: 1.75 $ +# $Revision: 1.76 $ # $Author: jepler $ -# $Date: 2006/08/29 01:29:59 $ +# $Date: 2006/08/29 12:11:03 $ # This file is released under GPL, refer to docs/README for details # # This file is adapted to replace the old ./configure script @@ -996,9 +996,9 @@ * Copyright (c) 2004 All rights reserved. * * Last change: -* $Revision: 1.75 $ +* $Revision: 1.76 $ * $Author: jepler $ -* $Date: 2006/08/29 01:29:59 $ +* $Date: 2006/08/29 12:11:03 $ ********************************************************************/ #ifndef EMC2_CONFIG_H #define EMC2_CONFIG_H @@ -1209,6 +1209,23 @@ ]) AC_SUBST(LOCALEDIR) fi + +AC_PATH_PROG(XGETTEXT,xgettext,none,/bin:/usr/bin:/usr/local/bin) +XGETTEXT_TCL_WORKS=no +if test "$XGETTEXT" != "none"; then + AC_MSG_CHECKING(for xgettext tcl bug) + set -- $(xgettext --version | head -1) + set -- $(echo $4 | tr . " ") + if test $1 -gt 0 -o \( $1 -eq 0 -a \( $2 -gt 14 -o \( $2 -eq 14 -a $3 -ge 5 \) \) \) + then + XGETTEXT_TCL_WORKS=yes + AC_MSG_RESULT(xgettext version $1.$2.$3 OK) + else + AC_MSG_RESULT(xgettext version $1.$2.$3 buggy -- need at least 0.14.5) + fi +fi +AC_SUBST(XGETTEXT_TCL_WORKS) +AC_SUBST(XGETTEXT) AC_PATH_PROG(MSGFMT,msgfmt,none,/bin:/usr/bin:/usr/local/bin) MSGFMT_TCL_WORKS=no |