diff --git a/cde/.gitignore b/cde/.gitignore index 0adc5ca49..2f0820f14 100644 --- a/cde/.gitignore +++ b/cde/.gitignore @@ -2291,8 +2291,8 @@ ylwrap .deps .objs .dirstamp -autotools_config.h -autotools_config.h.in +cde_config.h +cde_config.h.in lib/DtTerm/util/lineToData lib/csa/y.tab.c lib/csa/y.tab.h diff --git a/cde/configure.ac b/cde/configure.ac index 518247a00..a742edecd 100644 --- a/cde/configure.ac +++ b/cde/configure.ac @@ -5,7 +5,7 @@ AC_INIT([Common Desktop Environment], [https://sourceforge.net/projects/cdesktopenv], [cde], [https://sourceforge.net/projects/cdesktopenv]) -AC_CONFIG_HEADERS([include/autotools_config.h]) +AC_CONFIG_HEADERS([include/cde_config.h]) AC_CONFIG_MACRO_DIRS([m4]) AM_INIT_AUTOMAKE([foreign subdir-objects no-define]) diff --git a/cde/lib/DtHelp/Helpos.c b/cde/lib/DtHelp/Helpos.c index e6257cbb7..3ff927643 100644 --- a/cde/lib/DtHelp/Helpos.c +++ b/cde/lib/DtHelp/Helpos.c @@ -48,7 +48,7 @@ #include #if defined(HAVE_CONFIG_H) -# include +# include #endif #if defined(HAVE_LOCALE_H) # include diff --git a/cde/lib/DtHelp/StringFuncs.c b/cde/lib/DtHelp/StringFuncs.c index b81748276..a70bfe6e7 100644 --- a/cde/lib/DtHelp/StringFuncs.c +++ b/cde/lib/DtHelp/StringFuncs.c @@ -43,7 +43,7 @@ **************************************************************************** ************************************<+>*************************************/ #ifdef HAVE_CONFIG_H -#include +#include #endif /* * system includes diff --git a/cde/lib/DtHelp/il/ilint.h b/cde/lib/DtHelp/il/ilint.h index 376de0fda..2411089e8 100644 --- a/cde/lib/DtHelp/il/ilint.h +++ b/cde/lib/DtHelp/il/ilint.h @@ -45,7 +45,7 @@ /* use autotools detection to determine endianess */ #if defined(HAVE_CONFIG_H) -# include +# include #endif #ifndef WORDS_BIGENDIAN diff --git a/cde/lib/DtSearch/dtsrswab.c b/cde/lib/DtSearch/dtsrswab.c index 3cd6f37dd..c5bf83199 100644 --- a/cde/lib/DtSearch/dtsrswab.c +++ b/cde/lib/DtSearch/dtsrswab.c @@ -52,7 +52,7 @@ * * $Log$ */ -#include +#include #include
/********************************/ diff --git a/cde/lib/csa/cmxdr.c b/cde/lib/csa/cmxdr.c index 18aa6126f..07ebc553d 100644 --- a/cde/lib/csa/cmxdr.c +++ b/cde/lib/csa/cmxdr.c @@ -33,7 +33,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include #include "cm.h" diff --git a/cde/lib/tt/lib/util/tt_xdr_utils.C b/cde/lib/tt/lib/util/tt_xdr_utils.C index b256e04c4..26cd4f8c6 100644 --- a/cde/lib/tt/lib/util/tt_xdr_utils.C +++ b/cde/lib/tt/lib/util/tt_xdr_utils.C @@ -35,7 +35,7 @@ #include #include #include -#include +#include #include "tt_options.h" #if defined(__OpenBSD__) diff --git a/cde/programs/dsdm/dsdm.c b/cde/programs/dsdm/dsdm.c index d795c4efd..77880ba51 100644 --- a/cde/programs/dsdm/dsdm.c +++ b/cde/programs/dsdm/dsdm.c @@ -65,7 +65,7 @@ #include #include #if defined(HAVE_CONFIG_H) -# include +# include #endif #if defined(HAVE_STRING_H) # include diff --git a/cde/programs/dtcm/dtcm/RFCMIME.c b/cde/programs/dtcm/dtcm/RFCMIME.c index 88c6b2ae9..951d817aa 100644 --- a/cde/programs/dtcm/dtcm/RFCMIME.c +++ b/cde/programs/dtcm/dtcm/RFCMIME.c @@ -46,7 +46,7 @@ static char sccsid[] = "$TOG: RFCMIME.c /main/11 1999/06/30 12:08:55 mgreess $"; */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include diff --git a/cde/programs/dtcm/dtcm/cm_i18n.c b/cde/programs/dtcm/dtcm/cm_i18n.c index e3ccec08f..ddd32e059 100644 --- a/cde/programs/dtcm/dtcm/cm_i18n.c +++ b/cde/programs/dtcm/dtcm/cm_i18n.c @@ -51,7 +51,7 @@ #endif #ifdef HAVE_CONFIG_H -#include +#include #endif #include diff --git a/cde/programs/dtcm/libDtCmP/getdate.y b/cde/programs/dtcm/libDtCmP/getdate.y index b199fdeeb..c31360a6d 100644 --- a/cde/programs/dtcm/libDtCmP/getdate.y +++ b/cde/programs/dtcm/libDtCmP/getdate.y @@ -41,7 +41,7 @@ static char sccsid[] = "@(#)getdate.y 1.10 94/11/07 Copyr 1993 Sun Microsystems /* @(#)getdate.y 2.6 4/20/84 */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include #include diff --git a/cde/programs/dtcm/libDtCmP/timeops.c b/cde/programs/dtcm/libDtCmP/timeops.c index dcb016df4..ffdb8d338 100644 --- a/cde/programs/dtcm/libDtCmP/timeops.c +++ b/cde/programs/dtcm/libDtCmP/timeops.c @@ -52,7 +52,7 @@ static char sccsid[] = "@(#)timeops.c 1.13 95/05/02 Copyr 1991 Sun Microsystems, #endif #ifdef HAVE_CONFIG_H -#include +#include #endif #include #include diff --git a/cde/programs/dtcm/server/rtable4.c b/cde/programs/dtcm/server/rtable4.c index 0d0d42b56..f7f34f44e 100644 --- a/cde/programs/dtcm/server/rtable4.c +++ b/cde/programs/dtcm/server/rtable4.c @@ -33,7 +33,7 @@ */ #ifdef HAVE_CONFIG_H -#include +#include #endif #include #include diff --git a/cde/programs/dthelp/dthelpprint/PrintTopics.c b/cde/programs/dthelp/dthelpprint/PrintTopics.c index d76078a70..9f1c5869d 100644 --- a/cde/programs/dthelp/dthelpprint/PrintTopics.c +++ b/cde/programs/dthelp/dthelpprint/PrintTopics.c @@ -43,7 +43,7 @@ $COPYRIGHT$: #endif #ifdef HAVE_CONFIG_H -#include +#include #endif #include diff --git a/cde/programs/dtinfo/DtMmdb/utility/config.h b/cde/programs/dtinfo/DtMmdb/utility/config.h index 1efb80e31..aa2e1bb10 100644 --- a/cde/programs/dtinfo/DtMmdb/utility/config.h +++ b/cde/programs/dtinfo/DtMmdb/utility/config.h @@ -25,7 +25,7 @@ #ifndef _config_h #define _config_h 1 -#include // determine endianess +#include // determine endianess #if defined(WORDS_BIGENDIAN) # define OLIAS_BIG_ENDIAN diff --git a/cde/programs/dtsr/dtsrindex.c b/cde/programs/dtsr/dtsrindex.c index b35361310..7d0a63814 100644 --- a/cde/programs/dtsr/dtsrindex.c +++ b/cde/programs/dtsr/dtsrindex.c @@ -111,7 +111,7 @@ * 2.1.5b cborodin bug. Segfault due to overflowing bitvector * after many deletions and no mrclean. */ -#include +#include #include
#include #include diff --git a/cde/programs/dtwm/WmFunction.c b/cde/programs/dtwm/WmFunction.c index 3f52e2c31..869b9a2fa 100644 --- a/cde/programs/dtwm/WmFunction.c +++ b/cde/programs/dtwm/WmFunction.c @@ -82,7 +82,7 @@ extern XmMenuState _XmGetMenuState(); #if defined(HAVE_CONFIG_H) -#include +#include #endif #if defined(HAVE_SYS_TYPES_H)