From 251dd4034f3a3f11a190c06d7b69670dc87d219d Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Tue, 16 Apr 2002 06:25:00 +0000 Subject: [PATCH] get rid of the STDC_HEADERS check... this failed on IRIX with MIPSpro, use checks for individual headers instead --- TODO | 2 + autom4te.cache/output.0 | 4 +- autom4te.cache/traces.0 | 194 ++++++++++++++++++++-------------------- configure | 4 +- configure.in | 3 +- src/BaseDisplay.cc | 7 +- src/Basemenu.cc | 7 +- src/Image.cc | 7 +- src/Rootmenu.cc | 7 +- src/Screen.cc | 10 ++- src/Toolbar.cc | 4 +- src/Window.cc | 4 +- src/Windowmenu.cc | 4 +- src/Workspace.cc | 4 +- src/i18n.cc | 10 ++- src/main.cc | 7 +- src/openbox.cc | 7 +- 17 files changed, 162 insertions(+), 123 deletions(-) diff --git a/TODO b/TODO index 90deacec..c6829be5 100644 --- a/TODO +++ b/TODO @@ -1,5 +1,7 @@ Openbox TODO list: +* make Escape key cancel moving/resizing a window + * add asserts all throughout the code to catch bugs. * new configuration class which handles the X db, with better functionality. diff --git a/autom4te.cache/output.0 b/autom4te.cache/output.0 index 1e51cf4e..fa6bba89 100644 --- a/autom4te.cache/output.0 +++ b/autom4te.cache/output.0 @@ -3125,7 +3125,9 @@ done -for ac_header in ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdio.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h + + +for ac_header in ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdio.h string.h stdlib.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then diff --git a/autom4te.cache/traces.0 b/autom4te.cache/traces.0 index a729f18c..3a10c9db 100644 --- a/autom4te.cache/traces.0 +++ b/autom4te.cache/traces.0 @@ -95,83 +95,87 @@ m4trace:configure.in:16: -1- AC_SUBST([INSTALL_PROGRAM]) m4trace:configure.in:16: -1- AC_SUBST([INSTALL_SCRIPT]) m4trace:configure.in:16: -1- AC_SUBST([INSTALL_DATA]) m4trace:configure.in:18: -1- AC_SUBST([regex_cmd]) -m4trace:configure.in:24: -1- AC_HEADER_STDC -m4trace:configure.in:24: -1- AC_PROG_CPP -m4trace:configure.in:24: -1- AC_SUBST([CPP]) -m4trace:configure.in:24: -1- AC_SUBST([CPPFLAGS]) -m4trace:configure.in:24: -1- AC_SUBST([CPP]) -m4trace:configure.in:24: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS]) -m4trace:configure.in:24: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS]) -m4trace:configure.in:25: -1- AC_CHECK_HEADERS([ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdio.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_CTYPE_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AC_CHECK_HEADERS([ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdio.h string.h stdlib.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h]) +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_CTYPE_H], [/* Define to 1 if you have the header file. */ #undef HAVE_CTYPE_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_DIRENT_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_DIRENT_H], [/* Define to 1 if you have the header file. */ #undef HAVE_DIRENT_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_FCNTL_H], [/* Define to 1 if you have the header file. */ #undef HAVE_FCNTL_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_LIBGEN_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_LIBGEN_H], [/* Define to 1 if you have the header file. */ #undef HAVE_LIBGEN_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_LOCALE_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_LOCALE_H], [/* Define to 1 if you have the header file. */ #undef HAVE_LOCALE_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_NL_TYPES_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_NL_TYPES_H], [/* Define to 1 if you have the header file. */ #undef HAVE_NL_TYPES_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_PROCESS_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_PROCESS_H], [/* Define to 1 if you have the header file. */ #undef HAVE_PROCESS_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_SIGNAL_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_SIGNAL_H], [/* Define to 1 if you have the header file. */ #undef HAVE_SIGNAL_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_STDARG_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_STDARG_H], [/* Define to 1 if you have the header file. */ #undef HAVE_STDARG_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_STDIO_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_STDIO_H], [/* Define to 1 if you have the header file. */ #undef HAVE_STDIO_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_TIME_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H]) +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H]) +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_TIME_H], [/* Define to 1 if you have the header file. */ #undef HAVE_TIME_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_SYS_PARAM_H], [/* Define to 1 if you have the header file. */ #undef HAVE_SYS_PARAM_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_SYS_SELECT_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_SYS_SELECT_H], [/* Define to 1 if you have the header file. */ #undef HAVE_SYS_SELECT_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_SYS_SIGNAL_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_SYS_SIGNAL_H], [/* Define to 1 if you have the header file. */ #undef HAVE_SYS_SIGNAL_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_SYS_TIME_H], [/* Define to 1 if you have the header file. */ #undef HAVE_SYS_TIME_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_SYS_WAIT_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_SYS_WAIT_H], [/* Define to 1 if you have the header file. */ #undef HAVE_SYS_WAIT_H]) -m4trace:configure.in:25: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ +m4trace:configure.in:24: -1- AC_HEADER_STDC +m4trace:configure.in:24: -1- AC_PROG_CPP +m4trace:configure.in:24: -1- AC_SUBST([CPP]) +m4trace:configure.in:24: -1- AC_SUBST([CPPFLAGS]) +m4trace:configure.in:24: -1- AC_SUBST([CPP]) +m4trace:configure.in:24: -1- AC_DEFINE_TRACE_LITERAL([STDC_HEADERS]) +m4trace:configure.in:24: -1- AH_OUTPUT([STDC_HEADERS], [/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS]) +m4trace:configure.in:24: -1- AC_CHECK_HEADERS([sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \ inttypes.h stdint.h unistd.h], [], [], [$ac_includes_default]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_SYS_TYPES_H], [/* Define to 1 if you have the header file. */ #undef HAVE_SYS_TYPES_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_SYS_STAT_H], [/* Define to 1 if you have the header file. */ #undef HAVE_SYS_STAT_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_STDLIB_H], [/* Define to 1 if you have the header file. */ #undef HAVE_STDLIB_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_STRING_H], [/* Define to 1 if you have the header file. */ #undef HAVE_STRING_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_MEMORY_H], [/* Define to 1 if you have the header file. */ #undef HAVE_MEMORY_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_STRINGS_H], [/* Define to 1 if you have the header file. */ #undef HAVE_STRINGS_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_INTTYPES_H], [/* Define to 1 if you have the header file. */ #undef HAVE_INTTYPES_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_STDINT_H], [/* Define to 1 if you have the header file. */ #undef HAVE_STDINT_H]) -m4trace:configure.in:25: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the header file. */ +m4trace:configure.in:24: -1- AH_OUTPUT([HAVE_UNISTD_H], [/* Define to 1 if you have the header file. */ #undef HAVE_UNISTD_H]) -m4trace:configure.in:26: -1- AC_HEADER_TIME -m4trace:configure.in:26: -1- AC_DEFINE_TRACE_LITERAL([TIME_WITH_SYS_TIME]) -m4trace:configure.in:26: -1- AH_OUTPUT([TIME_WITH_SYS_TIME], [/* Define to 1 if you can safely include both and . */ +m4trace:configure.in:25: -1- AC_HEADER_TIME +m4trace:configure.in:25: -1- AC_DEFINE_TRACE_LITERAL([TIME_WITH_SYS_TIME]) +m4trace:configure.in:25: -1- AH_OUTPUT([TIME_WITH_SYS_TIME], [/* Define to 1 if you can safely include both and . */ #undef TIME_WITH_SYS_TIME]) -m4trace:configure.in:30: -3- AC_DEFINE_TRACE_LITERAL([HAVE_BASENAME]) -m4trace:configure.in:30: -2- AC_CHECK_LIB([gen], [basename], [cat >>confdefs.h <<\_ACEOF +m4trace:configure.in:29: -3- AC_DEFINE_TRACE_LITERAL([HAVE_BASENAME]) +m4trace:configure.in:29: -2- AC_CHECK_LIB([gen], [basename], [cat >>confdefs.h <<\_ACEOF @%:@define HAVE_BASENAME 1 _ACEOF LIBS="$LIBS -lgen"]) -m4trace:configure.in:30: -1- AC_CHECK_FUNCS([basename], [], [echo "$as_me:$LINENO: checking for basename in -lgen" >&5 +m4trace:configure.in:29: -1- AC_CHECK_FUNCS([basename], [], [echo "$as_me:$LINENO: checking for basename in -lgen" >&5 echo $ECHO_N "checking for basename in -lgen... $ECHO_C" >&6 if test "${ac_cv_lib_gen_basename+set}" = set; then echo $ECHO_N "(cached) $ECHO_C" >&6 @@ -233,52 +237,52 @@ _ACEOF LIBS="$LIBS -lgen" fi ]) -m4trace:configure.in:30: -1- AH_OUTPUT([HAVE_BASENAME], [/* Define to 1 if you have the \`basename' function. */ +m4trace:configure.in:29: -1- AH_OUTPUT([HAVE_BASENAME], [/* Define to 1 if you have the \`basename' function. */ #undef HAVE_BASENAME]) -m4trace:configure.in:31: -1- AC_CHECK_FUNCS([getpid setlocale sigaction strftime strcasestr snprintf vsnprintf catopen catgets catclose]) -m4trace:configure.in:31: -1- AH_OUTPUT([HAVE_GETPID], [/* Define to 1 if you have the \`getpid' function. */ +m4trace:configure.in:30: -1- AC_CHECK_FUNCS([getpid setlocale sigaction strftime strcasestr snprintf vsnprintf catopen catgets catclose]) +m4trace:configure.in:30: -1- AH_OUTPUT([HAVE_GETPID], [/* Define to 1 if you have the \`getpid' function. */ #undef HAVE_GETPID]) -m4trace:configure.in:31: -1- AH_OUTPUT([HAVE_SETLOCALE], [/* Define to 1 if you have the \`setlocale' function. */ +m4trace:configure.in:30: -1- AH_OUTPUT([HAVE_SETLOCALE], [/* Define to 1 if you have the \`setlocale' function. */ #undef HAVE_SETLOCALE]) -m4trace:configure.in:31: -1- AH_OUTPUT([HAVE_SIGACTION], [/* Define to 1 if you have the \`sigaction' function. */ +m4trace:configure.in:30: -1- AH_OUTPUT([HAVE_SIGACTION], [/* Define to 1 if you have the \`sigaction' function. */ #undef HAVE_SIGACTION]) -m4trace:configure.in:31: -1- AH_OUTPUT([HAVE_STRFTIME], [/* Define to 1 if you have the \`strftime' function. */ +m4trace:configure.in:30: -1- AH_OUTPUT([HAVE_STRFTIME], [/* Define to 1 if you have the \`strftime' function. */ #undef HAVE_STRFTIME]) -m4trace:configure.in:31: -1- AH_OUTPUT([HAVE_STRCASESTR], [/* Define to 1 if you have the \`strcasestr' function. */ +m4trace:configure.in:30: -1- AH_OUTPUT([HAVE_STRCASESTR], [/* Define to 1 if you have the \`strcasestr' function. */ #undef HAVE_STRCASESTR]) -m4trace:configure.in:31: -1- AH_OUTPUT([HAVE_SNPRINTF], [/* Define to 1 if you have the \`snprintf' function. */ +m4trace:configure.in:30: -1- AH_OUTPUT([HAVE_SNPRINTF], [/* Define to 1 if you have the \`snprintf' function. */ #undef HAVE_SNPRINTF]) -m4trace:configure.in:31: -1- AH_OUTPUT([HAVE_VSNPRINTF], [/* Define to 1 if you have the \`vsnprintf' function. */ +m4trace:configure.in:30: -1- AH_OUTPUT([HAVE_VSNPRINTF], [/* Define to 1 if you have the \`vsnprintf' function. */ #undef HAVE_VSNPRINTF]) -m4trace:configure.in:31: -1- AH_OUTPUT([HAVE_CATOPEN], [/* Define to 1 if you have the \`catopen' function. */ +m4trace:configure.in:30: -1- AH_OUTPUT([HAVE_CATOPEN], [/* Define to 1 if you have the \`catopen' function. */ #undef HAVE_CATOPEN]) -m4trace:configure.in:31: -1- AH_OUTPUT([HAVE_CATGETS], [/* Define to 1 if you have the \`catgets' function. */ +m4trace:configure.in:30: -1- AH_OUTPUT([HAVE_CATGETS], [/* Define to 1 if you have the \`catgets' function. */ #undef HAVE_CATGETS]) -m4trace:configure.in:31: -1- AH_OUTPUT([HAVE_CATCLOSE], [/* Define to 1 if you have the \`catclose' function. */ +m4trace:configure.in:30: -1- AH_OUTPUT([HAVE_CATCLOSE], [/* Define to 1 if you have the \`catclose' function. */ #undef HAVE_CATCLOSE]) -m4trace:configure.in:32: -1- AC_CHECK_LIB([nsl], [t_open], [LIBS="$LIBS -lnsl"]) -m4trace:configure.in:33: -1- AC_CHECK_LIB([socket], [socket], [LIBS="$LIBS -lsocket"]) -m4trace:configure.in:36: -1- AC_PATH_X -m4trace:configure.in:37: -1- AC_DEFINE_TRACE_LITERAL([X_DISPLAY_MISSING]) -m4trace:configure.in:37: -1- AH_OUTPUT([X_DISPLAY_MISSING], [/* Define to 1 if the X Window System is missing or not being used. */ +m4trace:configure.in:31: -1- AC_CHECK_LIB([nsl], [t_open], [LIBS="$LIBS -lnsl"]) +m4trace:configure.in:32: -1- AC_CHECK_LIB([socket], [socket], [LIBS="$LIBS -lsocket"]) +m4trace:configure.in:35: -1- AC_PATH_X +m4trace:configure.in:36: -1- AC_DEFINE_TRACE_LITERAL([X_DISPLAY_MISSING]) +m4trace:configure.in:36: -1- AH_OUTPUT([X_DISPLAY_MISSING], [/* Define to 1 if the X Window System is missing or not being used. */ #undef X_DISPLAY_MISSING]) -m4trace:configure.in:37: -1- AC_CHECK_LIB([dnet], [dnet_ntoa], [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"]) -m4trace:configure.in:37: -1- AC_CHECK_LIB([dnet_stub], [dnet_ntoa], [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"]) -m4trace:configure.in:37: -1- AC_CHECK_LIB([nsl], [gethostbyname], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"]) -m4trace:configure.in:37: -1- AC_CHECK_LIB([bsd], [gethostbyname], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"]) -m4trace:configure.in:37: -1- AC_CHECK_LIB([socket], [connect], [X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"], [], [$X_EXTRA_LIBS]) -m4trace:configure.in:37: -1- AC_CHECK_LIB([posix], [remove], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"]) -m4trace:configure.in:37: -1- AC_CHECK_LIB([ipc], [shmat], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"]) -m4trace:configure.in:37: -1- AC_CHECK_LIB([ICE], [IceConnectionNumber], [X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"], [], [$X_EXTRA_LIBS]) -m4trace:configure.in:37: -1- AC_SUBST([X_CFLAGS]) -m4trace:configure.in:37: -1- AC_SUBST([X_PRE_LIBS]) -m4trace:configure.in:37: -1- AC_SUBST([X_LIBS]) -m4trace:configure.in:37: -1- AC_SUBST([X_EXTRA_LIBS]) -m4trace:configure.in:53: -1- AC_CHECK_LIB([X11], [XOpenDisplay], [LIBS="$LIBS -lX11"], [{ { echo "$as_me:$LINENO: error: Could not find XOpenDisplay in -lX11." >&5 +m4trace:configure.in:36: -1- AC_CHECK_LIB([dnet], [dnet_ntoa], [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet"]) +m4trace:configure.in:36: -1- AC_CHECK_LIB([dnet_stub], [dnet_ntoa], [X_EXTRA_LIBS="$X_EXTRA_LIBS -ldnet_stub"]) +m4trace:configure.in:36: -1- AC_CHECK_LIB([nsl], [gethostbyname], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lnsl"]) +m4trace:configure.in:36: -1- AC_CHECK_LIB([bsd], [gethostbyname], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lbsd"]) +m4trace:configure.in:36: -1- AC_CHECK_LIB([socket], [connect], [X_EXTRA_LIBS="-lsocket $X_EXTRA_LIBS"], [], [$X_EXTRA_LIBS]) +m4trace:configure.in:36: -1- AC_CHECK_LIB([posix], [remove], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lposix"]) +m4trace:configure.in:36: -1- AC_CHECK_LIB([ipc], [shmat], [X_EXTRA_LIBS="$X_EXTRA_LIBS -lipc"]) +m4trace:configure.in:36: -1- AC_CHECK_LIB([ICE], [IceConnectionNumber], [X_PRE_LIBS="$X_PRE_LIBS -lSM -lICE"], [], [$X_EXTRA_LIBS]) +m4trace:configure.in:36: -1- AC_SUBST([X_CFLAGS]) +m4trace:configure.in:36: -1- AC_SUBST([X_PRE_LIBS]) +m4trace:configure.in:36: -1- AC_SUBST([X_LIBS]) +m4trace:configure.in:36: -1- AC_SUBST([X_EXTRA_LIBS]) +m4trace:configure.in:52: -1- AC_CHECK_LIB([X11], [XOpenDisplay], [LIBS="$LIBS -lX11"], [{ { echo "$as_me:$LINENO: error: Could not find XOpenDisplay in -lX11." >&5 echo "$as_me: error: Could not find XOpenDisplay in -lX11." >&2;} { (exit 1); exit 1; }; } ]) -m4trace:configure.in:79: -1- AC_CHECK_LIB([Xext], [XShapeCombineShape], [echo "$as_me:$LINENO: checking for X11/extensions/shape.h" >&5 +m4trace:configure.in:78: -1- AC_CHECK_LIB([Xext], [XShapeCombineShape], [echo "$as_me:$LINENO: checking for X11/extensions/shape.h" >&5 echo $ECHO_N "checking for X11/extensions/shape.h... $ECHO_C" >&6 cat >conftest.$ac_ext <<_ACEOF #line $LINENO "configure" @@ -325,27 +329,27 @@ echo "${ECHO_T}no" >&6 fi rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext ]) -m4trace:configure.in:83: -1- AC_SUBST([SHAPE]) -m4trace:configure.in:101: -1- AC_SUBST([SLIT]) -m4trace:configure.in:118: -1- AC_SUBST([NEWWMSPEC]) -m4trace:configure.in:135: -1- AC_SUBST([INTERLACE]) -m4trace:configure.in:151: -1- AC_SUBST([ORDEREDPSEUDO]) -m4trace:configure.in:167: -1- AC_SUBST([CLOBBER]) -m4trace:configure.in:182: -1- AC_SUBST([DEBUG]) -m4trace:configure.in:198: -1- AC_SUBST([NLS]) -m4trace:configure.in:200: -1- AC_CHECK_LIB([xpg4], [setlocale], [LIBS="$LIBS -lxpg4"]) -m4trace:configure.in:202: -1- AC_SUBST([gencat_cmd]) -m4trace:configure.in:223: -1- AC_SUBST([TIMEDCACHE]) -m4trace:configure.in:226: -1- AC_TYPE_SIGNAL -m4trace:configure.in:226: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE]) -m4trace:configure.in:226: -1- AH_OUTPUT([RETSIGTYPE], [/* Define as the return type of signal handlers (\`int' or \`void'). */ +m4trace:configure.in:82: -1- AC_SUBST([SHAPE]) +m4trace:configure.in:100: -1- AC_SUBST([SLIT]) +m4trace:configure.in:117: -1- AC_SUBST([NEWWMSPEC]) +m4trace:configure.in:134: -1- AC_SUBST([INTERLACE]) +m4trace:configure.in:150: -1- AC_SUBST([ORDEREDPSEUDO]) +m4trace:configure.in:166: -1- AC_SUBST([CLOBBER]) +m4trace:configure.in:181: -1- AC_SUBST([DEBUG]) +m4trace:configure.in:197: -1- AC_SUBST([NLS]) +m4trace:configure.in:199: -1- AC_CHECK_LIB([xpg4], [setlocale], [LIBS="$LIBS -lxpg4"]) +m4trace:configure.in:201: -1- AC_SUBST([gencat_cmd]) +m4trace:configure.in:222: -1- AC_SUBST([TIMEDCACHE]) +m4trace:configure.in:225: -1- AC_TYPE_SIGNAL +m4trace:configure.in:225: -1- AC_DEFINE_TRACE_LITERAL([RETSIGTYPE]) +m4trace:configure.in:225: -1- AH_OUTPUT([RETSIGTYPE], [/* Define as the return type of signal handlers (\`int' or \`void'). */ #undef RETSIGTYPE]) -m4trace:configure.in:229: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) -m4trace:configure.in:229: -1- AC_SUBST([MAINTAINER_MODE_TRUE]) -m4trace:configure.in:229: -1- AC_SUBST([MAINTAINER_MODE_FALSE]) -m4trace:configure.in:229: -1- AC_SUBST([MAINT]) -m4trace:configure.in:242: -1- AC_CONFIG_HEADERS([config.h]) -m4trace:configure.in:268: -1- AC_CONFIG_FILES([Makefile +m4trace:configure.in:228: -1- AM_CONDITIONAL([MAINTAINER_MODE], [test $USE_MAINTAINER_MODE = yes]) +m4trace:configure.in:228: -1- AC_SUBST([MAINTAINER_MODE_TRUE]) +m4trace:configure.in:228: -1- AC_SUBST([MAINTAINER_MODE_FALSE]) +m4trace:configure.in:228: -1- AC_SUBST([MAINT]) +m4trace:configure.in:241: -1- AC_CONFIG_HEADERS([config.h]) +m4trace:configure.in:267: -1- AC_CONFIG_FILES([Makefile src/Makefile util/Makefile data/Makefile diff --git a/configure b/configure index 868bf57f..4a2aa002 100644 --- a/configure +++ b/configure @@ -3125,7 +3125,9 @@ done -for ac_header in ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdio.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h + + +for ac_header in ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdio.h string.h stdlib.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` if eval "test \"\${$as_ac_Header+set}\" = set"; then diff --git a/configure.in b/configure.in index 0b3bf72b..05ae5101 100644 --- a/configure.in +++ b/configure.in @@ -21,8 +21,7 @@ if test x$regex_cmd = "x"; then fi dnl Check for system header files -AC_HEADER_STDC -AC_CHECK_HEADERS(ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdio.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h) +AC_CHECK_HEADERS(ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdio.h string.h stdlib.h time.h unistd.h sys/param.h sys/select.h sys/signal.h sys/stat.h sys/time.h sys/types.h sys/wait.h) AC_HEADER_TIME dnl Check for existance of basename(), setlocale() and strftime() diff --git a/src/BaseDisplay.cc b/src/BaseDisplay.cc index 41097628..b9143b77 100644 --- a/src/BaseDisplay.cc +++ b/src/BaseDisplay.cc @@ -48,10 +48,13 @@ # include #endif // HAVE_STDIO_H -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include +#endif // HAVE_STDLIB_H + +#ifdef HAVE_STRING_H # include -#endif // STDC_HEADERS +#endif // HAVE_STRING_H #ifdef HAVE_UNISTD_H # include diff --git a/src/Basemenu.cc b/src/Basemenu.cc index b53dc854..c5ecd3bb 100644 --- a/src/Basemenu.cc +++ b/src/Basemenu.cc @@ -34,10 +34,13 @@ # include #endif // HAVE_STDIO_H -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include +#endif // HAVE_STDLIB_H + +#ifdef HAVE_STRING_H # include -#endif // STDC_HEADERS +#endif // HAVE_STRING_H #include using namespace std; diff --git a/src/Image.cc b/src/Image.cc index b9335902..3a4c14cf 100644 --- a/src/Image.cc +++ b/src/Image.cc @@ -50,10 +50,13 @@ typedef unsigned int u_int32_t; # endif #endif -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include +#endif // HAVE_STDLIB_H + +#ifdef HAVE_STRING_H # include -#endif // STDC_HEADERS +#endif // HAVE_STRING_H #ifdef HAVE_STDIO_H # include diff --git a/src/Rootmenu.cc b/src/Rootmenu.cc index b8c8f2dd..59bfb1cf 100644 --- a/src/Rootmenu.cc +++ b/src/Rootmenu.cc @@ -38,10 +38,13 @@ # include #endif // HAVE_STDIO_H -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include +#endif // HAVE_STDLIB_H + +#ifdef HAVE_STRING_H # include -#endif // STDC_HEADERS +#endif // HAVE_STRING_H #ifdef HAVE_SYS_PARAM_H # include diff --git a/src/Screen.cc b/src/Screen.cc index 7438a9d8..4d9c66fa 100644 --- a/src/Screen.cc +++ b/src/Screen.cc @@ -50,11 +50,17 @@ #include "Workspace.h" #include "Workspacemenu.h" -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include +#endif // HAVE_STDLIB_H + +#ifdef HAVE_STRING_H # include +#endif // HAVE_STRING_H + +#ifdef HAVE_SYS_TYPES_H # include -#endif // STDC_HEADERS +#endif // HAVE_SYS_TYPES_H #ifdef HAVE_CTYPE_H # include diff --git a/src/Toolbar.cc b/src/Toolbar.cc index 10a31d70..3d3f867f 100644 --- a/src/Toolbar.cc +++ b/src/Toolbar.cc @@ -44,9 +44,9 @@ #include #include -#ifdef STDC_HEADERS +#ifdef HAVE_STRING_H # include -#endif // STDC_HEADERS +#endif // HAVE_STRING_H #ifdef HAVE_STDIO_H # include diff --git a/src/Window.cc b/src/Window.cc index 031b396e..458104cb 100644 --- a/src/Window.cc +++ b/src/Window.cc @@ -33,9 +33,9 @@ #include #include -#ifdef STDC_HEADERS +#ifdef HAVE_STRING_H # include -#endif // STDC_HEADERS +#endif // HAVE_STRING_H #ifdef DEBUG # ifdef HAVE_STDIO_H diff --git a/src/Windowmenu.cc b/src/Windowmenu.cc index 8483f1ab..af20a9c7 100644 --- a/src/Windowmenu.cc +++ b/src/Windowmenu.cc @@ -37,9 +37,9 @@ #include "Windowmenu.h" #include "Workspace.h" -#ifdef STDC_HEADERS +#ifdef HAVE_STRING_H # include -#endif // STDC_HEADERS +#endif // HAVE_STRING_H Windowmenu::Windowmenu(OpenboxWindow &win) : Basemenu(*win.getScreen()), diff --git a/src/Workspace.cc b/src/Workspace.cc index 28d752f2..9c44d797 100644 --- a/src/Workspace.cc +++ b/src/Workspace.cc @@ -54,9 +54,9 @@ # include #endif // HAVE_STDLIB_H -#ifdef STDC_HEADERS +#ifdef HAVE_STRING_H # include -#endif // STDC_HEADERS +#endif // HAVE_STRING_H #include typedef vector rectList; diff --git a/src/i18n.cc b/src/i18n.cc index 18b77209..5fddea57 100644 --- a/src/i18n.cc +++ b/src/i18n.cc @@ -34,11 +34,17 @@ #include -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include +#endif // HAVE_STDLIB_H + +#ifdef HAVE_STRING_H # include +#endif // HAVE_STRING_H + +#ifdef HAVE_STDIO_H # include -#endif // STDC_HEADERS +#endif // HAVE_STDIO_H #ifdef HAVE_LOCALE_H # include diff --git a/src/main.cc b/src/main.cc index 0a0ad5ba..0b2360ab 100644 --- a/src/main.cc +++ b/src/main.cc @@ -39,10 +39,13 @@ # include #endif // HAVE_STDIO_H -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include +#endif // HAVE_STDLIB_H + +#ifdef HAVE_STRING_H # include -#endif // STDC_HEADERS +#endif // HAVE_STRING_H #ifdef HAVE_UNISTD_H #include diff --git a/src/openbox.cc b/src/openbox.cc index b3678664..371feb4b 100644 --- a/src/openbox.cc +++ b/src/openbox.cc @@ -64,10 +64,13 @@ # include #endif // HAVE_STDIO_H -#ifdef STDC_HEADERS +#ifdef HAVE_STDLIB_H # include +#endif // HAVE_STDLIB_H + +#ifdef HAVE_STRING_H # include -#endif // STDC_HEADERS +#endif // HAVE_STRING_H #ifdef HAVE_UNISTD_H # include -- 2.45.2