2003-08-26 Theodore A. Roth * configure.ac (AC_INIT): Bump version. (AC_CHECK_HEADERS): Remove check for libintl.h so it doesn't get used in gnu_getopt.c. * src/getopt/gnu_getopt.c: Don't allow _ to be defined to gettext(). Index: configure.ac =================================================================== RCS file: /cvsroot/simulavr/simulavr/configure.ac,v retrieving revision 1.4 diff -u -p -r1.4 configure.ac --- configure.ac 19 Aug 2003 00:47:22 -0000 1.4 +++ configure.ac 26 Aug 2003 18:40:36 -0000 @@ -270,7 +270,7 @@ TROTH_ENABLE_CURSES(disp) # Checks for header files. AC_HEADER_STDC AC_HEADER_SYS_WAIT -AC_CHECK_HEADERS([arpa/inet.h fcntl.h libintl.h netinet/in.h stdlib.h string.h strings.h sys/ioctl.h sys/socket.h sys/time.h termios.h unistd.h inttypes.h]) +AC_CHECK_HEADERS([arpa/inet.h fcntl.h netinet/in.h stdlib.h string.h strings.h sys/ioctl.h sys/socket.h sys/time.h termios.h unistd.h inttypes.h]) # Checks for typedefs, structures, and compiler characteristics. AC_C_CONST Index: src/getopt/gnu_getopt.c =================================================================== RCS file: /cvsroot/simulavr/simulavr/src/getopt/gnu_getopt.c,v retrieving revision 1.1 diff -u -p -r1.1 gnu_getopt.c --- src/getopt/gnu_getopt.c 13 Aug 2003 01:32:43 -0000 1.1 +++ src/getopt/gnu_getopt.c 26 Aug 2003 18:40:37 -0000 @@ -91,6 +91,12 @@ # endif #endif +/* TRoth/2003-08-26: We are not currently using libintl anywere else in + simulavr, so just make sure that _ is not defined to use gettext(). */ + +#undef _ +#define _(msgid) (msgid) + /* This version of `getopt' appears to the caller like standard Unix `getopt' but it behaves differently for the user, since it allows the user to intersperse the options with the other arguments.