From 7ca4d98726f40fe6ec5b1335ee02d05ba0c18e57 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Fri, 24 May 2002 22:59:42 +0000 Subject: [PATCH] new root dir based on bb-cvs --- BUGS | 0 CodingStyle | 13 --- Makefile.am | 2 - autom4te.cache/requests | 173 +++++++++++++++++++++++++++++++++++ bootstrap | 1 + config.h.in | 145 ----------------------------- configure.in => configure.ac | 43 +-------- stamp-h.in | 1 - 8 files changed, 179 insertions(+), 199 deletions(-) delete mode 100644 BUGS delete mode 100644 CodingStyle delete mode 100644 config.h.in rename configure.in => configure.ac (86%) delete mode 100644 stamp-h.in diff --git a/BUGS b/BUGS deleted file mode 100644 index e69de29b..00000000 diff --git a/CodingStyle b/CodingStyle deleted file mode 100644 index 729e37c0..00000000 --- a/CodingStyle +++ /dev/null @@ -1,13 +0,0 @@ -Openbox coding style: - -2 space indent, expanded to spaces. No actual tab characters. - -Braces do not get a \n before the top one, for example: - if () { - } - -Put a space between an if/while/etc and the ()'s (see above example) - - -If you see anythig not laid out, mention it and we can decide what is right and -add it to this file! diff --git a/Makefile.am b/Makefile.am index bf0473bb..23cfc45a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,7 +1,5 @@ # Makefile.am for Openbox -AUTOMAKE_OPTIONS = foreign - SUBDIRS = data doc nls src util MAINTAINERCLEANFILES = aclocal.m4 config.h.in configure Makefile.in stamp-h.in diff --git a/autom4te.cache/requests b/autom4te.cache/requests index 3452fdff..8189aa86 100644 --- a/autom4te.cache/requests +++ b/autom4te.cache/requests @@ -89,6 +89,179 @@ 'AC_PROG_LIBTOOL' => 1, 'AC_PROG_CC' => 1 } + ], 'Request' ), + bless( [ + '1', + 1, + [ + '/usr/share/autoconf' + ], + [ + '--reload-state=/usr/share/autoconf/autoconf/autoconf.m4f', + 'configure.ac' + ], + { + 'AC_HEADER_STAT' => 1, + 'AC_FUNC_STRFTIME' => 1, + 'AC_PROG_RANLIB' => 1, + 'AC_FUNC_WAIT3' => 1, + 'AC_FUNC_SETPGRP' => 1, + 'AC_HEADER_TIME' => 1, + 'AC_FUNC_SETVBUF_REVERSED' => 1, + 'AC_HEADER_SYS_WAIT' => 1, + 'AC_TYPE_UID_T' => 1, + 'AC_CHECK_LIB' => 1, + 'AM_CONDITIONAL' => 1, + 'AC_PROG_LN_S' => 1, + 'AC_FUNC_MEMCMP' => 1, + 'AC_FUNC_FORK' => 1, + 'AC_FUNC_GETGROUPS' => 1, + 'AC_HEADER_MAJOR' => 1, + 'AC_FUNC_STRTOD' => 1, + 'AC_HEADER_DIRENT' => 1, + 'AC_FUNC_UTIME_NULL' => 1, + 'AC_CONFIG_FILES' => 1, + 'AC_FUNC_ALLOCA' => 1, + 'AC_C_CONST' => 1, + 'include' => 1, + 'AC_FUNC_OBSTACK' => 1, + 'AC_FUNC_LSTAT' => 1, + 'AC_STRUCT_TIMEZONE' => 1, + 'AC_FUNC_GETPGRP' => 1, + 'AC_DEFINE_TRACE_LITERAL' => 1, + 'AC_CHECK_HEADERS' => 1, + 'AC_TYPE_MODE_T' => 1, + 'AC_CHECK_TYPES' => 1, + 'AC_PROG_YACC' => 1, + 'AC_FUNC_STRERROR_R' => 1, + 'AC_TYPE_PID_T' => 1, + 'AC_STRUCT_ST_BLOCKS' => 1, + 'AC_PROG_GCC_TRADITIONAL' => 1, + 'AC_TYPE_SIGNAL' => 1, + 'AC_FUNC_FNMATCH' => 1, + 'AC_PROG_CPP' => 1, + 'AM_PROG_LIBTOOL' => 1, + 'AC_FUNC_STAT' => 1, + 'AC_PROG_INSTALL' => 1, + 'AM_GNU_GETTEXT' => 1, + 'AC_FUNC_STRCOLL' => 1, + 'AC_LIBSOURCE' => 1, + 'AC_C_INLINE' => 1, + 'AC_FUNC_CHOWN' => 1, + 'AC_PROG_LEX' => 1, + 'AH_OUTPUT' => 1, + 'AC_HEADER_STDC' => 1, + 'AC_FUNC_GETLOADAVG' => 1, + 'AC_CHECK_FUNCS' => 1, + 'AC_TYPE_SIZE_T' => 1, + 'AC_DECL_SYS_SIGLIST' => 1, + 'AC_FUNC_MKTIME' => 1, + 'AC_PROG_MAKE_SET' => 1, + 'AC_PROG_CXX' => 1, + 'm4_pattern_allow' => 1, + 'm4_include' => 1, + 'm4_pattern_forbid' => 1, + 'AC_PROG_AWK' => 1, + 'AC_FUNC_VPRINTF' => 1, + 'AC_CONFIG_HEADERS' => 1, + 'AC_PATH_X' => 1, + 'AC_TYPE_OFF_T' => 1, + 'AC_FUNC_MALLOC' => 1, + 'AC_FUNC_ERROR_AT_LINE' => 1, + 'AC_FUNC_FSEEKO' => 1, + 'AC_STRUCT_TM' => 1, + 'AC_FUNC_MMAP' => 1, + 'AC_SUBST' => 1, + 'AC_PROG_LIBTOOL' => 1, + 'AC_PROG_CC' => 1 + } + ], 'Request' ), + bless( [ + '2', + 1, + [ + '/usr/share/autoconf' + ], + [ + '--reload-state=/usr/share/autoconf/autoconf/autoconf.m4f', + 'aclocal.m4', + 'configure.ac' + ], + { + 'AC_HEADER_STAT' => 1, + 'AC_FUNC_STRFTIME' => 1, + 'AC_PROG_RANLIB' => 1, + 'AC_FUNC_WAIT3' => 1, + 'AC_FUNC_SETPGRP' => 1, + 'AC_HEADER_TIME' => 1, + 'AC_FUNC_SETVBUF_REVERSED' => 1, + 'AC_HEADER_SYS_WAIT' => 1, + 'AC_TYPE_UID_T' => 1, + 'AM_CONDITIONAL' => 1, + 'AC_CHECK_LIB' => 1, + 'AC_PROG_LN_S' => 1, + 'AC_FUNC_MEMCMP' => 1, + 'AC_FUNC_FORK' => 1, + 'AC_FUNC_GETGROUPS' => 1, + 'AC_HEADER_MAJOR' => 1, + 'AC_FUNC_STRTOD' => 1, + 'AC_HEADER_DIRENT' => 1, + 'AC_FUNC_UTIME_NULL' => 1, + 'AC_CONFIG_FILES' => 1, + 'AC_FUNC_ALLOCA' => 1, + 'AC_C_CONST' => 1, + 'include' => 1, + 'AC_FUNC_OBSTACK' => 1, + 'AC_FUNC_LSTAT' => 1, + 'AC_STRUCT_TIMEZONE' => 1, + 'AC_FUNC_GETPGRP' => 1, + 'AC_DEFINE_TRACE_LITERAL' => 1, + 'AC_CHECK_HEADERS' => 1, + 'AC_TYPE_MODE_T' => 1, + 'AC_CHECK_TYPES' => 1, + 'AC_PROG_YACC' => 1, + 'AC_TYPE_PID_T' => 1, + 'AC_FUNC_STRERROR_R' => 1, + 'AC_STRUCT_ST_BLOCKS' => 1, + 'AC_PROG_GCC_TRADITIONAL' => 1, + 'AC_TYPE_SIGNAL' => 1, + 'AC_FUNC_FNMATCH' => 1, + 'AC_PROG_CPP' => 1, + 'AM_PROG_LIBTOOL' => 1, + 'AC_FUNC_STAT' => 1, + 'AC_PROG_INSTALL' => 1, + 'AM_GNU_GETTEXT' => 1, + 'AC_FUNC_STRCOLL' => 1, + 'AC_LIBSOURCE' => 1, + 'AC_C_INLINE' => 1, + 'AC_FUNC_CHOWN' => 1, + 'AC_PROG_LEX' => 1, + 'AH_OUTPUT' => 1, + 'AC_HEADER_STDC' => 1, + 'AC_FUNC_GETLOADAVG' => 1, + 'AC_CHECK_FUNCS' => 1, + 'AC_TYPE_SIZE_T' => 1, + 'AC_DECL_SYS_SIGLIST' => 1, + 'AC_FUNC_MKTIME' => 1, + 'AC_PROG_MAKE_SET' => 1, + 'AC_PROG_CXX' => 1, + 'm4_pattern_allow' => 1, + 'm4_include' => 1, + 'm4_pattern_forbid' => 1, + 'AC_PROG_AWK' => 1, + 'AC_FUNC_VPRINTF' => 1, + 'AC_CONFIG_HEADERS' => 1, + 'AC_PATH_X' => 1, + 'AC_TYPE_OFF_T' => 1, + 'AC_FUNC_MALLOC' => 1, + 'AC_FUNC_ERROR_AT_LINE' => 1, + 'AC_FUNC_FSEEKO' => 1, + 'AC_FUNC_MMAP' => 1, + 'AC_STRUCT_TM' => 1, + 'AC_SUBST' => 1, + 'AC_PROG_CC' => 1, + 'AC_PROG_LIBTOOL' => 1 + } ], 'Request' ) ); diff --git a/bootstrap b/bootstrap index 60958c82..3c3044d3 100755 --- a/bootstrap +++ b/bootstrap @@ -4,6 +4,7 @@ sh() { /bin/sh -c "set -x; $*" } +sh autoheader sh aclocal sh automake --foreign --include-deps --add-missing sh autoconf diff --git a/config.h.in b/config.h.in deleted file mode 100644 index cb7c7ee7..00000000 --- a/config.h.in +++ /dev/null @@ -1,145 +0,0 @@ -/* config.h.in. Generated from configure.in by autoheader. */ - -/* Define to 1 if you have the `basename' function. */ -#undef HAVE_BASENAME - -/* Define to 1 if you have the `catclose' function. */ -#undef HAVE_CATCLOSE - -/* Define to 1 if you have the `catgets' function. */ -#undef HAVE_CATGETS - -/* Define to 1 if you have the `catopen' function. */ -#undef HAVE_CATOPEN - -/* Define to 1 if you have the header file. */ -#undef HAVE_CTYPE_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_DIRENT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_FCNTL_H - -/* Define to 1 if you have the `getpid' function. */ -#undef HAVE_GETPID - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_LIBGEN_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_LOCALE_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_NL_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_PROCESS_H - -/* Define to 1 if you have the `setlocale' function. */ -#undef HAVE_SETLOCALE - -/* Define to 1 if you have the `sigaction' function. */ -#undef HAVE_SIGACTION - -/* Define to 1 if you have the header file. */ -#undef HAVE_SIGNAL_H - -/* Define to 1 if you have the `snprintf' function. */ -#undef HAVE_SNPRINTF - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDARG_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDIO_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the `strcasestr' function. */ -#undef HAVE_STRCASESTR - -/* Define to 1 if you have the `strftime' function. */ -#undef HAVE_STRFTIME - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_PARAM_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SELECT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_SIGNAL_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TIME_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_WAIT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SSTREAM - -/* Define to 1 if you have the header file. */ -#undef HAVE_TIME_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* Define to 1 if you have the `vsnprintf' function. */ -#undef HAVE_VSNPRINTF - -/* Name of package */ -#undef PACKAGE - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* Define as the return type of signal handlers (`int' or `void'). */ -#undef RETSIGTYPE - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Define to 1 if you can safely include both and . */ -#undef TIME_WITH_SYS_TIME - -/* Version number of package */ -#undef VERSION - -/* Define to 1 if the X Window System is missing or not being used. */ -#undef X_DISPLAY_MISSING diff --git a/configure.in b/configure.ac similarity index 86% rename from configure.in rename to configure.ac index 29e5cf80..ae460597 100644 --- a/configure.in +++ b/configure.ac @@ -1,7 +1,8 @@ dnl configure.in for Openbox dnl Initialize autoconf and automake -AC_INIT(src/openbox.cc) +AC_INIT(src/blackbox.cc) AM_INIT_AUTOMAKE(openbox,2.0.0,no-define) +AC_CONFIG_HEADERS(config.h) dnl Determine default prefix test x$prefix = "xNONE" && prefix="$ac_default_prefix" @@ -99,40 +100,6 @@ AC_ARG_ENABLE( ) AC_SUBST(SLIT) -dnl Check for the new WM Spec -NEWWMSPEC="" -AC_MSG_CHECKING([whether to include the new WM Spec (DOES NOTHING)]) -AC_ARG_ENABLE( - newspec, -[ --enable-newspec include code for the new WM Spec (DOES NOTHING) - [default=no]], - if test x$enableval = "xyes"; then - AC_MSG_RESULT([yes]) - NEWWMSPEC="-DNEWWMSPEC" - else - AC_MSG_RESULT([no]) - fi, - AC_MSG_RESULT([no]) -) -AC_SUBST(NEWWMSPEC) - - -dnl Check for Interlacing -INTERLACE="" -AC_MSG_CHECKING([whether to include interlacing image code]) -AC_ARG_ENABLE( - interlace, [ --enable-interlace include code for image interlacing [default=yes]], - if test x$enableval = "xyes"; then - AC_MSG_RESULT([yes]) - INTERLACE="-DINTERLACE" - else - AC_MSG_RESULT([no]) - fi, - AC_MSG_RESULT([yes]) - INTERLACE="-DINTERLACE" -) -AC_SUBST(INTERLACE) - dnl Check for ordered 8bpp dithering ORDEREDPSEUDO="" AC_MSG_CHECKING([whether to include Pseudocolor ordered dithering code]) @@ -245,9 +212,6 @@ util/Makefile data/Makefile data/styles/Makefile doc/Makefile -dnl doc/ja_JP/Makefile -dnl doc/nl_NL/Makefile -dnl doc/sl_SI/Makefile nls/Makefile nls/C/Makefile nls/da_DK/Makefile @@ -255,6 +219,7 @@ nls/de_DE/Makefile nls/es_ES/Makefile nls/et_EE/Makefile nls/fr_FR/Makefile +nls/hu_HU/Makefile nls/it_IT/Makefile nls/ja_JP/Makefile nls/nl_NL/Makefile @@ -263,5 +228,7 @@ nls/ru_RU/Makefile nls/sl_SI/Makefile nls/sv_SE/Makefile nls/tr_TR/Makefile +nls/uk_UA/Makefile nls/zh_CN/Makefile +nls/zh_TW/Makefile version.h) diff --git a/stamp-h.in b/stamp-h.in deleted file mode 100644 index 9788f702..00000000 --- a/stamp-h.in +++ /dev/null @@ -1 +0,0 @@ -timestamp -- 2.39.2