=== modified file 'ChangeLog' --- ChangeLog 2011-01-09 06:57:07 +0000 +++ ChangeLog 2011-01-09 07:29:26 +0000 @@ -1,5 +1,13 @@ 2011-01-09 Paul Eggert + Use gnulib's getopt-gnu module. + * Makefile.in (GNULIB_MODULES): Add getopt-gnu. + (AUTOCONF_INPUTS): Remove getopt.m4; aclocal.m4 is a good-enough + representative of the dependencies. + * configure.in: Do not configure getopt, as gnulib does that now. + * make-dist: Do not worry about lib-src/getopt.h, as gnulib handles + getopt now, in lib. + Regenerate. * arg-nonnull.h, c++defs.h, lib/mktime-internal.h, lib/mktime.c: * lib/stddef.in.h, lib/time.h, lib/time.in.h, lib/time_r.c: === modified file 'Makefile.in' --- Makefile.in 2011-01-09 04:31:19 +0000 +++ Makefile.in 2011-01-09 07:29:26 +0000 @@ -330,7 +330,7 @@ # Update modules from gnulib, for maintainers, who should have it in # $(gnulib_srcdir) (relative to $(srcdir) and should have build tools # as per $(gnulib_srcdir)/DEPENDENCIES. -GNULIB_MODULES = ftoastr mktime +GNULIB_MODULES = ftoastr getopt-gnu mktime GNULIB_TOOL_FLAGS = \ --import --no-changelog --no-vc-files --makefile-name=gnulib.mk sync-from-gnulib: $(gnulib_srcdir) @@ -401,7 +401,7 @@ config.status: ${srcdir}/configure ${srcdir}/lisp/version.el ./config.status --recheck -AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/m4/getopt.m4 $(srcdir)/aclocal.m4 +AUTOCONF_INPUTS = @MAINT@ $(srcdir)/configure.in $(srcdir)/aclocal.m4 $(srcdir)/configure: $(AUTOCONF_INPUTS) cd ${srcdir} && autoconf === modified file 'configure.in' --- configure.in 2011-01-09 04:31:19 +0000 +++ configure.in 2011-01-09 07:29:26 +0000 @@ -2657,15 +2657,6 @@ AC_FUNC_FSEEKO -# Configure getopt. -m4_include([m4/getopt.m4]) -gl_GETOPT_IFELSE([ - gl_GETOPT_SUBSTITUTE_HEADER - gl_PREREQ_GETOPT - GETOPTOBJS='getopt.o getopt1.o' -]) -AC_SUBST(GETOPTOBJS) - AC_FUNC_GETPGRP # Configure gnulib. === modified file 'lib-src/Makefile.in' --- lib-src/Makefile.in 2011-01-08 21:02:38 +0000 +++ lib-src/Makefile.in 2011-01-09 07:29:26 +0000 @@ -279,7 +279,7 @@ fi mostlyclean: - -rm -f core *.o getopt.h getopt.h-t + -rm -f core *.o clean: mostlyclean -rm -f ${INSTALLABLES} ${UTILITIES} ${DONT_INSTALL} @@ -311,20 +311,6 @@ $(CC) ${ALL_CFLAGS} -o test-distrib ${srcdir}/test-distrib.c ./test-distrib ${srcdir}/testfile -## We need the following in order to create a when the system -## does not have one that works with the given compiler. -GETOPT_H = @GETOPT_H@ -getopt.h: getopt_.h - cp $(srcdir)/getopt_.h address@hidden - mv address@hidden $@ - -GETOPTOBJS = @GETOPTOBJS@ -GETOPTDEPS = $(GETOPTOBJS) $(GETOPT_H) -getopt.o: ${srcdir}/getopt.c $(GETOPT_H) ${srcdir}/gettext.h - ${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt.c -getopt1.o: ${srcdir}/getopt1.c $(GETOPT_H) - ${CC} -c ${CPP_CFLAGS} ${srcdir}/getopt1.c - ../lib/libgnu.a: ../src/config.h cd ../lib && $(MAKE) libgnu.a @@ -335,20 +321,20 @@ ${CC} -c ${CPP_CFLAGS} -DCONFIG_BROKETS -DINHIBIT_STRING_HEADER \ ${srcdir}/../src/regex.c -etags${EXEEXT}: ${srcdir}/etags.c $(GETOPTDEPS) $(REGEXPDEPS) ../src/config.h +etags${EXEEXT}: ${srcdir}/etags.c $(REGEXPDEPS) ../src/config.h $(CC) ${ALL_CFLAGS} -DEMACS_NAME="\"GNU Emacs\"" \ - -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) \ + -DVERSION="\"${version}\"" ${srcdir}/etags.c \ $(REGEXPOBJ) $(LOADLIBES) -o etags -ebrowse${EXEEXT}: ${srcdir}/ebrowse.c $(GETOPTDEPS) ../src/config.h +ebrowse${EXEEXT}: ${srcdir}/ebrowse.c ../src/config.h $(CC) ${ALL_CFLAGS} -DVERSION="\"${version}\"" \ - ${srcdir}/ebrowse.c $(GETOPTOBJS) $(LOADLIBES) -o ebrowse + ${srcdir}/ebrowse.c $(LOADLIBES) -o ebrowse ## We depend on etags to assure that parallel makes do not write two ## etags.o files on top of each other. ctags${EXEEXT}: etags${EXEEXT} $(CC) ${ALL_CFLAGS} -DCTAGS -DEMACS_NAME="\"GNU Emacs\"" \ - -DVERSION="\"${version}\"" ${srcdir}/etags.c $(GETOPTOBJS) \ + -DVERSION="\"${version}\"" ${srcdir}/etags.c \ $(REGEXPOBJ) $(LOADLIBES) -o ctags profile${EXEEXT}: ${srcdir}/profile.c ../src/config.h @@ -358,11 +344,11 @@ $(CC) ${ALL_CFLAGS} ${srcdir}/make-docfile.c $(LOADLIBES) \ -o make-docfile -movemail${EXEEXT}: movemail.o pop.o $(GETOPTDEPS) +movemail${EXEEXT}: movemail.o pop.o $(CC) ${LINK_CFLAGS} ${MOVE_FLAGS} movemail.o pop.o \ - $(GETOPTOBJS) $(LOADLIBES) $(LIBS_MOVE) -o movemail + $(LOADLIBES) $(LIBS_MOVE) -o movemail -movemail.o: ${srcdir}/movemail.c ../src/config.h $(GETOPT_H) +movemail.o: ${srcdir}/movemail.c ../src/config.h $(CC) -c ${CPP_CFLAGS} ${MOVE_FLAGS} ${srcdir}/movemail.c pop.o: ${srcdir}/pop.c ../src/config.h @@ -371,19 +357,19 @@ fakemail${EXEEXT}: ${srcdir}/fakemail.c ../src/config.h $(CC) ${ALL_CFLAGS} ${srcdir}/fakemail.c $(LOADLIBES) -o fakemail -emacsclient${EXEEXT}: ${srcdir}/emacsclient.c ../src/config.h $(GETOPTDEPS) - $(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c $(GETOPTOBJS) \ +emacsclient${EXEEXT}: ${srcdir}/emacsclient.c ../src/config.h + $(CC) ${ALL_CFLAGS} ${srcdir}/emacsclient.c \ -DVERSION="\"${version}\"" \ $(LOADLIBES) -o emacsclient hexl${EXEEXT}: ${srcdir}/hexl.c ../src/config.h $(CC) ${ALL_CFLAGS} ${srcdir}/hexl.c $(LOADLIBES) -o hexl -update-game-score${EXEEXT}: update-game-score.o $(GETOPTDEPS) - $(CC) ${LINK_CFLAGS} update-game-score.o $(GETOPTOBJS) \ +update-game-score${EXEEXT}: update-game-score.o + $(CC) ${LINK_CFLAGS} update-game-score.o \ $(LOADLIBES) -o update-game-score -update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h $(GETOPT_H) +update-game-score.o: ${srcdir}/update-game-score.c ../src/config.h $(CC) -c ${CPP_CFLAGS} ${srcdir}/update-game-score.c \ -DHAVE_SHARED_GAME_DIR="\"$(gamedir)\"" === modified file 'make-dist' --- make-dist 2011-01-09 04:31:19 +0000 +++ make-dist 2011-01-09 07:29:26 +0000 @@ -384,9 +384,7 @@ ln [a-zA-Z]*.[ch] ../${tempdir}/lib-src ln ChangeLog Makefile.in README testfile vcdiff ../${tempdir}/lib-src ln grep-changelog rcs2log rcs-checkin ../${tempdir}/lib-src - ln makefile.w32-in ../${tempdir}/lib-src - cd ../${tempdir}/lib-src - rm -f getopt.h) + ln makefile.w32-in ../${tempdir}/lib-src) echo "Making links to \`m4'" (cd m4