From: Maurice L. <mj...@ga...> - 2003-01-27 23:30:41
|
Rafael Laboissiere writes: > 2) The file include/plDevs.h is totally useless since all of its definitions > are already duplicated in include/plConfig.h. I would recommend to > delete taht file from the repository (or actually include/plDevs.h.in) > and replace all inclusions of plDevs.h by plConfig.h. The files > concerned by this change are drivers/*.c, > bindings/tk/{plserver.h,tcpip.c}, include/plcore.h, and src/plfreetype.c. > Also, remove include/plDevs.h from the call to AC_CONFIG_HEADERS in > configure.ac and from the list pkginclude_HEADERS in include/Makefile.am. I would prefer to see the device stuff vanish from plConfig.h instead. Certainly this new, "powerful" configuration system can handle more than one generated header file! BTW I just ran into another irritating side effect of the current configuration system. Running a recursive search from the top level shows up HAVE_CONFIG_H defined throughout: ./bindings/c++/Makefile:DEFS = -DHAVE_CONFIG_H ./bindings/f77/Makefile:DEFS = -DHAVE_CONFIG_H ./bindings/java/Makefile:DEFS = -DHAVE_CONFIG_H ... Well the problem occurs when including headers from some gnu tools such as readline. In /usr/include/readline/tilde.h -- #if defined (HAVE_CONFIG_H) # include <config.h> #endif Whoops. I guess when this happens we'll just have to #undef HAVE_CONFIG_H but that seems pretty lame.. is there any way to turn off this define? I grepped for all the packages on my RH 7.3 system that do this and came up with the following list: /usr/include/kde/ksslcertificate.h:#ifdef HAVE_CONFIG_H /usr/include/kde/ksslpkcs12.h:#ifdef HAVE_CONFIG_H /usr/include/kde/ksslutils.h:#ifdef HAVE_CONFIG_H /usr/include/kde/mpeglib/decoder/cddaPlugin.h:#ifdef HAVE_CONFIG_H /usr/include/kde/mpeglib/decoder/vorbisPlugin.h:#ifdef HAVE_CONFIG_H /usr/include/kde/mpeglib/frame/audioFrame.h:#ifdef HAVE_CONFIG_H /usr/include/kde/mpeglib/frame/rawFrame.h:#ifdef HAVE_CONFIG_H /usr/include/kde/mpeglib/input/cddaInputStream.h:#ifdef HAVE_CONFIG_H /usr/include/kde/mpeglib/oggvorbis/vorbisDecoder.h:#ifdef HAVE_CONFIG_H /usr/include/kde/mpeglib/oggvorbis/oggFrame.h:#ifdef HAVE_CONFIG_H /usr/include/kde/mpeglib/oggvorbis/ovFramer.h:#ifdef HAVE_CONFIG_H /usr/include/kde/mpeglib/oggvorbis/vorbisInfo.h:#ifdef HAVE_CONFIG_H /usr/include/kde/mpeglib/util/abstract/abs_thread.h:#ifdef HAVE_CONFIG_H /usr/include/kde/ksslpemcallback.h:#ifdef HAVE_CONFIG_H /usr/include/kde/ksslpkcs7.h:#ifdef HAVE_CONFIG_H /usr/include/gkrellm/gkrellm.h:#ifdef HAVE_CONFIG_H /usr/include/readline/chardefs.h:#if defined (HAVE_CONFIG_H) /usr/include/readline/chardefs.h:#endif /* !HAVE_CONFIG_H */ /usr/include/readline/tilde.h:#if defined (HAVE_CONFIG_H) -- Maurice LeBrun mj...@ga... Research Organization for Information Science and Technology of Japan (RIST) |