xwinwm configure.ac, NONE, 1.1 Makefile.in, 1.2, 1.3 config.h.in,
1.2, 1.3 configure, 1.2, 1.3 configure.in, 1.2, NONE
Harold L Hunt II
xserver-commit at pdx.freedesktop.org
Sat Apr 10 20:58:04 PDT 2004
Committed by: harold
Update of /cvs/xserver/xwinwm
In directory pdx:/tmp/cvs-serv608
Modified Files:
Makefile.in config.h.in configure
Added Files:
configure.ac
Removed Files:
configure.in
Log Message:
Update version to 0.0.5
--- NEW FILE: configure.ac ---
dnl configure.in for XWinWM
dnl Initialize autoconf and automake
AC_INIT(xwinwm, 0.0.5)
AC_CONFIG_SRCDIR(src/Window.cc)
AM_INIT_AUTOMAKE([dist-bzip2])
dnl Determine default prefix
test x$prefix = "xNONE" && prefix="$ac_default_prefix"
dnl Locate required external software
AC_PROG_CC
AC_PROG_CXX
AC_PROG_INSTALL
AC_CHECK_PROGS(regex_cmd, sed)
if test x$regex_cmd = "x"; then
AC_MSG_ERROR([error. sed is required to build the default menu file.])
fi
dnl Check for system header files
AC_CHECK_HEADERS(ctype.h dirent.h fcntl.h libgen.h locale.h nl_types.h process.h signal.h stdarg.h stdio.h stdlib.h string.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()
AC_CHECK_FUNCS(basename, , AC_CHECK_LIB(gen, basename,
AC_DEFINE(HAVE_BASENAME) LIBS="$LIBS -lgen"))
AC_CHECK_FUNCS(getpid setlocale sigaction strftime strcasestr snprintf vsnprintf catopen catgets catclose)
AC_CHECK_LIB(nsl, t_open, LIBS="$LIBS -lnsl")
AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
dnl Check for X headers and libraries
AC_PATH_X
AC_PATH_XTRA
test x$no_x = "xyes" && AC_MSG_ERROR([Hackedbox requires the X Window System libraries and headers.])
test x$x_includes = "x" && x_includes="/usr/include"
test x$x_libraries = "x" && x_libraries="/usr/lib"
CFLAGS="$CFLAGS $X_CFLAGS"
CXXFLAGS="$CXXFLAGS $X_CFLAGS"
LIBS="$LIBS $X_LIBS"
LDFLAGS="$LDFLAGS $LIBS $X_PRE_LIBS"
AC_MSG_CHECKING(for GCC)
if test x$GCC = "xyes"; then
AC_MSG_RESULT([yes])
CXXFLAGS="${CXXFLAGS} -Wall -W -pedantic"
else
AC_MSG_RESULT([no, trying other compilers])
AC_MSG_CHECKING(for MIPSpro)
mips_pro_ver=`$CC -version 2>&1 | grep -i mipspro | cut -f4 -d ' '`
if test "x$mips_pro_ver" = "x"; then
AC_MSG_RESULT([no])
else
AC_MSG_RESULT([yes, version $mips_pro_ver.])
AC_MSG_CHECKING(for -LANG:std in CXXFLAGS)
lang_std_not_set=`echo $CXXFLAGS | grep "\-LANG:std"`
if test "x$lang_std_not_set" = "x"; then
AC_MSG_RESULT([not set, setting.])
CXXFLAGS="${CXXFLAGS} -LANG:std"
else
AC_MSG_RESULT([already set.])
fi
fi
fi
dnl Check for required functions in -lX11
AC_CHECK_LIB(X11, XOpenDisplay,
LIBS="$LIBS -lX11",
AC_MSG_ERROR([Could not find XOpenDisplay in -lX11.])
)
LIBS="$LIBS $X_EXTRA_LIBS"
Xext_lib=""
dnl Check for XShape extension support and proper library files.
SHAPE=""
AC_MSG_CHECKING([whether to build support for the XShape extension])
AC_ARG_ENABLE(
shape,
[ --enable-shape enable support of the XShape extension [default=yes]])
: ${enableval="yes"}
if test x$enableval = "xyes"; then
AC_MSG_RESULT([yes])
AC_CHECK_LIB(Xext, XShapeCombineShape,
AC_MSG_CHECKING([for X11/extensions/shape.h])
AC_TRY_LINK(
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/extensions/shape.h>
, long foo = ShapeSet,
AC_MSG_RESULT([yes])
SHAPE="-DSHAPE"; Xext_lib="-lXext",
AC_MSG_RESULT([no])
)
)
else
AC_MSG_RESULT([no])
fi
AC_SUBST(SHAPE)
Xwindowswm_lib=""
dnl Check for WindowsWM extension support and proper library files.
WINDOWSWM=""
AC_MSG_CHECKING([whether to build support for the WindowsWM extension])
AC_ARG_ENABLE(
windowswm,
[ --enable-windows-wm enable support of the WindowsWM extension [default=yes]])
: ${enableval="yes"}
if test x$enableval = "xyes"; then
AC_MSG_RESULT([yes])
AC_CHECK_LIB(WindowsWM, XWindowsWMSelectInput,
AC_MSG_CHECKING([for X11/extensions/windowswm.h])
AC_TRY_LINK(
#include <X11/Xlib.h>
#include <X11/Xutil.h>
#include <X11/extensions/windowswm.h>
,,
AC_MSG_RESULT([yes])
WINDOWSWM="-DWINDOWSWM"; Xwindowswm_lib="-lWindowsWM",
AC_MSG_RESULT([no])
),,
-lX11 -lXext
)
else
AC_MSG_RESULT([no])
fi
AC_SUBST(WINDOWSWM)
LIBS="$Xwindowswm_lib $LIBS $Xext_lib"
dnl Check for ordered 8bpp dithering
ORDEREDPSEUDO=""
AC_MSG_CHECKING([whether to include Pseudocolor ordered dithering code])
AC_ARG_ENABLE(ordered-pseudo,
[ --enable-ordered-pseudo include code for ordered pseudocolor (8bpp)
dithering [default=no]],
if test x$enableval = "xyes"; then
AC_MSG_RESULT([yes])
ORDEREDPSEUDO="-DORDEREDPSEUDO"
else
AC_MSG_RESULT([no])
fi,
AC_MSG_RESULT([no])
)
AC_SUBST(ORDEREDPSEUDO)
dnl Check whether to include debugging code
DEBUG=""
AC_MSG_CHECKING([whether to include verbose debugging code])
AC_ARG_ENABLE(debug,
[ --enable-debug include verbose debugging code [default=no]],
if test x$enableval = "xyes"; then
AC_MSG_RESULT([yes])
if test x$GCC = "xyes"; then
DEBUG="-DDEBUG -fno-inline -g"
else
DEBUG="-DDEBUG"
fi
else
AC_MSG_RESULT([no])
DEBUG="-DNDEBUG"
fi,
AC_MSG_RESULT([no])
DEBUG="-DNDEBUG"
)
AC_SUBST(DEBUG)
dnl Check whether to include natural language support (i18n)
NLS=""
AC_MSG_CHECKING([whether to include NLS support])
AC_ARG_ENABLE(nls,
[ --enable-nls include natural language support [default=yes]],
if test x$enableval = "xyes"; then
AC_MSG_RESULT([yes])
NLS="-DNLS"
else
AC_MSG_RESULT([no])
fi,
AC_MSG_RESULT([yes])
NLS="-DNLS"
)
AC_SUBST(NLS)
AC_CHECK_LIB(xpg4, setlocale, LIBS="$LIBS -lxpg4")
AC_CHECK_PROGS(gencat_cmd, gencat)
if test x$gencat_cmd = "x"; then
NLS=""
fi
dnl Check for new timed pixmap cache
TIMEDCACHE=""
AC_MSG_CHECKING([whether to use the new timed pixmap cache])
AC_ARG_ENABLE(
timed-cache,
[ --enable-timed-cache use new timed pixmap cache [default=yes]],
if test x$enableval = "xyes"; then
AC_MSG_RESULT([yes])
TIMEDCACHE="-DTIMEDCACHE"
else
AC_MSG_RESULT([no])
fi,
AC_MSG_RESULT([yes])
TIMEDCACHE="-DTIMEDCACHE"
)
AC_SUBST(TIMEDCACHE)
dnl Determine the return type of signal handlers
AC_TYPE_SIGNAL
dnl Determine if maintainer portions of the Makefiles should be included.
AM_MAINTAINER_MODE
dnl Output files
AM_CONFIG_HEADER(config.h)
AC_CONFIG_FILES(Makefile
src/Makefile
src/blackbox.cc
doc/xwinwm.1
doc/Makefile
doc/ja_JP/Makefile
nls/Makefile
nls/C/Makefile
dnl nls/da_DK/Makefile
dnl nls/de_DE/Makefile
dnl nls/es_AR/Makefile
dnl nls/es_ES/Makefile
dnl nls/et_EE/Makefile
dnl nls/fr_FR/Makefile
dnl nls/hu_HU/Makefile
dnl nls/it_IT/Makefile
dnl nls/ja_JP/Makefile
dnl nls/ko_KR/Makefile
dnl nls/nl_NL/Makefile
dnl nls/no_NO/Makefile
dnl nls/pl_PL/Makefile
dnl nls/pt_BR/Makefile
dnl nls/ro_RO/Makefile
dnl nls/ru_RU/Makefile
dnl nls/sk_SK/Makefile
dnl nls/sl_SI/Makefile
dnl nls/sv_SE/Makefile
dnl nls/tr_TR/Makefile
dnl nls/uk_UA/Makefile
dnl nls/zh_CN/Makefile
dnl nls/zh_TW/Makefile
version.h)
AC_OUTPUT
# Print results
AC_MSG_RESULT([])
AC_MSG_RESULT([***************************************************])
AC_MSG_RESULT([])
AC_MSG_RESULT([$PACKAGE version $VERSION configured successfully.])
AC_MSG_RESULT([])
AC_MSG_RESULT([Using '$prefix' for installation.])
AC_MSG_RESULT([Using '$CXX' for C++ compiler.])
AC_MSG_RESULT([Building with '$CXXFLAGS' for C++ compiler flags.])
AC_MSG_RESULT([Building with '$LIBS' for linker flags.])
AC_MSG_RESULT([])
AC_MSG_RESULT([***************************************************])
Index: Makefile.in
===================================================================
RCS file: /cvs/xserver/xwinwm/Makefile.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/Makefile.in 11 Apr 2004 03:34:48 -0000 1.2
+++ b/Makefile.in 11 Apr 2004 03:58:02 -0000 1.3
@@ -147,7 +147,7 @@
check-recursive installcheck-recursive
DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
COPYING ChangeLog INSTALL Makefile.am TODO aclocal.m4 \
- config.h.in configure configure.in depcomp install-sh missing \
+ config.h.in configure configure.ac depcomp install-sh missing \
mkinstalldirs version.h.in
DIST_SUBDIRS = $(SUBDIRS)
all: config.h
@@ -157,7 +157,7 @@
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
configure.lineno
-$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && \
$(AUTOMAKE) --foreign Makefile
Makefile: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.in $(top_builddir)/config.status
@@ -165,10 +165,10 @@
$(top_builddir)/config.status: $(srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
$(SHELL) ./config.status --recheck
-$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.in $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
+$(srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(srcdir)/configure.ac $(ACLOCAL_M4) $(CONFIGURE_DEPENDENCIES)
cd $(srcdir) && $(AUTOCONF)
-$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.in
+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ configure.ac
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
config.h: stamp-h1
@@ -181,7 +181,7 @@
@rm -f stamp-h1
cd $(top_builddir) && $(SHELL) ./config.status config.h
-$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.in $(ACLOCAL_M4)
+$(srcdir)/config.h.in: @MAINTAINER_MODE_TRUE@ $(top_srcdir)/configure.ac $(ACLOCAL_M4)
cd $(top_srcdir) && $(AUTOHEADER)
touch $(srcdir)/config.h.in
@@ -380,8 +380,13 @@
$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
$(am__remove_distdir)
+dist-bzip2: distdir
+ $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
+ $(am__remove_distdir)
+
dist dist-all: distdir
$(AMTAR) chof - $(distdir) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
+ $(AMTAR) chof - $(distdir) | bzip2 -9 -c >$(distdir).tar.bz2
$(am__remove_distdir)
# This target untars the dist file and tries a VPATH configuration. Then
@@ -523,21 +528,21 @@
.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
clean-generic clean-recursive ctags ctags-recursive dist \
- dist-all dist-gzip distcheck distclean distclean-generic \
- distclean-hdr distclean-local distclean-recursive \
- distclean-tags distcleancheck distdir distuninstallcheck dvi \
- dvi-am dvi-recursive info info-am info-recursive install \
- install-am install-data install-data-am install-data-recursive \
- install-exec install-exec-am install-exec-recursive \
- install-info install-info-am install-info-recursive install-man \
- install-recursive install-strip installcheck installcheck-am \
- installdirs installdirs-am installdirs-recursive \
- maintainer-clean maintainer-clean-generic \
- maintainer-clean-recursive mostlyclean mostlyclean-generic \
- mostlyclean-recursive pdf pdf-am pdf-recursive ps ps-am \
- ps-recursive tags tags-recursive uninstall uninstall-am \
- uninstall-info-am uninstall-info-recursive uninstall-local \
- uninstall-recursive
+ dist-all dist-bzip2 dist-gzip distcheck distclean \
+ distclean-generic distclean-hdr distclean-local \
+ distclean-recursive distclean-tags distcleancheck distdir \
+ distuninstallcheck dvi dvi-am dvi-recursive info info-am \
+ info-recursive install install-am install-data install-data-am \
+ install-data-recursive install-exec install-exec-am \
+ install-exec-recursive install-info install-info-am \
+ install-info-recursive install-man install-recursive \
+ install-strip installcheck installcheck-am installdirs \
+ installdirs-am installdirs-recursive maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive mostlyclean \
+ mostlyclean-generic mostlyclean-recursive pdf pdf-am \
+ pdf-recursive ps ps-am ps-recursive tags tags-recursive \
+ uninstall uninstall-am uninstall-info-am \
+ uninstall-info-recursive uninstall-local uninstall-recursive
uninstall-local:
Index: config.h.in
===================================================================
RCS file: /cvs/xserver/xwinwm/config.h.in,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/config.h.in 11 Apr 2004 03:34:48 -0000 1.2
+++ b/config.h.in 11 Apr 2004 03:58:02 -0000 1.3
@@ -1,4 +1,4 @@
-/* config.h.in. Generated from configure.in by autoheader. */
+/* config.h.in. Generated from configure.ac by autoheader. */
/* Define to 1 if you have the `basename' function. */
#undef HAVE_BASENAME
@@ -108,6 +108,9 @@
/* 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
@@ -132,5 +135,8 @@
/* Define to 1 if you can safely include both <sys/time.h> and <time.h>. */
#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
Index: configure
===================================================================
RCS file: /cvs/xserver/xwinwm/configure,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- a/configure 11 Apr 2004 03:34:48 -0000 1.2
+++ b/configure 11 Apr 2004 03:58:02 -0000 1.3
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.59.
+# Generated by GNU Autoconf 2.59 for xwinwm 0.0.5.
#
# Copyright (C) 2003 Free Software Foundation, Inc.
# This configure script is free software; the Free Software Foundation
@@ -265,11 +265,11 @@
: ${ac_max_here_lines=38}
# Identity of this package.
-PACKAGE_NAME=
-PACKAGE_TARNAME=
-PACKAGE_VERSION=
-PACKAGE_STRING=
-PACKAGE_BUGREPORT=
+PACKAGE_NAME='xwinwm'
+PACKAGE_TARNAME='xwinwm'
+PACKAGE_VERSION='0.0.5'
+PACKAGE_STRING='xwinwm 0.0.5'
+PACKAGE_BUGREPORT=''
ac_unique_file="src/Window.cc"
# Factoring default headers for most tests.
@@ -786,7 +786,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures this package to adapt to many kinds of systems.
+\`configure' configures xwinwm 0.0.5 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -851,7 +851,9 @@
fi
if test -n "$ac_init_help"; then
-
+ case $ac_init_help in
+ short | recursive ) echo "Configuration of xwinwm 0.0.5:";;
+ esac
cat <<\_ACEOF
Optional Features:
@@ -983,6 +985,8 @@
test -n "$ac_init_help" && exit 0
if $ac_init_version; then
cat <<\_ACEOF
+xwinwm configure 0.0.5
+generated by GNU Autoconf 2.59
Copyright (C) 2003 Free Software Foundation, Inc.
This configure script is free software; the Free Software Foundation
@@ -995,7 +999,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by $as_me, which was
+It was created by xwinwm $as_me 0.0.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
$ $0 $@
@@ -1323,6 +1327,15 @@
+
+
+
+
+
+
+
+
+
am__api_version="1.7"
ac_aux_dir=
for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do
@@ -1597,10 +1610,19 @@
# Define the identity of the package.
- PACKAGE=xwinwm
- VERSION=0.0.4
+ PACKAGE='xwinwm'
+ VERSION='0.0.5'
+cat >>confdefs.h <<_ACEOF
+#define PACKAGE "$PACKAGE"
+_ACEOF
+
+
+cat >>confdefs.h <<_ACEOF
+#define VERSION "$VERSION"
+_ACEOF
+
# Some tools Automake needs.
ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
@@ -4029,9 +4051,9 @@
echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
(
cat <<\_ASBOX
-## ------------------------------------------ ##
-## Report this to the AC_PACKAGE_NAME lists. ##
-## ------------------------------------------ ##
+## --------------------------------- ##
+## Report this to the xwinwm lists. ##
+## --------------------------------- ##
_ASBOX
) |
sed "s/^/$as_me: WARNING: /" >&2
@@ -6647,6 +6669,7 @@
ac_config_headers="$ac_config_headers config.h"
ac_config_files="$ac_config_files Makefile src/Makefile src/blackbox.cc doc/xwinwm.1 doc/Makefile doc/ja_JP/Makefile nls/Makefile nls/C/Makefile version.h"
+
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
# tests run on this system so they can be shared between configure
@@ -7037,7 +7060,7 @@
} >&5
cat >&5 <<_CSEOF
-This file was extended by $as_me, which was
+This file was extended by xwinwm $as_me 0.0.5, which was
generated by GNU Autoconf 2.59. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7100,7 +7123,7 @@
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-config.status
+xwinwm config.status 0.0.5
configured by $0, generated by GNU Autoconf 2.59,
with options \\"`echo "$ac_configure_args" | sed 's/[\\""\`\$]/\\\\&/g'`\\"
--- configure.in DELETED ---
More information about the xserver-commit
mailing list