mirrors/emacs
1
Fork 0
mirror of git://git.sv.gnu.org/emacs.git synced 2025-12-06 14:30:50 -08:00
Code Issues Projects Releases Wiki Activity

Clean out last vestiges of the old HAVE_CONFIG_H stuff.

Browse source
This commit is contained in:
Paul Eggert 2012-06-25 18:05:39 -07:00
parent 414e642ca9
commit cf38a720e8
23 changed files with 61 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2012-06-26 Paul Eggert <eggert@cs.ucla.edu>
Clean out last vestiges of the old HAVE_CONFIG_H stuff.
* lib/makefile.w32-in (LOCAL_FLAGS): Remove -DHAVE_CONFIG_H.
2012-06-25 Dmitry Antipov <dmantipov@yandex.ru> 2012-06-25 Dmitry Antipov <dmantipov@yandex.ru>
* configure.in (AC_CHECK_FUNCS): Detect library functions * configure.in (AC_CHECK_FUNCS): Detect library functions

10
lib-src/ChangeLog
View file

@ -1,3 +1,13 @@
2012-06-26 Paul Eggert <eggert@cs.ucla.edu>
Clean out last vestiges of the old HAVE_CONFIG_H stuff.
* Makefile.in (BASE_CFLAGS):
* makefile.w32-in (LOCAL_FLAGS): Remove -DHAVE_CONFIG_H.
* etags.c, hexl.c, pop.c: Include <config.h> unconditionally.
* etags.c (DOS_NT):
* pop.c (MAIL_USE_POP, h_errno):
Remove code that was conditioned on !HAVE_CONFIG_H.
2012-06-25 Dmitry Antipov <dmantipov@yandex.ru> 2012-06-25 Dmitry Antipov <dmantipov@yandex.ru>
* etags.c (etags_strcasecmp, etags_strncasecmp): Define to * etags.c (etags_strcasecmp, etags_strncasecmp): Define to

5
lib-src/Makefile.in
View file

@ -169,12 +169,9 @@ LIBS_MOVE = $(LIBS_MAIL) $(KRB4LIB) $(DESLIB) $(KRB5LIB) $(CRYPTOLIB) \
## Some systems define this to request special libraries. ## Some systems define this to request special libraries.
LIBS_SYSTEM = @LIBS_SYSTEM@ LIBS_SYSTEM = @LIBS_SYSTEM@
# Those files shared with other GNU utilities need HAVE_CONFIG_H
# defined before they know they can take advantage of the information
# in ../src/config.h.
BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \
$(WARN_CFLAGS) $(WERROR_CFLAGS) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \
-DHAVE_CONFIG_H -I. -I../src -I../lib \ -I. -I../src -I../lib \
-I${srcdir} -I${srcdir}/../src -I${srcdir}/../lib -I${srcdir} -I${srcdir}/../src -I${srcdir}/../lib
ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS}

16
lib-src/etags.c
View file

@ -91,9 +91,7 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
# define NDEBUG /* disable assert */ # define NDEBUG /* disable assert */
#endif #endif
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h>
#endif /* !HAVE_CONFIG_H */
#ifndef _GNU_SOURCE #ifndef _GNU_SOURCE
# define _GNU_SOURCE 1 /* enables some compiler checks on GNU */ # define _GNU_SOURCE 1 /* enables some compiler checks on GNU */
@ -113,10 +111,6 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
# include <fcntl.h> # include <fcntl.h>
# include <sys/param.h> # include <sys/param.h>
# include <io.h> # include <io.h>
# ifndef HAVE_CONFIG_H
# define DOS_NT
# include <sys/config.h>
# endif
#else #else
# define MSDOS FALSE # define MSDOS FALSE
#endif /* MSDOS */ #endif /* MSDOS */
@ -167,14 +161,6 @@ char pot_etags_version[] = "@(#) pot revision number is 17.38.1.4";
# include <getopt.h> # include <getopt.h>
#endif /* NO_LONG_OPTIONS */ #endif /* NO_LONG_OPTIONS */
#ifndef HAVE_CONFIG_H /* this is a standalone compilation */
# ifdef __CYGWIN__ /* compiling on Cygwin */
!!! NOTICE !!!
the regex.h distributed with Cygwin is not compatible with etags, alas!
If you want regular expression support, you should delete this notice and
arrange to use the GNU regex.h and regex.c.
# endif
#endif
#include <regex.h> #include <regex.h>
/* Define CTAGS to make the program "ctags" compatible with the usual one. /* Define CTAGS to make the program "ctags" compatible with the usual one.

2
lib-src/hexl.c
View file

@ -20,9 +20,7 @@ You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>. */ along with this program. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <ctype.h> #include <ctype.h>

2
lib-src/makefile.w32-in
View file

@ -24,7 +24,7 @@ ALL = $(BLD)/test-distrib.exe $(BLD)/make-docfile.exe $(BLD)/hexl.exe\
.PHONY: make-docfile .PHONY: make-docfile
LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DNO_LDAV=1 \ LOCAL_FLAGS = -DWINDOWSNT -DDOS_NT -DNO_LDAV=1 \
-DNO_ARCHIVES=1 -DHAVE_CONFIG_H=1 -I../lib \ -DNO_ARCHIVES=1 -I../lib \
-I../nt/inc -I../src $(EMACS_EXTRA_C_FLAGS) -I../nt/inc -I../src $(EMACS_EXTRA_C_FLAGS)
LIBS = $(BASE_LIBS) $(ADVAPI32) LIBS = $(BASE_LIBS) $(ADVAPI32)

6
lib-src/pop.c
View file

@ -21,11 +21,7 @@ You should have received a copy of the GNU General Public License
along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */ along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. */
#ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#else
#define MAIL_USE_POP
#endif
#ifdef MAIL_USE_POP #ifdef MAIL_USE_POP
@ -101,7 +97,7 @@ extern char *krb_realmofhost (/* char * */);
#endif /* KERBEROS */ #endif /* KERBEROS */
#ifndef WINDOWSNT #ifndef WINDOWSNT
#if !defined (HAVE_H_ERRNO) || !defined (HAVE_CONFIG_H) #ifndef HAVE_H_ERRNO
extern int h_errno; extern int h_errno;
#endif #endif
#endif #endif

2
lib/makefile.w32-in
View file

@ -20,7 +20,7 @@ ALL = gnulib
.PHONY: $(ALL) .PHONY: $(ALL)
LOCAL_FLAGS = -DHAVE_CONFIG_H=1 -I. -I../nt/inc -I../src LOCAL_FLAGS = -I. -I../nt/inc -I../src
LIBS = LIBS =
GNULIBOBJS = $(BLD)/dtoastr.$(O) \ GNULIBOBJS = $(BLD)/dtoastr.$(O) \

7
lwlib/ChangeLog
View file

@ -1,3 +1,10 @@
2012-06-26 Paul Eggert <eggert@cs.ucla.edu>
Clean out last vestiges of the old HAVE_CONFIG_H stuff.
* Makefile.in (ALL_CFLAGS): Remove -DHAVE_CONFIG_H.
* lwlib-Xaw.c, lwlib-Xlw.c, lwlib-Xm.c, lwlib-utils.c, lwlib.c:
* xlwmenu.c: Include <config.h> unconditionally.
2012-06-25 Dmitry Antipov <dmantipov@yandex.ru> 2012-06-25 Dmitry Antipov <dmantipov@yandex.ru>
* lwlib.c (my_strcasecmp): Rename to lwlib_strcasecmp, which * lwlib.c (my_strcasecmp): Rename to lwlib_strcasecmp, which

2
lwlib/Makefile.in
View file

@ -55,7 +55,7 @@ OBJS = lwlib.o $(TOOLKIT_OBJS) lwlib-utils.o
ALL_CFLAGS= $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \ ALL_CFLAGS= $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \
$(C_SWITCH_MACHINE) \ $(C_SWITCH_MACHINE) \
$(WARN_CFLAGS) $(WERROR_CFLAGS) $(PROFILING_CFLAGS) $(CFLAGS) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) $(PROFILING_CFLAGS) $(CFLAGS) \
-DHAVE_CONFIG_H -Demacs -I../src \ -Demacs -I../src \
-I$(srcdir) -I$(srcdir)/../src -I../lib -I$(srcdir)/../lib -I$(srcdir) -I$(srcdir)/../src -I../lib -I$(srcdir)/../lib
.c.o: .c.o:

2
lwlib/lwlib-Xaw.c
View file

@ -20,9 +20,7 @@ along with GNU Emacs; see the file COPYING. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */ Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif
#include <stdio.h> #include <stdio.h>
#include <setjmp.h> #include <setjmp.h>

2
lwlib/lwlib-Xlw.c
View file

@ -20,9 +20,7 @@ along with GNU Emacs; see the file COPYING. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */ Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif
#include <setjmp.h> #include <setjmp.h>
#include <lisp.h> #include <lisp.h>

2
lwlib/lwlib-Xm.c
View file

@ -20,9 +20,7 @@ along with GNU Emacs; see the file COPYING. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */ Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif
#include <unistd.h> #include <unistd.h>
#include <stdio.h> #include <stdio.h>

2
lwlib/lwlib-utils.c
View file

@ -20,9 +20,7 @@ along with GNU Emacs; see the file COPYING. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */ Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif
#include <setjmp.h> #include <setjmp.h>
#include <lisp.h> #include <lisp.h>

2
lwlib/lwlib.c
View file

@ -20,9 +20,7 @@ along with GNU Emacs; see the file COPYING. If not, write to
the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
Boston, MA 02110-1301, USA. */ Boston, MA 02110-1301, USA. */
#ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif
#include <setjmp.h> #include <setjmp.h>
#include <lisp.h> #include <lisp.h>

2
lwlib/xlwmenu.c
View file

@ -22,9 +22,7 @@ Boston, MA 02110-1301, USA. */
/* Created by devin@lucid.com */ /* Created by devin@lucid.com */
#ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif
#include <setjmp.h> #include <setjmp.h>
#include <lisp.h> #include <lisp.h>

5
msdos/ChangeLog
View file

@ -1,3 +1,8 @@
2012-06-26 Paul Eggert <eggert@cs.ucla.edu>
Clean out last vestiges of the old HAVE_CONFIG_H stuff.
* sedlibmk.inp (DEFS): Don't add -DHAVE_CONFIG_H.
2012-06-11 Glenn Morris <rgm@gnu.org> 2012-06-11 Glenn Morris <rgm@gnu.org>
* sed2v2.inp (SYSTEM_TYPE): Set it. * sed2v2.inp (SYSTEM_TYPE): Set it.

2
msdos/sedlibmk.inp
View file

@ -136,7 +136,7 @@ am__cd = cd
/^GNULIB_WARN_CFLAGS *=/s/@GNULIB_WARN_CFLAGS@// /^GNULIB_WARN_CFLAGS *=/s/@GNULIB_WARN_CFLAGS@//
/^WARN_CFLAGS *=/s/@WARN_CFLAGS@// /^WARN_CFLAGS *=/s/@WARN_CFLAGS@//
/^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@// /^WERROR_CFLAGS *=/s/@WERROR_CFLAGS@//
/^DEFS *=/s/@[^@\n]*@/-DHAVE_CONFIG_H/ /^DEFS *=/s/@[^@\n]*@//
/^DEPDIR *=/s/@[^@\n]*@/deps/ /^DEPDIR *=/s/@[^@\n]*@/deps/
/^DEPFLAGS *=/s/@[^@\n]*@/-MMD -MF ${DEPDIR}\/$*.d/ /^DEPFLAGS *=/s/@[^@\n]*@/-MMD -MF ${DEPDIR}\/$*.d/
/^ECHO_N *=/s/@[^@\n]*@/-n/ /^ECHO_N *=/s/@[^@\n]*@/-n/

7
src/ChangeLog
View file

@ -1,3 +1,10 @@
2012-06-26 Paul Eggert <eggert@cs.ucla.edu>
Clean out last vestiges of the old HAVE_CONFIG_H stuff.
* Makefile.in (ALL_CFLAGS):
* makefile.w32-in (LOCAL_FLAGS): Remove -DHAVE_CONFIG_H.
* gmalloc.c, regex.c: Include <config.h> unconditionally.
2012-06-25 Dmitry Antipov <dmantipov@yandex.ru> 2012-06-25 Dmitry Antipov <dmantipov@yandex.ru>
* dispextern.h (xstrcasecmp): Define to library function * dispextern.h (xstrcasecmp): Define to library function

5
src/Makefile.in
View file

@ -303,11 +303,8 @@ MKDEPDIR=@MKDEPDIR@
## -Demacs is needed to make some files produce the correct version ## -Demacs is needed to make some files produce the correct version
## for use in Emacs. ## for use in Emacs.
## ##
## -DHAVE_CONFIG_H is needed for some other files to take advantage of
## the information in `config.h'.
##
## FIXME? MYCPPFLAGS only referenced in etc/DEBUG. ## FIXME? MYCPPFLAGS only referenced in etc/DEBUG.
ALL_CFLAGS=-Demacs -DHAVE_CONFIG_H $(MYCPPFLAGS) -I. -I$(srcdir) \ ALL_CFLAGS=-Demacs $(MYCPPFLAGS) -I. -I$(srcdir) \
-I$(lib) -I$(srcdir)/../lib \ -I$(lib) -I$(srcdir)/../lib \
$(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \ $(C_SWITCH_MACHINE) $(C_SWITCH_SYSTEM) $(C_SWITCH_X_SITE) \
$(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \ $(GNUSTEP_CFLAGS) $(CFLAGS_SOUND) $(RSVG_CFLAGS) $(IMAGEMAGICK_CFLAGS) \

2
src/gmalloc.c
View file

@ -21,9 +21,7 @@ Fifth Floor, Boston, MA 02110-1301, USA.
The author may be reached (Email) at the address mike@ai.mit.edu, The author may be reached (Email) at the address mike@ai.mit.edu,
or (US mail) as Mike Haertel c/o Free Software Foundation. */ or (US mail) as Mike Haertel c/o Free Software Foundation. */
#ifdef HAVE_CONFIG_H
#include <config.h> #include <config.h>
#endif
#ifdef HAVE_PTHREAD #ifdef HAVE_PTHREAD
#define USE_PTHREAD #define USE_PTHREAD

6
src/makefile.w32-in
View file

@ -27,11 +27,7 @@ EMACSLOADPATH=$(CURDIR)/../lisp
# Size in MBs of the static heap in temacs.exe. # Size in MBs of the static heap in temacs.exe.
HEAPSIZE = 27 HEAPSIZE = 27
# LOCAL_FLAGS = -Demacs=1 -I../lib -I../nt/inc -DHAVE_NTGUI=1 $(EMACS_EXTRA_C_FLAGS)
# HAVE_CONFIG_H is required by some generic gnu sources stuck into
# the emacs source tree.
#
LOCAL_FLAGS = -Demacs=1 -DHAVE_CONFIG_H -I../lib -I../nt/inc -DHAVE_NTGUI=1 $(EMACS_EXTRA_C_FLAGS)
SRC = . SRC = .
EMACS = $(BLD)/emacs.exe EMACS = $(BLD)/emacs.exe

4
src/regex.c
View file

@ -46,9 +46,7 @@
# endif # endif
#endif #endif
#ifdef HAVE_CONFIG_H #include <config.h>
# include <config.h>
#endif
#include <stddef.h> #include <stddef.h>