configure.ac | 56 ++++++++++++++++++----------------------------
include/X11/Xaw/XawInit.h | 1
specs/.gitignore | 2 -
specs/CH6.xml | 2 -
specs/Makefile.am | 7 +----
src/Makefile.am | 10 +++++++-
src/OS.c | 11 ---------
src/XawI18n.h | 6 ++--
xaw6.pc.in | 2 -
9 files changed, 40 insertions(+), 57 deletions(-)
New commits:
commit 8ac146ce96cfa133b788b1ffdd13fe0b648ee4fc
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Tue Jan 11 17:07:08 2011 -0800
libXaw 1.0.9
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/configure.ac b/configure.ac
index 687d8e5..9c99e03 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to create configure.
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libXaw], [1.0.8],
+AC_INIT([libXaw], [1.0.9],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXaw])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit e7a9b0302f7cb84015e8f612e5b65694d785b2d8
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Sun Nov 21 09:33:46 2010 -0500
config: prevent config.status from being generated three times
AC_OUTPUT with parameters is deprecated, use AC_CONFIG_FILES.
Reviewed-by: Alan Coopersmith <alan.coopersm...@oracle.com>
Tested-by: Alan Coopersmith <alan.coopersm...@oracle.com>
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/configure.ac b/configure.ac
index d8069cb..687d8e5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -95,16 +95,18 @@ AC_CHECK_HEADERS([wctype.h wchar.h widec.h])
# Checks for functions
AC_CHECK_FUNCS([iswalnum getpagesize])
-AC_OUTPUT([Makefile
- include/Makefile
- man/Makefile
- specs/Makefile
- src/Makefile])
+AC_CONFIG_FILES([Makefile
+ include/Makefile
+ man/Makefile
+ specs/Makefile
+ src/Makefile])
if test "x$build_v6" = xyes; then
- AC_OUTPUT(xaw6.pc)
+ AC_CONFIG_FILES(xaw6.pc)
fi
if test "x$build_v7" = xyes; then
- AC_OUTPUT(xaw7.pc)
+ AC_CONFIG_FILES(xaw7.pc)
fi
+
+AC_OUTPUT
commit 55fc7aa22197350d9cd1039e0398132a63d3589f
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Sat Nov 20 20:10:12 2010 -0800
Check for getpagesize() with autoconf instead of #ifdef osname
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
Reviewed-by: Julien Cristau <jcris...@debian.org>
Reviewed-by: Gaetan Nadon <mems...@videotron.ca>
Tested-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 83b20b2..d8069cb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,7 +93,7 @@ AC_HEADER_STDC
AC_CHECK_HEADERS([wctype.h wchar.h widec.h])
# Checks for functions
-AC_CHECK_FUNCS([iswalnum])
+AC_CHECK_FUNCS([iswalnum getpagesize])
AC_OUTPUT([Makefile
include/Makefile
diff --git a/src/OS.c b/src/OS.c
index 9c0bb45..8bc23dd 100644
--- a/src/OS.c
+++ b/src/OS.c
@@ -14,18 +14,9 @@
#if defined(linux)
/* kernel header doesn't work with -ansi */
/* #include <asm/page.h> *//* for PAGE_SIZE */
-#define HAS_GETPAGESIZE
#define HAS_SC_PAGESIZE /* _SC_PAGESIZE may be an enum for Linux */
#endif
-#if defined(CSRG_BASED)
-#define HAS_GETPAGESIZE
-#endif
-
-#if defined(sun)
-#define HAS_GETPAGESIZE
-#endif
-
int
_XawGetPageSize(void)
{
@@ -45,7 +36,7 @@ _XawGetPageSize(void)
pagesize = sysconf(_SC_PAGE_SIZE);
#endif
-#ifdef HAS_GETPAGESIZE
+#ifdef HAVE_GETPAGESIZE
if (pagesize == -1)
pagesize = getpagesize();
#endif
commit b2e86875d03e349a4c85135e4cf41b26b99b083e
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Sat Nov 20 20:06:04 2010 -0800
convert header checks/ifdefs to autoconf standard AC_CHECK_HEADERS
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
Reviewed-by: Julien Cristau <jcris...@debian.org>
Reviewed-by: Gaetan Nadon <mems...@videotron.ca>
Tested-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/configure.ac b/configure.ac
index d793ea9..83b20b2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -90,15 +90,7 @@ AM_CONDITIONAL(BUILD_XAW7, [test x$build_v7 = xyes])
# Checks for header files.
AC_HEADER_STDC
-AC_CHECK_HEADER(wctype.h,
- AC_DEFINE([HAS_WCTYPE_H],1,
- [Define to 1 if you have the <wctype.h> header file.]))
-AC_CHECK_HEADER(wchar.h,
- AC_DEFINE([HAS_WCHAR_H],1,
- [Define to 1 if you have the <wchar.h> header file.]))
-AC_CHECK_HEADER(widec.h, [],
- AC_DEFINE([NO_WIDEC_H],1,
- [Define to 1 if you DO NOT have the <widec.h> header
file.]))
+AC_CHECK_HEADERS([wctype.h wchar.h widec.h])
# Checks for functions
AC_CHECK_FUNCS([iswalnum])
diff --git a/src/XawI18n.h b/src/XawI18n.h
index 09ab51b..d50171c 100644
--- a/src/XawI18n.h
+++ b/src/XawI18n.h
@@ -24,9 +24,9 @@ in this Software without prior written authorization from The
Open Group.
********************************************************/
-#ifdef HAS_WCTYPE_H
+#ifdef HAVE_WCTYPE_H
#include <wctype.h>
-#ifndef NO_WIDEC_H
+#ifdef HAVE_WIDEC_H
#include <widec.h>
#define wcslen(c) wslen(c)
#define wcscpy(d, s) wscpy(d, s)
@@ -34,7 +34,7 @@ in this Software without prior written authorization from The
Open Group.
#endif
#endif
-#ifdef HAS_WCHAR_H
+#ifdef HAVE_WCHAR_H
#include <wchar.h>
#endif
commit 41bf7992c45c6766c5982b3500b03d9c1b1fab87
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Sat Nov 20 19:54:54 2010 -0800
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Regroup AC statements under the Autoconf initialization section.
Regroup AM statements under the Automake initialization section.
Regroup XORG statements under the Xorg macros section.
Add missing AC_CONFIG_SRCDIR
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/configure.ac b/configure.ac
index e9bb45b..d793ea9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,20 +1,25 @@
dnl Process this file with autoconf to create configure.
+# Initialize Autoconf
AC_PREREQ([2.60])
+AC_INIT([libXaw], [1.0.8],
+ [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libXaw])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
-AC_INIT([libXaw],
- [1.0.8],
- [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg],
- libXaw)
-
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
-AM_CONFIG_HEADER(config.h)
# Require xorg-macros minimum of 1.10 for HAVE_STYLESHEETS in
XORG_CHECK_SGML_DOCTOOLS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.10 or later before running
autoconf/autogen])])
XORG_MACROS_VERSION(1.10)
+XORG_DEFAULT_OPTIONS
+XORG_ENABLE_SPECS
+XORG_WITH_XMLTO(0.0.20)
+XORG_WITH_FOP
+XORG_CHECK_SGML_DOCTOOLS(1.5)
# Check for progs
AC_PROG_LIBTOOL
@@ -25,12 +30,6 @@ AM_PROG_CC_C_O
# is in an if statement, and later calls would break if it's skipped.
PKG_PROG_PKG_CONFIG
-XORG_DEFAULT_OPTIONS
-XORG_ENABLE_SPECS
-XORG_WITH_XMLTO(0.0.20)
-XORG_WITH_FOP
-XORG_CHECK_SGML_DOCTOOLS(1.5)
-
#
# fix libtool to set SONAME to libXaw.so.$major
#
commit f85d4342cbfbb58764e24e202f3a7c95eaba3d77
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Sat Nov 20 19:52:41 2010 -0800
config: Remove unnecessary calls from configure.ac
AC_PROG_CC is provided by XORG_DEFAULT_OPTIONS now
PKG_CONFIG_MODULES handles AC_SUBST of the CFLAGS & LIBS variables
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/configure.ac b/configure.ac
index 8779b36..e9bb45b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -17,7 +17,6 @@ m4_ifndef([XORG_MACROS_VERSION],
XORG_MACROS_VERSION(1.10)
# Check for progs
-AC_PROG_CC
AC_PROG_LIBTOOL
AC_PROG_AWK
AM_PROG_CC_C_O
@@ -73,8 +72,6 @@ AC_ARG_ENABLE(xaw6, AC_HELP_STRING([--disable-xaw6],
if test "x$build_v6" = xyes; then
PKG_CHECK_MODULES(XAW6, xproto x11 xext xextproto xt xmu)
- AC_SUBST(XAW6_CFLAGS)
- AC_SUBST(XAW6_LIBS)
fi
@@ -86,8 +83,6 @@ AC_ARG_ENABLE(xaw7, AC_HELP_STRING([--disable-xaw7],
if test "x$build_v7" = xyes; then
PKG_CHECK_MODULES(XAW7, xproto x11 xext xextproto xt xmu xpm)
- AC_SUBST(XAW7_CFLAGS)
- AC_SUBST(XAW7_LIBS)
fi
commit 394a0c49c849e497cbcb987154ff796eb34f4820
Author: Alan Coopersmith <alan.coopersm...@oracle.com>
Date: Thu Nov 11 23:30:22 2010 -0800
specs/CH6.xml: Remove stray quote in chapter title
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/specs/CH6.xml b/specs/CH6.xml
index 3f9d518..e8009af 100644
--- a/specs/CH6.xml
+++ b/specs/CH6.xml
@@ -1,5 +1,5 @@
<chapter id="composite_and_constraint_widgets">
-<title>"Composite and Constraint Widgets</title>
+<title>Composite and Constraint Widgets</title>
<para>
These widgets may contain arbitrary widget children. They implement a
policy for the size and location of their children.
commit e9da4e6268b2cfbda793435caedc6403b2a918f0
Author: Gaetan Nadon <mems...@videotron.ca>
Date: Tue Nov 9 13:04:44 2010 -0500
config: HTML file generation: use the installed copy of xorg.css
Currenlty the xorg.css file is copied in each location
where a DocBook/XML file resides. This produces about
70 copies in the $(docdir) install tree.
Signed-off-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/specs/.gitignore b/specs/.gitignore
index 12fe512..6fa5c31 100644
--- a/specs/.gitignore
+++ b/specs/.gitignore
@@ -1,6 +1,4 @@
-# Add & Override for this directory and it's subdirectories
*.html
*.ps
*.pdf
*.txt
-*.css
diff --git a/specs/Makefile.am b/specs/Makefile.am
index bb34170..ebdbd72 100644
--- a/specs/Makefile.am
+++ b/specs/Makefile.am
@@ -82,11 +82,8 @@ doc_DATA += $(doc_sources:.xml=.txt)
endif
if HAVE_STYLESHEETS
-XMLTO_FLAGS = -m $(XSL_STYLESHEET)
-
-doc_DATA += xorg.css
-xorg.css: $(STYLESHEET_SRCDIR)/xorg.css
- $(AM_V_GEN)cp -pf $(STYLESHEET_SRCDIR)/xorg.css $@
+XMLTO_FLAGS = -m $(XSL_STYLESHEET) \
+ --stringparam html.stylesheet=$(STYLESHEET_SRCDIR)/xorg.css
endif
CLEANFILES = $(doc_DATA)
commit fd5ef2fb841903c0a7d59e56f8fe69d0974f964c
Author: Jeremy Huddleston <jerem...@apple.com>
Date: Tue Nov 2 09:52:34 2010 -0700
xaw6.pc: Only list xmu in Requires.private, not Requires
Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
Based on earlier similar change to xaw7.pc which was:
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
Tested-by: Gaetan Nadon <mems...@videotron.ca>
diff --git a/xaw6.pc.in b/xaw6.pc.in
index 537df32..cee7220 100644
--- a/xaw6.pc.in
+++ b/xaw6.pc.in
@@ -6,7 +6,7 @@ includedir=@includedir@
Name: Xaw
Description: X Athena Widgets Library, version 6
Version: @PACKAGE_VERSION@
-Requires: xproto xt xmu
+Requires: xproto xt
Requires.private: x11 xext xt xmu
Cflags: -I${includedir}
Libs: -L${libdir} -lXaw6
commit 5136e2aabb73fec3c1670616bf0ebf828a1a1ca9
Author: Cyril Brulebois <k...@debian.org>
Date: Thu Oct 28 00:29:30 2010 +0200
Fix missing <X11/Intrinsic.h> in XawInit.h
Configure scripts/test programs might have troubles detecting libXaw by
just including XawInit.h, since it doesn't include <X11/Intrinsic.h>,
even though it's needed for the Widget definition.
X.Org Bugzilla #3526 <https://bugs.freedesktop.org/show_bug.cgi?id=3526>
Signed-off-by: Cyril Brulebois <k...@debian.org>
Signed-off-by: Alan Coopersmith <alan.coopersm...@oracle.com>
diff --git a/include/X11/Xaw/XawInit.h b/include/X11/Xaw/XawInit.h
index 3d1359c..73226b2 100644
--- a/include/X11/Xaw/XawInit.h
+++ b/include/X11/Xaw/XawInit.h
@@ -36,6 +36,7 @@ in this Software without prior written authorization from The
Open Group.
typedef struct _XawDL XawDisplayList;
#endif /* OLDXAW */
+#include <X11/Intrinsic.h>
#include <X11/Xfuncproto.h>
_XFUNCPROTOBEGIN
commit 7b8196c9f7723b77b5d18fc1cc2070e557a7f767
Author: Jeremy Huddleston <jerem...@apple.com>
Date: Mon Oct 25 12:33:32 2010 -0700
Move -I CFLAGS to CPPFLAGS
Previously, setting CPPFLAGS at configure time could result in using the
installed headers rather than the ones included in the package.
Signed-off-by: Jeremy Huddleston <jerem...@apple.com>
diff --git a/src/Makefile.am b/src/Makefile.am
index a77bb13..3bc4b29 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -56,7 +56,9 @@ COMMON_SOURCES = \
XawI18n.h
COMMON_CFLAGS = \
- $(CWARNFLAGS) \
+ $(CWARNFLAGS)
+
+COMMON_CPPFLAGS = \
-I${top_srcdir}/include \
-I${top_srcdir}/include/X11/Xaw \
-DPROJECT_ROOT=\"$(prefix)\"
@@ -65,6 +67,9 @@ if BUILD_XAW6
lib_LTLIBRARIES += libXaw6.la
+libXaw6_la_CPPFLAGS = \
+ $(COMMON_CPPFLAGS)
+
libXaw6_la_CFLAGS = \
$(COMMON_CFLAGS) \
-DOLDXAW \
@@ -100,6 +105,9 @@ if BUILD_XAW7
lib_LTLIBRARIES += libXaw7.la
+libXaw7_la_CPPFLAGS = \
+ $(COMMON_CPPFLAGS)
+
libXaw7_la_CFLAGS = \
$(COMMON_CFLAGS) \
-DXAW7 \
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1pmbpl-000589...@alioth.debian.org
