diff options
| -rw-r--r-- | AUTHORS | 4 | ||||
| -rw-r--r-- | BLURB | 4 | ||||
| -rw-r--r-- | ChangeLog | 35 | ||||
| -rw-r--r-- | Makefile.in | 2 | ||||
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | README-alpha | 4 | ||||
| -rwxr-xr-x | config.rpath | 124 | ||||
| -rwxr-xr-x | configure | 217 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | distribute-alpha.sh | 18 | ||||
| -rwxr-xr-x | distribute.sh | 4 | ||||
| -rw-r--r-- | doc/Makefile.am | 4 | ||||
| -rw-r--r-- | doc/Makefile.in | 41 | ||||
| -rw-r--r-- | doc/idutils.texi (renamed from doc/id-utils.texi) | 31 | ||||
| -rw-r--r-- | doc/version.texi | 4 | ||||
| -rw-r--r-- | lib/Makefile.am | 6 | ||||
| -rw-r--r-- | lib/Makefile.in | 4 | ||||
| -rw-r--r-- | lib/exclude.c | 13 | ||||
| -rw-r--r-- | lib/getcwd.c | 81 | ||||
| -rw-r--r-- | lib/obstack.c | 13 | ||||
| -rw-r--r-- | lib/obstack.h | 12 | ||||
| -rw-r--r-- | lib/regex_internal.h | 5 | ||||
| -rw-r--r-- | lib/strcasecmp.c | 9 | ||||
| -rw-r--r-- | lib/strncasecmp.c | 11 | ||||
| -rw-r--r-- | libidu/Makefile.am | 2 | ||||
| -rw-r--r-- | libidu/Makefile.in | 4 | ||||
| -rw-r--r-- | lisp/Makefile.am | 2 | ||||
| -rw-r--r-- | lisp/Makefile.in | 6 | ||||
| -rw-r--r-- | lisp/idutils.el (renamed from lisp/id-utils.el) | 16 | ||||
| -rw-r--r-- | m4/Makefile.in | 2 | ||||
| -rw-r--r-- | m4/fpending.m4 | 4 | ||||
| -rw-r--r-- | m4/gettext.m4 | 6 | ||||
| -rw-r--r-- | m4/gnulib-comp.m4 | 2 | ||||
| -rw-r--r-- | m4/regex.m4 | 27 | ||||
| -rw-r--r-- | m4/stdbool.m4 | 11 | ||||
| -rw-r--r-- | po/de.po | 2 | ||||
| -rw-r--r-- | po/fr.po | 2 | ||||
| -rw-r--r-- | po/nl.po | 2 | ||||
| -rw-r--r-- | po/pl.po | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/Makefile.in | 3 | ||||
| -rw-r--r-- | testsuite/Makefile.in | 2 |
42 files changed, 496 insertions, 256 deletions
@@ -1,6 +1,6 @@ -The id-utils were written by Greg McGary, who assigned his copyright +The idutils were written by Greg McGary, who assigned his copyright to the FSF on March 1, 1996. -id-utils.texi was written by Tom Horsley, and explicitly not +idutils.texi was written by Tom Horsley, and explicitly not copyrighted, but contributed to the public domain. An FSF copyright has since been affixed. @@ -1,7 +1,7 @@ very fast, very high capacity indexer for C/C++ source code -`mkid' creates an index covering a virtually unlimited number of files. (The number is only limited by available virtual address space. I have built ID files covering 500,000+ source files) Huge capacity makes id-utils ideal for indexing an entire Linux source distribution--kernel, libraries, utilities, applications. With a global distribution source index, it is possible globally audit or change system interfaces. `mkid' is very fast--on modern systems, its speed is limited by I/O bandwidth. +`mkid' creates an index covering a virtually unlimited number of files. (The number is only limited by available virtual address space. I have built ID files covering 500,000+ source files) Huge capacity makes idutils ideal for indexing an entire Linux source distribution--kernel, libraries, utilities, applications. With a global distribution source index, it is possible globally audit or change system interfaces. `mkid' is very fast--on modern systems, its speed is limited by I/O bandwidth. `lid' queries the index, allowing you to find in an instant what files contain a particular identifier or numeric literal. Queries can be for literal or regexp, word or substring, case sensitive or insensitive. -`gid' (really an alias for `lid --grep') will show you all lines where an identifier occurs. It's an optimized grep that works instantly because the index guides it to search only those files where there will be a hit. Files that don't contain the identifier are ignored. Hits are printed in the same format as `grep -n', so they are digestible by compile mode in emacs. The package includes id-utils.el which contains a small amount of elisp to allow convenient use of `gid' in conjunction with compile mode. I bind this function to M-* (Meta Splat), and think of it as an expanded M-. (Meta Dot), which shows all occurrences of an identifier rather than just the definition. +`gid' (really an alias for `lid --grep') will show you all lines where an identifier occurs. It's an optimized grep that works instantly because the index guides it to search only those files where there will be a hit. Files that don't contain the identifier are ignored. Hits are printed in the same format as `grep -n', so they are digestible by compile mode in emacs. The package includes idutils.el which contains a small amount of elisp to allow convenient use of `gid' in conjunction with compile mode. I bind this function to M-* (Meta Splat), and think of it as an expanded M-. (Meta Dot), which shows all occurrences of an identifier rather than just the definition. @@ -1,8 +1,40 @@ -2005-12-27 Claudio Fontana <claudio@gnu.org> +2006-01-06 Claudio Fontana <claudio@gnu.org> + + * configure.ac: reverted change to "conditionally add -I ../intl to the + CFLAGS to let all subdirs find the included libintl.h" + * m4/gettext.m4: offer a more general solution to the above problem, + by automatically adding the internal intl directory to the CPPFLAGS + when used. + * lib/regex_internal.h: apply workaround for buggy pgcc preprocessor + handling large unsigned 64 bit values as signed, and thus breaking + compilation. + + * distribute.sh: changed id-utils to idutils + * distribute-alpha.sh: likewise + * BLURB: likewise + * README-alpha: likewise + + * configure.ac: changed bug report address to bug-idutils@gnu.org + + * doc/id-utils.texi: renamed to doc/idutils.texi, and fixed content + accordingly + * doc/Makefile.am: reflect filename change + + * lisp/id-utils.el: renamed to lisp/idutils.el, and fixed content + accordingly + * lisp/Makefile.am: reflect filename change + + * po/*.po: replaced bug-id-utils@gnu.org with bug-idutils@gnu.org + +2005-12-27 Claudio Fontana <claudio@gnu.org> + * README-alpha: added information about successful builds * configure.ac: fixed unwanted change in bugs mailing list address * configure.ac: moved development to version 4.1 + * configure.ac: conditionally add -I ../intl to the CFLAGS, + to let all subdirs find the included libintl.h + * m4/extra_dist.sh: added script to autogenerate extra dist Makefile.am * src/Makefile.am: pass libgnu to the linker before and after libintl to solve mutual dependencies problems caused by gnulib modules @@ -27,6 +59,7 @@ * src/*.c, libidu/*.c: enforce <> for system includes or their gnulib replacements, and "" for program specific headers + 2005-12-15 Claudio Fontana <claudio@gnu.org> * src/mkid.c: tweak alloc-ed size of token signature to a minimum of 1 byte. Fixes assertion failure filed as savannah support request diff --git a/Makefile.in b/Makefile.in index 74073d4..84d8ab1 100644 --- a/Makefile.in +++ b/Makefile.in @@ -142,6 +142,8 @@ GENCAT = @GENCAT@ GETOPT_H = @GETOPT_H@ GLIBC2 = @GLIBC2@ GLIBC21 = @GLIBC21@ +GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@ +GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@ GMSGFMT = @GMSGFMT@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ @@ -1,4 +1,9 @@ -id-utils NEWS - User visible changes. +idutils NEWS - User visible changes. + +Version 4.1 - ???, by Claudio Fontana + +* fixed many portability issues +* renamed all istances of id-utils with idutils Version 4.0 - Nov 1, 2005, by Claudio Fontana diff --git a/README-alpha b/README-alpha index 9ad9f4a..71cca43 100644 --- a/README-alpha +++ b/README-alpha @@ -1,6 +1,6 @@ -id-utils README-alpha +idutils README-alpha -id-utils-4.1 Special instructions for pre-release testers +idutils-4.1 Special instructions for pre-release testers --------------------------------------------------------- * The code has been substantially changed. diff --git a/config.rpath b/config.rpath index 3f1bef3..7562cee 100755 --- a/config.rpath +++ b/config.rpath @@ -25,7 +25,7 @@ # known workaround is to choose shorter directory names for the build # directory and/or the installation directory. -# All known linkers require a `.a' archive for static linking (except M$VC, +# All known linkers require a `.a' archive for static linking (except MSVC, # which needs '.lib'). libext=a shrext=.so @@ -35,7 +35,17 @@ host_cpu=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` host_vendor=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` host_os=`echo "$host" | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` -cc_basename=`echo "$CC" | sed -e 's%^.*/%%'` +# Code taken from libtool.m4's _LT_CC_BASENAME. + +for cc_temp in $CC""; do + case $cc_temp in + compile | *[\\/]compile | ccache | *[\\/]ccache ) ;; + distcc | *[\\/]distcc | purify | *[\\/]purify ) ;; + \-*) ;; + *) break;; + esac +done +cc_basename=`echo "$cc_temp" | sed -e 's%^.*/%%'` # Code taken from libtool.m4's AC_LIBTOOL_PROG_COMPILER_PIC. @@ -48,7 +58,7 @@ else wl='-Wl,' ;; darwin*) - case "$cc_basename" in + case $cc_basename in xlc*) wl='-Wl,' ;; @@ -120,6 +130,10 @@ case "$host_os" in with_gnu_ld=no fi ;; + interix*) + # we just hope/assume this is gcc and not c89 (= MSVC++) + with_gnu_ld=yes + ;; openbsd*) with_gnu_ld=no ;; @@ -127,6 +141,12 @@ esac ld_shlibs=yes if test "$with_gnu_ld" = yes; then + # Set some defaults for GNU ld with shared library support. These + # are reset later if shared libraries are not supported. Putting them + # here allows them to be overridden if necessary. + # Unlike libtool, we use -rpath here, not --rpath, since the documented + # option of GNU ld is called -rpath, not --rpath. + hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' case "$host_os" in aix3* | aix4* | aix5*) # On AIX/PPC, the GNU linker is very broken @@ -162,9 +182,20 @@ if test "$with_gnu_ld" = yes; then ld_shlibs=no fi ;; + interix3*) + hardcode_direct=no + hardcode_libdir_flag_spec='${wl}-rpath,$libdir' + ;; + linux*) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + : + else + ld_shlibs=no + fi + ;; netbsd*) ;; - solaris* | sysv5*) + solaris*) if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then ld_shlibs=no elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then @@ -173,16 +204,23 @@ if test "$with_gnu_ld" = yes; then ld_shlibs=no fi ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*) + case `$LD -v 2>&1` in + *\ [01].* | *\ 2.[0-9].* | *\ 2.1[0-5].*) + ld_shlibs=no + ;; + *) + if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`' + else + ld_shlibs=no + fi + ;; + esac + ;; sunos4*) hardcode_direct=yes ;; - linux*) - if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then - : - else - ld_shlibs=no - fi - ;; *) if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then : @@ -191,10 +229,8 @@ if test "$with_gnu_ld" = yes; then fi ;; esac - if test "$ld_shlibs" = yes; then - # Unlike libtool, we use -rpath here, not --rpath, since the documented - # option of GNU ld is called -rpath, not --rpath. - hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir' + if test "$ld_shlibs" = no; then + hardcode_libdir_flag_spec= fi else case "$host_os" in @@ -225,6 +261,7 @@ else break fi done + ;; esac fi hardcode_direct=yes @@ -244,6 +281,7 @@ else hardcode_libdir_flag_spec='-L$libdir' hardcode_libdir_separator= fi + ;; esac fi # Begin _LT_AC_SYS_LIBPATH_AIX. @@ -291,7 +329,7 @@ else if test "$GCC" = yes ; then : else - case "$cc_basename" in + case $cc_basename in xlc*) ;; *) @@ -326,24 +364,25 @@ else # but as the default location of the library. hardcode_minus_L=yes ;; - hpux10* | hpux11*) + hpux10*) if test "$with_gnu_ld" = no; then - case "$host_cpu" in - hppa*64*) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + hardcode_direct=yes + # hardcode_minus_L: Not really in the search PATH, + # but as the default location of the library. + hardcode_minus_L=yes + fi + ;; + hpux11*) + if test "$with_gnu_ld" = no; then + hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' + hardcode_libdir_separator=: + case $host_cpu in + hppa*64*|ia64*) hardcode_direct=no ;; - ia64*) - hardcode_libdir_flag_spec='-L$libdir' - hardcode_direct=no - # hardcode_minus_L: Not really in the search PATH, - # but as the default location of the library. - hardcode_minus_L=yes - ;; *) - hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir' - hardcode_libdir_separator=: hardcode_direct=yes # hardcode_minus_L: Not really in the search PATH, # but as the default location of the library. @@ -397,8 +436,6 @@ else fi hardcode_libdir_separator=: ;; - sco3.2v5*) - ;; solaris*) hardcode_libdir_flag_spec='-R$libdir' ;; @@ -427,14 +464,11 @@ else ld_shlibs=yes fi ;; - sysv4.2uw2*) - hardcode_direct=yes - hardcode_minus_L=no + sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[01].[10]* | unixware7*) ;; - sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[78]* | unixware7*) - ;; - sysv5*) - hardcode_libdir_flag_spec= + sysv5* | sco3.2v5* | sco5v6*) + hardcode_libdir_flag_spec='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`' + hardcode_libdir_separator=':' ;; uts4*) hardcode_libdir_flag_spec='-L$libdir' @@ -471,12 +505,12 @@ case "$host_os" in ;; kfreebsd*-gnu) ;; - freebsd*) + freebsd* | dragonfly*) ;; gnu*) ;; hpux9* | hpux10* | hpux11*) - case "$host_cpu" in + case $host_cpu in ia64*) shrext=.so ;; @@ -488,6 +522,8 @@ case "$host_os" in ;; esac ;; + interix3*) + ;; irix5* | irix6* | nonstopux*) case "$host_os" in irix5* | nonstopux*) @@ -523,16 +559,16 @@ case "$host_os" in ;; osf3* | osf4* | osf5*) ;; - sco3.2v5*) - ;; solaris*) ;; sunos4*) ;; - sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*) + sysv4 | sysv4.3*) ;; sysv4*MP*) ;; + sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*) + ;; uts4*) ;; esac @@ -1,8 +1,8 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.59 for id-utils 4.1rc1. +# Generated by GNU Autoconf 2.59 for idutils 4.1rc3. # -# Report bugs to <bug-gnu-utils@gnu.org>. +# Report bugs to <bug-idutils@gnu.org>. # # Copyright (C) 2003 Free Software Foundation, Inc. # This configure script is free software; the Free Software Foundation @@ -267,11 +267,11 @@ SHELL=${CONFIG_SHELL-/bin/sh} : ${ac_max_here_lines=38} # Identity of this package. -PACKAGE_NAME='id-utils' -PACKAGE_TARNAME='id-utils' -PACKAGE_VERSION='4.1rc1' -PACKAGE_STRING='id-utils 4.1rc1' -PACKAGE_BUGREPORT='bug-gnu-utils@gnu.org' +PACKAGE_NAME='idutils' +PACKAGE_TARNAME='idutils' +PACKAGE_VERSION='4.1rc3' +PACKAGE_STRING='idutils 4.1rc3' +PACKAGE_BUGREPORT='bug-idutils@gnu.org' ac_unique_file="config.h.in" # Factoring default headers for most tests. @@ -313,7 +313,7 @@ ac_includes_default="\ gl_func_list= gl_header_list= -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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LN_S RANLIB ac_ct_RANLIB LIBOBJS ALLOCA MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os GLIBC2 GLIBC21 INTL_MACOSX_LIBS HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB EMACS EMACSLOADPATH lispdir ALLOCA_H FNMATCH_H GETOPT_H STDBOOL_H HAVE__BOOL 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 INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP EGREP LN_S RANLIB ac_ct_RANLIB LIBOBJS ALLOCA MKINSTALLDIRS USE_NLS MSGFMT GMSGFMT XGETTEXT MSGMERGE build build_cpu build_vendor build_os host host_cpu host_vendor host_os GLIBC2 GLIBC21 INTL_MACOSX_LIBS HAVE_POSIX_PRINTF HAVE_ASPRINTF HAVE_SNPRINTF HAVE_WPRINTF LIBICONV LTLIBICONV INTLBISON BUILD_INCLUDED_LIBINTL USE_INCLUDED_LIBINTL CATOBJEXT DATADIRNAME INSTOBJEXT GENCAT INTLOBJS INTL_LIBTOOL_SUFFIX_PREFIX INTLLIBS LIBINTL LTLIBINTL POSUB EMACS EMACSLOADPATH lispdir GL_COND_LIBTOOL_TRUE GL_COND_LIBTOOL_FALSE ALLOCA_H FNMATCH_H GETOPT_H STDBOOL_H HAVE__BOOL LTLIBOBJS' ac_subst_files='' # Initialize some variables set by options. @@ -790,7 +790,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures id-utils 4.1rc1 to adapt to many kinds of systems. +\`configure' configures idutils 4.1rc3 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -856,7 +856,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of id-utils 4.1rc1:";; + short | recursive ) echo "Configuration of idutils 4.1rc3:";; esac cat <<\_ACEOF @@ -901,7 +901,7 @@ Some influential environment variables: Use these variables to override the choices made by `configure' or to help it to find libraries and programs with nonstandard names/locations. -Report bugs to <bug-gnu-utils@gnu.org>. +Report bugs to <bug-idutils@gnu.org>. _ACEOF fi @@ -997,7 +997,7 @@ fi test -n "$ac_init_help" && exit 0 if $ac_init_version; then cat <<\_ACEOF -id-utils configure 4.1rc1 +idutils configure 4.1rc3 generated by GNU Autoconf 2.59 Copyright (C) 2003 Free Software Foundation, Inc. @@ -1011,7 +1011,7 @@ cat >&5 <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by id-utils $as_me 4.1rc1, which was +It was created by idutils $as_me 4.1rc3, which was generated by GNU Autoconf 2.59. Invocation command line was $ $0 $@ @@ -1672,8 +1672,8 @@ fi # Define the identity of the package. - PACKAGE='id-utils' - VERSION='4.1rc1' + PACKAGE='idutils' + VERSION='4.1rc3' cat >>confdefs.h <<_ACEOF @@ -3573,9 +3573,9 @@ echo "$as_me: WARNING: minix/config.h: proceeding with the preprocessor's result echo "$as_me: WARNING: minix/config.h: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-gnu-utils@gnu.org ## -## ------------------------------------ ## +## ---------------------------------- ## +## Report this to bug-idutils@gnu.org ## +## ---------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -3934,9 +3934,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-gnu-utils@gnu.org ## -## ------------------------------------ ## +## ---------------------------------- ## +## Report this to bug-idutils@gnu.org ## +## ---------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -4165,9 +4165,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-gnu-utils@gnu.org ## -## ------------------------------------ ## +## ---------------------------------- ## +## Report this to bug-idutils@gnu.org ## +## ---------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -6207,9 +6207,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-gnu-utils@gnu.org ## -## ------------------------------------ ## +## ---------------------------------- ## +## Report this to bug-idutils@gnu.org ## +## ---------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -6993,9 +6993,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-gnu-utils@gnu.org ## -## ------------------------------------ ## +## ---------------------------------- ## +## Report this to bug-idutils@gnu.org ## +## ---------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -8225,9 +8225,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-gnu-utils@gnu.org ## -## ------------------------------------ ## +## ---------------------------------- ## +## Report this to bug-idutils@gnu.org ## +## ---------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -9166,9 +9166,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-gnu-utils@gnu.org ## -## ------------------------------------ ## +## ---------------------------------- ## +## Report this to bug-idutils@gnu.org ## +## ---------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -10918,9 +10918,11 @@ echo "${ECHO_T}$gt_cv_func_gnugettext1_libintl" >&6 if test "$nls_cv_use_gnu_gettext" = "yes"; then BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes - LIBINTL="\${top_builddir}/intl/libintl.a $LIBICONV" - LTLIBINTL="\${top_builddir}/intl/libintl.a $LTLIBICONV" + INTLDIR="\${top_builddir}/intl" + LIBINTL="${INTLDIR}/libintl.a $LIBICONV" + LTLIBINTL="${INTLDIR}/libintl.a $LTLIBICONV" LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + CPPFLAGS="$CPPFLAGS -I${INTLDIR}" fi CATOBJEXT= @@ -12485,9 +12487,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-gnu-utils@gnu.org ## -## ------------------------------------ ## +## ---------------------------------- ## +## Report this to bug-idutils@gnu.org ## +## ---------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -13038,9 +13040,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-gnu-utils@gnu.org ## -## ------------------------------------ ## +## ---------------------------------- ## +## Report this to bug-idutils@gnu.org ## +## ---------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -13730,13 +13732,15 @@ cat >>conftest.$ac_ext <<_ACEOF enum { j = false, k = true, l = false * true, m = true * 256 }; _Bool n[m]; char o[sizeof n == m * sizeof n[0] ? 1 : -1]; + char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; int main () { - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !j + !k + !l - + !m + !n + !o); + /* Refer to every declared value, to avoid compiler optimizations. */ + return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l + + !m + !n + !o + !p); ; return 0; @@ -13924,6 +13928,16 @@ fi +if false; then + GL_COND_LIBTOOL_TRUE= + GL_COND_LIBTOOL_FALSE='#' +else + GL_COND_LIBTOOL_TRUE='#' + GL_COND_LIBTOOL_FALSE= +fi + + + @@ -14601,9 +14615,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-gnu-utils@gnu.org ## -## ------------------------------------ ## +## ---------------------------------- ## +## Report this to bug-idutils@gnu.org ## +## ---------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -14776,9 +14790,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-gnu-utils@gnu.org ## -## ------------------------------------ ## +## ---------------------------------- ## +## Report this to bug-idutils@gnu.org ## +## ---------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -15013,7 +15027,7 @@ else 'fp->_p - fp->_bf._base' \ \ '# SCO, Unixware' \ - 'fp->__ptr - fp->__base' \ + '(fp->__ptr ? fp->__ptr - fp->__base : 0)' \ \ '# old glibc?' \ 'fp->__bufp - fp->__buffer' \ @@ -15537,9 +15551,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-gnu-utils@gnu.org ## -## ------------------------------------ ## +## ---------------------------------- ## +## Report this to bug-idutils@gnu.org ## +## ---------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -15911,9 +15925,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-gnu-utils@gnu.org ## -## ------------------------------------ ## +## ---------------------------------- ## +## Report this to bug-idutils@gnu.org ## +## ---------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -16683,9 +16697,9 @@ echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >& echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;} ( cat <<\_ASBOX -## ------------------------------------ ## -## Report this to bug-gnu-utils@gnu.org ## -## ------------------------------------ ## +## ---------------------------------- ## +## Report this to bug-idutils@gnu.org ## +## ---------------------------------- ## _ASBOX ) | sed "s/^/$as_me: WARNING: /" >&2 @@ -16794,10 +16808,76 @@ fi + echo "$as_me:$LINENO: checking whether off_t can be used in a switch statement" >&5 +echo $ECHO_N "checking whether off_t can be used in a switch statement... $ECHO_C" >&6 +if test "${gl_cv_type_off_t_switch+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +off_t o = -1; + switch (o) + { + case -2: + return 1; + case -1: + return 2; + default: + return 0; + } + + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + gl_cv_type_off_t_switch=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +gl_cv_type_off_t_switch=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $gl_cv_type_off_t_switch" >&5 +echo "${ECHO_T}$gl_cv_type_off_t_switch" >&6 + if test $gl_cv_type_off_t_switch = yes; then + cat >>confdefs.h <<\_ACEOF #define _REGEX_LARGE_OFFSETS 1 _ACEOF + fi @@ -18306,6 +18386,13 @@ echo "$as_me: error: conditional \"am__fastdepCC\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi +if test -z "${GL_COND_LIBTOOL_TRUE}" && test -z "${GL_COND_LIBTOOL_FALSE}"; then + { { echo "$as_me:$LINENO: error: conditional \"GL_COND_LIBTOOL\" was never defined. +Usually this means the macro was only invoked conditionally." >&5 +echo "$as_me: error: conditional \"GL_COND_LIBTOOL\" was never defined. +Usually this means the macro was only invoked conditionally." >&2;} + { (exit 1); exit 1; }; } +fi : ${CONFIG_STATUS=./config.status} ac_clean_files_save=$ac_clean_files @@ -18577,7 +18664,7 @@ _ASBOX } >&5 cat >&5 <<_CSEOF -This file was extended by id-utils $as_me 4.1rc1, which was +This file was extended by idutils $as_me 4.1rc3, which was generated by GNU Autoconf 2.59. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -18640,7 +18727,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -id-utils config.status 4.1rc1 +idutils config.status 4.1rc3 configured by $0, generated by GNU Autoconf 2.59, with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\" @@ -18942,6 +19029,8 @@ s,@POSUB@,$POSUB,;t t s,@EMACS@,$EMACS,;t t s,@EMACSLOADPATH@,$EMACSLOADPATH,;t t s,@lispdir@,$lispdir,;t t +s,@GL_COND_LIBTOOL_TRUE@,$GL_COND_LIBTOOL_TRUE,;t t +s,@GL_COND_LIBTOOL_FALSE@,$GL_COND_LIBTOOL_FALSE,;t t s,@ALLOCA_H@,$ALLOCA_H,;t t s,@FNMATCH_H@,$FNMATCH_H,;t t s,@GETOPT_H@,$GETOPT_H,;t t diff --git a/configure.ac b/configure.ac index 53d6dd7..bdaf62a 100644 --- a/configure.ac +++ b/configure.ac @@ -2,7 +2,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ(2.59) -AC_INIT([id-utils], [4.1rc1], [bug-gnu-utils@gnu.org]) +AC_INIT([idutils], [4.1rc3], [bug-idutils@gnu.org]) AC_GNU_SOURCE AM_INIT_AUTOMAKE diff --git a/distribute-alpha.sh b/distribute-alpha.sh new file mode 100644 index 0000000..088fadb --- /dev/null +++ b/distribute-alpha.sh @@ -0,0 +1,18 @@ +#! /bin/sh + +SRC_NAME=idutils-4.0rc1 + +gpg -b --yes $SRC_NAME.tar.gz + +echo "directory: idutils" > $SRC_NAME.tar.gz.directive + +gpg --clearsign --yes $SRC_NAME.tar.gz.directive + +#upload results to ftp. +cmdftp ftp-upload.gnu.org<<EOF +cd /incoming/alpha +u $SRC_NAME.tar.gz . +u $SRC_NAME.tar.gz.sig . +u $SRC_NAME.tar.gz.directive.asc . +exit +EOF diff --git a/distribute.sh b/distribute.sh index 543228a..52ba16d 100755 --- a/distribute.sh +++ b/distribute.sh @@ -1,10 +1,10 @@ #! /bin/sh -SRC_NAME=id-utils-4.0 +SRC_NAME=idutils-4.0 gpg -b --yes $SRC_NAME.tar.gz -echo "directory: id-utils" > $SRC_NAME.tar.gz.directive +echo "directory: idutils" > $SRC_NAME.tar.gz.directive gpg --clearsign --yes $SRC_NAME.tar.gz.directive diff --git a/doc/Makefile.am b/doc/Makefile.am index 32e099b..689a90e 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,7 +1,7 @@ ## Process this file with automake to produce Makefile.in -info_TEXINFOS = id-utils.texi +info_TEXINFOS = idutils.texi EXTRA_DIST = texinfo.tex -DISTCLEANFILES = id-utils.fl +DISTCLEANFILES = idutils.fl diff --git a/doc/Makefile.in b/doc/Makefile.in index 4047e83..a229390 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -84,13 +84,13 @@ CONFIG_HEADER = $(top_builddir)/config.h CONFIG_CLEAN_FILES = SOURCES = DIST_SOURCES = -INFO_DEPS = $(srcdir)/id-utils.info +INFO_DEPS = $(srcdir)/idutils.info am__TEXINFO_TEX_DIR = $(srcdir) -DVIS = id-utils.dvi -PDFS = id-utils.pdf -PSS = id-utils.ps -HTMLS = id-utils.html -TEXINFOS = id-utils.texi +DVIS = idutils.dvi +PDFS = idutils.pdf +PSS = idutils.ps +HTMLS = idutils.html +TEXINFOS = idutils.texi TEXI2DVI = texi2dvi TEXI2PDF = $(TEXI2DVI) --pdf --batch MAKEINFOHTML = $(MAKEINFO) --html @@ -131,6 +131,8 @@ GENCAT = @GENCAT@ GETOPT_H = @GETOPT_H@ GLIBC2 = @GLIBC2@ GLIBC21 = @GLIBC21@ +GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@ +GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@ GMSGFMT = @GMSGFMT@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ @@ -220,9 +222,9 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -info_TEXINFOS = id-utils.texi +info_TEXINFOS = idutils.texi EXTRA_DIST = texinfo.tex -DISTCLEANFILES = id-utils.fl +DISTCLEANFILES = idutils.fl all: all-am .SUFFIXES: @@ -300,14 +302,14 @@ $(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps) rm -rf $(@:.html=); else rm -Rf $(@:.html=.htp) $@; fi; \ exit 1; \ fi -$(srcdir)/id-utils.info: id-utils.texi $(srcdir)/version.texi -id-utils.dvi: id-utils.texi $(srcdir)/version.texi -id-utils.pdf: id-utils.texi $(srcdir)/version.texi -id-utils.html: id-utils.texi $(srcdir)/version.texi +$(srcdir)/idutils.info: idutils.texi $(srcdir)/version.texi +idutils.dvi: idutils.texi $(srcdir)/version.texi +idutils.pdf: idutils.texi $(srcdir)/version.texi +idutils.html: idutils.texi $(srcdir)/version.texi $(srcdir)/version.texi: @MAINTAINER_MODE_TRUE@ $(srcdir)/stamp-vti -$(srcdir)/stamp-vti: id-utils.texi $(top_srcdir)/configure - @(dir=.; test -f ./id-utils.texi || dir=$(srcdir); \ - set `$(SHELL) $(srcdir)/mdate-sh $$dir/id-utils.texi`; \ +$(srcdir)/stamp-vti: idutils.texi $(top_srcdir)/configure + @(dir=.; test -f ./idutils.texi || dir=$(srcdir); \ + set `$(SHELL) $(srcdir)/mdate-sh $$dir/idutils.texi`; \ echo "@set UPDATED $$1 $$2 $$3"; \ echo "@set UPDATED-MONTH $$2 $$3"; \ echo "@set EDITION $(VERSION)"; \ @@ -364,11 +366,10 @@ dist-info: $(INFO_DEPS) done mostlyclean-aminfo: - -rm -rf id-utils.aux id-utils.cp id-utils.cps id-utils.fl id-utils.fn \ - id-utils.ky id-utils.log id-utils.op id-utils.pg \ - id-utils.tmp id-utils.toc id-utils.tp id-utils.tps \ - id-utils.vr id-utils.dvi id-utils.pdf id-utils.ps \ - id-utils.html + -rm -rf idutils.aux idutils.cp idutils.cps idutils.fl idutils.fn idutils.ky \ + idutils.log idutils.op idutils.pg idutils.tmp idutils.toc \ + idutils.tp idutils.tps idutils.vr idutils.dvi idutils.pdf \ + idutils.ps idutils.html maintainer-clean-aminfo: @list='$(INFO_DEPS)'; for i in $$list; do \ diff --git a/doc/id-utils.texi b/doc/idutils.texi index 26a673a..7c5cd34 100644 --- a/doc/id-utils.texi +++ b/doc/idutils.texi @@ -1,6 +1,6 @@ \input texinfo @comment %**start of header -@setfilename id-utils.info +@setfilename idutils.info @settitle ID database utilities @comment %**end of header @@ -21,18 +21,18 @@ @ifinfo @format START-INFO-DIR-ENTRY -* ID database: (id-utils). Identifier database utilities. -* mkid: (id-utils)mkid invocation. Creating an ID database. -* lid: (id-utils)lid invocation. Matching words and patterns. -* fid: (id-utils)fid invocation. Listing a file's tokens. -* fnid: (id-utils)fnid invocation. Looking up file names. -* xtokid: (id-utils)xtokid invocation. Testing mkid scanners. +* ID database: (idutils). Identifier database utilities. +* mkid: (idutils)mkid invocation. Creating an ID database. +* lid: (idutils)lid invocation. Matching words and patterns. +* fid: (idutils)fid invocation. Listing a file's tokens. +* fnid: (idutils)fnid invocation. Looking up file names. +* xtokid: (idutils)xtokid invocation. Testing mkid scanners. END-INFO-DIR-ENTRY @end format @end ifinfo @ifinfo -This file documents the @file{id-utils} database utilities. +This file documents the @file{idutils} database utilities. Copyright (C) 1996, 1999, 2000 Free Software Foundation, Inc. @@ -1055,12 +1055,12 @@ as a case-insensitive literal substring. @section GNU Emacs query interface @cindex Emacs interface to @code{gid} -@flindex id-utils.el @r{interface to Emacs} +@flindex idutils.el @r{interface to Emacs} @vindex load-path -The @code{id-utils} source distribution comes with a file @file{id-utils.el}, +The @code{idutils} source distribution comes with a file @file{idutils.el}, which defines a GNU Emacs interface to @code{gid}. To install it, put -@file{id-utils.el} somewhere that Emacs will find it (i.e., in your +@file{idutils.el} somewhere that Emacs will find it (i.e., in your @code{load-path}) and put @example @@ -1089,7 +1089,7 @@ GNU Emacs Manual}). @samp{lid -R edit} is an editing interface for the ID utilities that is most commonly used with @file{vi}. Emacs users should use the interface -defined in @code{id-utils.el} (@pxref{Emacs gid interface}). The ID +defined in @code{idutils.el} (@pxref{Emacs gid interface}). The ID utilities include an alias called @file{eid}, and for the sake of brevity, we'll use this alias for the remainder of this section. @file{eid} performs a @file{lid}-style, then asks if you wish to edit @@ -1250,7 +1250,7 @@ utility''. Greg McGary conceived of the ideas behind the ID utilities when he began working on the Unix kernel in 1984. He needed a navigation tool to help him find his way around the expansive, unfamiliar landscape. -The first @code{id-utils}-like tools were shell scripts, and produced an +The first @code{idutils}-like tools were shell scripts, and produced an ASCII database that looks much like the output of @samp{lid ".*"}. It took over an hour on a @sc{vax 11/750} to build a database for a @sc{4.1bsd} derived kernel. The first version of @file{lid} used the @@ -1293,10 +1293,13 @@ file-tree walker, so that directory names can be passed on the command line instead of the names of every individual file. Greg reorganized and rewrote most of the Texinfo manual to reflect these changes. +In 2006, package name had a minor change from @code{id-utils} to +@code{idutils}, to be more consistent with the other GNU package names. + @pindex cscope @pindex grep @cindex future -Future releases of @code{id-utils} might include: +Future releases of @code{idutils} might include: @table @bullet diff --git a/doc/version.texi b/doc/version.texi index 4a0aac3..b46c1b3 100644 --- a/doc/version.texi +++ b/doc/version.texi @@ -1,4 +1,4 @@ @set UPDATED 9 November 2005 @set UPDATED-MONTH November 2005 -@set EDITION 4.1rc1 -@set VERSION 4.1rc1 +@set EDITION 4.1rc2 +@set VERSION 4.1rc2 diff --git a/lib/Makefile.am b/lib/Makefile.am index 4ab24b9..215d4b6 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -152,6 +152,12 @@ libgnu_a_SOURCES += strstr.h ## end gnulib module strstr +## begin gnulib module verify + +libgnu_a_SOURCES += verify.h + +## end gnulib module verify + ## begin gnulib module xalloc-die libgnu_a_SOURCES += xalloc-die.c diff --git a/lib/Makefile.in b/lib/Makefile.in index 242b7c3..a8c82c7 100644 --- a/lib/Makefile.in +++ b/lib/Makefile.in @@ -158,6 +158,8 @@ GENCAT = @GENCAT@ GETOPT_H = @GETOPT_H@ GLIBC2 = @GLIBC2@ GLIBC21 = @GLIBC21@ +GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@ +GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@ GMSGFMT = @GMSGFMT@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ @@ -251,7 +253,7 @@ AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies noinst_LIBRARIES = libgnu.a libgnu_a_SOURCES = basename.c stripslash.c exit.h gettext.h mbchar.h \ mbuiter.h strcase.h strnlen1.h strnlen1.c strpbrk.h strsep.h \ - strstr.h xalloc-die.c + strstr.h verify.h xalloc-die.c libgnu_a_LIBADD = @LIBOBJS@ @ALLOCA@ EXTRA_DIST = alloca_.h fnmatch_.h fnmatch_loop.c getopt_.h \ getopt_int.h inttostr.c stdbool_.h diff --git a/lib/exclude.c b/lib/exclude.c index de1a5c3..6a0c149 100644 --- a/lib/exclude.c +++ b/lib/exclude.c @@ -37,6 +37,7 @@ #include "fnmatch.h" #include "strcase.h" #include "xalloc.h" +#include "verify.h" #if USE_UNLOCKED_IO # include "unlocked-io.h" @@ -54,9 +55,6 @@ is_space (unsigned char c) return IN_CTYPE_DOMAIN (c) && isspace (c); } -/* Verify a requirement at compile-time (unlike assert, which is runtime). */ -#define verify(name, assertion) struct name { char a[(assertion) ? 1 : -1]; } - /* Non-GNU systems lack these options, so we don't need to check them. */ #ifndef FNM_CASEFOLD # define FNM_CASEFOLD 0 @@ -65,11 +63,10 @@ is_space (unsigned char c) # define FNM_LEADING_DIR 0 #endif -verify (EXCLUDE_macros_do_not_collide_with_FNM_macros, - (((EXCLUDE_ANCHORED | EXCLUDE_INCLUDE | EXCLUDE_WILDCARDS) - & (FNM_PATHNAME | FNM_NOESCAPE | FNM_PERIOD | FNM_LEADING_DIR - | FNM_CASEFOLD)) - == 0)); +verify (((EXCLUDE_ANCHORED | EXCLUDE_INCLUDE | EXCLUDE_WILDCARDS) + & (FNM_PATHNAME | FNM_NOESCAPE | FNM_PERIOD | FNM_LEADING_DIR + | FNM_CASEFOLD)) + == 0); /* An exclude pattern-options pair. The options are fnmatch options ORed with EXCLUDE_* options. */ diff --git a/lib/getcwd.c b/lib/getcwd.c index 3bc6e9a..ec1771b 100644 --- a/lib/getcwd.c +++ b/lib/getcwd.c @@ -201,6 +201,8 @@ __getcwd (char *buf, size_t size) ino_t dotino; bool mount_point; int parent_status; + size_t dirroom; + size_t namlen; /* Look at the parent directory. */ #ifdef AT_FDCWD @@ -241,11 +243,20 @@ __getcwd (char *buf, size_t size) goto lose; dotlist[dotlen++] = '/'; #endif - /* Clear errno to distinguish EOF from error if readdir returns - NULL. */ - __set_errno (0); - while ((d = __readdir (dirstream)) != NULL) + for (;;) { + /* Clear errno to distinguish EOF from error if readdir returns + NULL. */ + __set_errno (0); + d = __readdir (dirstream); + if (d == NULL) + { + if (errno == 0) + /* EOF on dirstream, which means that the current directory + has been removed. */ + __set_errno (ENOENT); + goto lose; + } if (d->d_name[0] == '.' && (d->d_name[1] == '\0' || (d->d_name[1] == '.' && d->d_name[2] == '\0'))) @@ -303,48 +314,38 @@ __getcwd (char *buf, size_t size) break; } } - if (d == NULL) - { - if (errno == 0) - /* EOF on dirstream, which means that the current directory - has been removed. */ - __set_errno (ENOENT); - goto lose; - } - else - { - size_t dirroom = dirp - dir; - size_t namlen = _D_EXACT_NAMLEN (d); - if (dirroom <= namlen) + dirroom = dirp - dir; + namlen = _D_EXACT_NAMLEN (d); + + if (dirroom <= namlen) + { + if (size != 0) { - if (size != 0) - { - __set_errno (ERANGE); - goto lose; - } - else - { - char *tmp; - size_t oldsize = allocated; + __set_errno (ERANGE); + goto lose; + } + else + { + char *tmp; + size_t oldsize = allocated; - allocated += MAX (allocated, namlen); - if (allocated < oldsize - || ! (tmp = realloc (dir, allocated))) - goto memory_exhausted; + allocated += MAX (allocated, namlen); + if (allocated < oldsize + || ! (tmp = realloc (dir, allocated))) + goto memory_exhausted; - /* Move current contents up to the end of the buffer. - This is guaranteed to be non-overlapping. */ - dirp = memcpy (tmp + allocated - (oldsize - dirroom), - tmp + dirroom, - oldsize - dirroom); - dir = tmp; - } + /* Move current contents up to the end of the buffer. + This is guaranteed to be non-overlapping. */ + dirp = memcpy (tmp + allocated - (oldsize - dirroom), + tmp + dirroom, + oldsize - dirroom); + dir = tmp; } - dirp -= namlen; - memcpy (dirp, d->d_name, namlen); - *--dirp = '/'; } + dirp -= namlen; + memcpy (dirp, d->d_name, namlen); + *--dirp = '/'; thisdev = dotdev; thisino = dotino; diff --git a/lib/obstack.c b/lib/obstack.c index f3ca2c2..6df0611 100644 --- a/lib/obstack.c +++ b/lib/obstack.c @@ -51,10 +51,6 @@ # endif #endif -#if defined _LIBC && defined USE_IN_LIBIO -# include <wchar.h> -#endif - #include <stddef.h> #ifndef ELIDE_CODE @@ -433,12 +429,11 @@ print_and_abort (void) happen because the "memory exhausted" message appears in other places like this and the translation should be reused instead of creating a very similar string which requires a separate translation. */ -# if defined _LIBC && defined USE_IN_LIBIO - if (_IO_fwide (stderr, 0) > 0) - __fwprintf (stderr, L"%s\n", _("memory exhausted")); - else +# ifdef _LIBC + (void) __fxprintf (NULL, "%s\n", _("memory exhausted")); +# else + fprintf (stderr, "%s\n", _("memory exhausted")); # endif - fprintf (stderr, "%s\n", _("memory exhausted")); exit (obstack_exit_failure); } diff --git a/lib/obstack.h b/lib/obstack.h index 940bc80..95dd438 100644 --- a/lib/obstack.h +++ b/lib/obstack.h @@ -1,11 +1,7 @@ /* obstack.h - object stack macros - Copyright (C) 1988-1994,1996-1999,2003,2004 Free Software Foundation, Inc. - - This file is part of the GNU C Library. Its master source is NOT part of - the C library, however. The master source lives in /gd/gnu/lib. - - NOTE: The canonical source of this file is maintained with the GNU C Library. - Bugs can be reported to bug-glibc@gnu.org. + Copyright (C) 1988-1994,1996-1999,2003,2004,2005 + Free Software Foundation, Inc. + This file is part of the GNU C Library. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -464,7 +460,7 @@ __extension__ \ (((const void **) ((h)->next_free += sizeof (void *)))[-1] = (aptr)) # define obstack_int_grow_fast(h,aint) \ - (((int *) ((h)->next_free += sizeof (int)))[-1] = (aptr)) + (((int *) ((h)->next_free += sizeof (int)))[-1] = (aint)) # define obstack_blank(h,length) \ ( (h)->temp.tempint = (length), \ diff --git a/lib/regex_internal.h b/lib/regex_internal.h index a36ae4c..d10ba1e 100644 --- a/lib/regex_internal.h +++ b/lib/regex_internal.h @@ -182,6 +182,11 @@ typedef unsigned long int bitset_word; # if BITSET_WORD_BITS <= SBC_MAX # error "Invalid SBC_MAX" # endif +#elif BITSET_WORD_MAX == (0xffffffff + 2) * 0xffffffff +/* Work around a bug in PGC GNU/Linux x86-64 5.2-1 and 6.0-8 (and + probably other versions), where the preprocessor mishandles large + unsigned values and thinks they are signed. */ +# define BITSET_WORD_BITS 64 #else # error "Add case for new bitset_word size" #endif diff --git a/lib/strcasecmp.c b/lib/strcasecmp.c index 71f2eca..c1bac0a 100644 --- a/lib/strcasecmp.c +++ b/lib/strcasecmp.c @@ -25,6 +25,7 @@ #include "strcase.h" #include <ctype.h> +#include <limits.h> #if HAVE_MBRTOWC # include "mbuiter.h" @@ -93,6 +94,12 @@ strcasecmp (const char *s1, const char *s2) } while (c1 == c2); - return c1 - c2; + if (UCHAR_MAX <= INT_MAX) + return c1 - c2; + else + /* On machines where 'char' and 'int' are types of the same size, the + difference of two 'unsigned char' values - including the sign bit - + doesn't fit in an 'int'. */ + return (c1 > c2 ? 1 : c1 < c2 ? -1 : 0); } } diff --git a/lib/strncasecmp.c b/lib/strncasecmp.c index 72ead01..0209c39 100644 --- a/lib/strncasecmp.c +++ b/lib/strncasecmp.c @@ -1,5 +1,5 @@ /* strncasecmp.c -- case insensitive string comparator - Copyright (C) 1998, 1999 Free Software Foundation, Inc. + Copyright (C) 1998, 1999, 2005 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -23,6 +23,7 @@ #include "strcase.h" #include <ctype.h> +#include <limits.h> #define TOLOWER(Ch) (isupper (Ch) ? tolower (Ch) : (Ch)) @@ -54,5 +55,11 @@ strncasecmp (const char *s1, const char *s2, size_t n) } while (c1 == c2); - return c1 - c2; + if (UCHAR_MAX <= INT_MAX) + return c1 - c2; + else + /* On machines where 'char' and 'int' are types of the same size, the + difference of two 'unsigned char' values - including the sign bit - + doesn't fit in an 'int'. */ + return (c1 > c2 ? 1 : c1 < c2 ? -1 : 0); } diff --git a/libidu/Makefile.am b/libidu/Makefile.am index ac18713..fb3ed6c 100644 --- a/libidu/Makefile.am +++ b/libidu/Makefile.am @@ -14,7 +14,7 @@ libidu_a_SOURCES = dynvec.c dynvec.h \ iduglobal.h \ xnls.h -AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/intl \ +AM_CPPFLAGS = -I$(top_srcdir)/lib \ -DDATADIR=\"$(datadir)\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DLANGUAGE_MAP_FILE=\"$(datadir)/id-lang.map\" diff --git a/libidu/Makefile.in b/libidu/Makefile.in index 30cb6fa..4d359d1 100644 --- a/libidu/Makefile.in +++ b/libidu/Makefile.in @@ -147,6 +147,8 @@ GENCAT = @GENCAT@ GETOPT_H = @GETOPT_H@ GLIBC2 = @GLIBC2@ GLIBC21 = @GLIBC21@ +GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@ +GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@ GMSGFMT = @GMSGFMT@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ @@ -249,7 +251,7 @@ libidu_a_SOURCES = dynvec.c dynvec.h \ iduglobal.h \ xnls.h -AM_CPPFLAGS = -I$(top_srcdir)/lib -I$(top_srcdir)/intl \ +AM_CPPFLAGS = -I$(top_srcdir)/lib \ -DDATADIR=\"$(datadir)\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DLANGUAGE_MAP_FILE=\"$(datadir)/id-lang.map\" diff --git a/lisp/Makefile.am b/lisp/Makefile.am index 9038f21..16cf288 100644 --- a/lisp/Makefile.am +++ b/lisp/Makefile.am @@ -1,4 +1,4 @@ ## Process this file with automake to create Makefile.in -dist_lisp_LISP = id-utils.el +dist_lisp_LISP = idutils.el diff --git a/lisp/Makefile.in b/lisp/Makefile.in index f91faef..06588ed 100644 --- a/lisp/Makefile.in +++ b/lisp/Makefile.in @@ -93,7 +93,7 @@ am__strip_dir = `echo $$p | sed -e 's|^.*/||'`; am__installdirs = "$(DESTDIR)$(lispdir)" dist_lispLISP_INSTALL = $(INSTALL_DATA) LISP = $(dist_lisp_LISP) -am__ELFILES = id-utils.el +am__ELFILES = idutils.el am__ELCFILES = $(am__ELFILES:.el=.elc) ELCFILES = $(LISP:.el=.elc) elisp_comp = $(top_srcdir)/elisp-comp @@ -131,6 +131,8 @@ GENCAT = @GENCAT@ GETOPT_H = @GETOPT_H@ GLIBC2 = @GLIBC2@ GLIBC21 = @GLIBC21@ +GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@ +GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@ GMSGFMT = @GMSGFMT@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ @@ -220,7 +222,7 @@ sbindir = @sbindir@ sharedstatedir = @sharedstatedir@ sysconfdir = @sysconfdir@ target_alias = @target_alias@ -dist_lisp_LISP = id-utils.el +dist_lisp_LISP = idutils.el all: all-am .SUFFIXES: diff --git a/lisp/id-utils.el b/lisp/idutils.el index 09c7f9b..b52e614 100644 --- a/lisp/id-utils.el +++ b/lisp/idutils.el @@ -1,15 +1,15 @@ -;;; id-utils.el -- emacs interface to `lid -R grep', a.k.a. `gid' -;;; Copyright (C) 1995, 1996 Free Software Foundation, Inc. +;;; idutils.el -- emacs interface to `lid -R grep', a.k.a. `gid' +;;; Copyright (C) 1995, 1996, 2006 Free Software Foundation, Inc. ;;; Greg McGary <gkm@gnu.ai.mit.edu>. -;; This file is part of GNU id-utils. +;; This file is part of GNU idutils. -;; GNU id-utils is free software; you can redistribute it and/or modify +;; GNU idutils is free software; you can redistribute it and/or modify ;; it under the terms of the GNU General Public License as published by ;; the Free Software Foundation; either version 2, or (at your option) ;; any later version. -;; GNU id-utils is distributed in the hope that it will be useful, +;; GNU idutils is distributed in the hope that it will be useful, ;; but WITHOUT ANY WARRANTY; without even the implied warranty of ;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ;; GNU General Public License for more details. @@ -20,19 +20,19 @@ ;; MA 02111-1307, USA. ;;; This package provides the tools meant to help editing PO files, -;;; as documented in the GNU id-utils user's manual. See this manual +;;; as documented in the GNU idutils user's manual. See this manual ;;; for user documentation, which is not repeated here. ;;; To install, merely put this file somewhere GNU Emacs will find it, ;;; then add the following lines to your .emacs file: ;;; -;;; (autoload 'gid "id-utils") +;;; (autoload 'gid "idutils") ;;; ;;; You may also adjust some customizations variables, below, by defining ;;; them in your .emacs file. (require 'compile) -(provide 'id-utils) +(provide 'idutils) (defvar gid-command "gid" "The command run by the gid function.") diff --git a/m4/Makefile.in b/m4/Makefile.in index f32f71a..9dc5350 100644 --- a/m4/Makefile.in +++ b/m4/Makefile.in @@ -116,6 +116,8 @@ GENCAT = @GENCAT@ GETOPT_H = @GETOPT_H@ GLIBC2 = @GLIBC2@ GLIBC21 = @GLIBC21@ +GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@ +GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@ GMSGFMT = @GMSGFMT@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ diff --git a/m4/fpending.m4 b/m4/fpending.m4 index 87398b1..f43aaa4 100644 --- a/m4/fpending.m4 +++ b/m4/fpending.m4 @@ -1,4 +1,4 @@ -#serial 6 +#serial 7 # Copyright (C) 2000, 2001, 2004, 2005 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -42,7 +42,7 @@ AC_DEFUN([gl_FUNC_FPENDING], 'fp->_p - fp->_bf._base' \ \ '# SCO, Unixware' \ - 'fp->__ptr - fp->__base' \ + '(fp->__ptr ? fp->__ptr - fp->__base : 0)' \ \ '# old glibc?' \ 'fp->__bufp - fp->__buffer' \ diff --git a/m4/gettext.m4 b/m4/gettext.m4 index 624a807..da2d610 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -234,9 +234,11 @@ return * gettext ("")]ifelse([$2], [need-ngettext], [ + * ngettext ("", "", 0)], dnl Mark actions used to generate GNU NLS library. BUILD_INCLUDED_LIBINTL=yes USE_INCLUDED_LIBINTL=yes - LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" - LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" + INTLDIR="ifelse([$3],[],\${top_builddir}/intl,[$3])" + LIBINTL="${INTLDIR}/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" + LTLIBINTL="${INTLDIR}/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + CPPFLAGS="$CPPFLAGS -I${INTLDIR}" fi CATOBJEXT= diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4 index 96b0f7c..daff40e 100644 --- a/m4/gnulib-comp.m4 +++ b/m4/gnulib-comp.m4 @@ -26,6 +26,7 @@ AC_DEFUN([gl_EARLY], # "Check for header files, types and library functions". AC_DEFUN([gl_INIT], [ +AM_CONDITIONAL([GL_COND_LIBTOOL], [false]) gl_FUNC_ALLOCA gl_FUNC_ATEXIT gl_CLOSEOUT @@ -144,6 +145,7 @@ AC_DEFUN([gl_FILE_LIST], [ lib/strstr.c lib/strstr.h lib/umaxtostr.c + lib/verify.h lib/xalloc-die.c lib/xalloc.h lib/xgetcwd.c diff --git a/m4/regex.m4 b/m4/regex.m4 index d7e2210..8ea4fe9 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,4 +1,4 @@ -#serial 30 +#serial 31 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005 Free # Software Foundation, Inc. @@ -15,8 +15,29 @@ AC_PREREQ([2.50]) AC_DEFUN([gl_REGEX], [ AC_REQUIRE([AC_SYS_LARGEFILE]) dnl for a sufficently-wide off_t - AC_DEFINE([_REGEX_LARGE_OFFSETS], 1, - [Define if you want regoff_t to be at least as wide POSIX requires.]) + + AC_CACHE_CHECK([whether off_t can be used in a switch statement], + [gl_cv_type_off_t_switch], + [AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM( + [AC_INCLUDES_DEFAULT], + [[off_t o = -1; + switch (o) + { + case -2: + return 1; + case -1: + return 2; + default: + return 0; + } + ]])], + [gl_cv_type_off_t_switch=yes], + [gl_cv_type_off_t_switch=no])]) + if test $gl_cv_type_off_t_switch = yes; then + AC_DEFINE([_REGEX_LARGE_OFFSETS], 1, + [Define if you want regoff_t to be at least as wide POSIX requires.]) + fi AC_LIBSOURCES( [regcomp.c, regex.c, regex.h, diff --git a/m4/stdbool.m4 b/m4/stdbool.m4 index 3f6b4bf..dcb5793 100644 --- a/m4/stdbool.m4 +++ b/m4/stdbool.m4 @@ -1,6 +1,6 @@ # Check for stdbool.h that conforms to C99. -dnl Copyright (C) 2002-2004 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2005 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -28,6 +28,9 @@ AC_DEFUN([AM_STDBOOL_H], AC_SUBST([HAVE__BOOL]) ]) +# AM_STDBOOL_H will be renamed to gl_STDBOOL_H in the future. +AC_DEFUN([gl_STDBOOL_H], [AM_STDBOOL_H]) + # This macro is only needed in autoconf <= 2.59. Newer versions of autoconf # have this macro built-in. @@ -70,10 +73,12 @@ AC_DEFUN([AC_HEADER_STDBOOL], enum { j = false, k = true, l = false * true, m = true * 256 }; _Bool n[m]; char o[sizeof n == m * sizeof n[0] ? 1 : -1]; + char p[-1 - (_Bool) 0 < 0 && -1 - (bool) 0 < 0 ? 1 : -1]; ], [ - return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !j + !k + !l - + !m + !n + !o); + /* Refer to every declared value, to avoid compiler optimizations. */ + return (!a + !b + !c + !d + !e + !f + !g + !h + !i + !!j + !k + !!l + + !m + !n + !o + !p); ], [ac_cv_header_stdbool_h=yes], [ac_cv_header_stdbool_h=no])]) @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU mkid 3.0.8\n" -"Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n" +"Report-Msgid-Bugs-To: bug-idutils@gnu.org\n" "POT-Creation-Date: 2005-12-27 07:15+0100\n" "PO-Revision-Date: 1996-03-23 22:34 MET\n" "Last-Translator: Karl Eichwalder <ke@ke.Central.DE>\n" @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU mkid 3.0.8\n" -"Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n" +"Report-Msgid-Bugs-To: bug-idutils@gnu.org\n" "POT-Creation-Date: 2005-12-27 07:15+0100\n" "PO-Revision-Date: 1996-03-23 22:34 MET\n" "Last-Translator: Unknown <unknown@unknown.fr>\n" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: id-utils 3.2\n" -"Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n" +"Report-Msgid-Bugs-To: bug-idutils@gnu.org\n" "POT-Creation-Date: 2005-12-27 07:15+0100\n" "PO-Revision-Date: 1998-09-30 13:31+02:00\n" "Last-Translator: Ivo Timmermans <zarq@iname.com>\n" @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: id-utils 3.0.8\n" -"Report-Msgid-Bugs-To: bug-id-utils@gnu.org\n" +"Report-Msgid-Bugs-To: bug-idutils@gnu.org\n" "POT-Creation-Date: 2005-12-27 07:15+0100\n" "PO-Revision-Date: 1997-03-26 23:59 +0100\n" "Last-Translator: Wojciech Marek Gałązka <wgalazka@chem.uw.edu.pl>\n" diff --git a/src/Makefile.am b/src/Makefile.am index 9987b77..18c72d5 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -4,10 +4,8 @@ dist_bin_SCRIPTS = eid aid gid defid AM_CPPFLAGS = -I$(top_srcdir)/libidu \ -I$(top_srcdir)/lib \ - -I$(top_srcdir)/intl \ -DDATADIR=\"$(datadir)\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DLANGUAGE_MAP_FILE=\"$(datadir)/id-lang.map\" LDADD = ../libidu/libidu.a ../lib/libgnu.a $(LIBINTL) ../lib/libgnu.a - diff --git a/src/Makefile.in b/src/Makefile.in index 67d1b7b..fc7f007 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -163,6 +163,8 @@ GENCAT = @GENCAT@ GETOPT_H = @GETOPT_H@ GLIBC2 = @GLIBC2@ GLIBC21 = @GLIBC21@ +GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@ +GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@ GMSGFMT = @GMSGFMT@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ @@ -255,7 +257,6 @@ target_alias = @target_alias@ dist_bin_SCRIPTS = eid aid gid defid AM_CPPFLAGS = -I$(top_srcdir)/libidu \ -I$(top_srcdir)/lib \ - -I$(top_srcdir)/intl \ -DDATADIR=\"$(datadir)\" \ -DLOCALEDIR=\"$(datadir)/locale\" \ -DLANGUAGE_MAP_FILE=\"$(datadir)/id-lang.map\" diff --git a/testsuite/Makefile.in b/testsuite/Makefile.in index 6e2e175..ffaa481 100644 --- a/testsuite/Makefile.in +++ b/testsuite/Makefile.in @@ -116,6 +116,8 @@ GENCAT = @GENCAT@ GETOPT_H = @GETOPT_H@ GLIBC2 = @GLIBC2@ GLIBC21 = @GLIBC21@ +GL_COND_LIBTOOL_FALSE = @GL_COND_LIBTOOL_FALSE@ +GL_COND_LIBTOOL_TRUE = @GL_COND_LIBTOOL_TRUE@ GMSGFMT = @GMSGFMT@ HAVE_ASPRINTF = @HAVE_ASPRINTF@ HAVE_POSIX_PRINTF = @HAVE_POSIX_PRINTF@ |