Trouble linking under lib-src on FreeBSD 4.11

["Jan D." <jan.h.d@swipnet.se>]

Hello.

FreeBSD 4.11 does not seem to have a getopt_long, so lib-src/getopt1.c
is compiled.  However, src/config.h sets

/* Define to rpl_ if the getopt replacement functions and variables
should be
   used. */
#define __GETOPT_PREFIX rpl_


so instead of making a getopt_long function in getopt1.c, it becomes
rpl_getopt_long.

But etags, emacsclient and other stuff in lib-src calls getopt_long, not
rpl_getopt_long, so I get:

gcc -I/usr/X11R6/include -I/usr/local/include -L/usr/local/lib   
-DHAVE_CONFIG_H    -I. -I../src -I/users/jan/src/emacs/lib-src
-I/users/jan/src/emacs/lib-src/../src   -g -O2 -DVERSION="\"22.0.50\""
/users/jan/src/emacs/lib-src/etags.c getopt.o getopt1.o regex.o
-lutil    -lc -o etags
/tmp/ccJRP6DB.o: In function `main':
/users/jan/src/emacs/lib-src/etags.c:1276: undefined reference to
`getopt_long'
*** Error code 1

So what is the correct thing to do here?  Either fix etags, emacsclient
and so on so they check fro GETOPT_PREFIX, or fix m4/getopt.m4 so it
does not define GETOPT_PREFIX?

    Jan D.