libdmx: Changes to 'debian-unstable'
ChangeLog | 75 +++++++++++++++++++++++++++++++++++++
Makefile.am | 6 +-
configure.ac | 74 ++++++++++++++++++------------------
debian/changelog | 6 ++
include/X11/extensions/dmxext.h | 2
man/DMXAddInput.man | 4 -
man/DMXAddScreen.man | 6 +-
man/DMXChangeDesktopAttributes.man | 2
man/DMXForceWindowCreation.man | 2
man/DMXGetInputAttributes.man | 4 -
man/DMXGetScreenAttributes.man | 6 +-
man/DMXGetScreenCount.man | 4 -
man/Makefile.am | 4 -
src/dmx.c | 20 ++++-----
14 files changed, 148 insertions(+), 67 deletions(-)
New commits:
commit 70ace426c2d7c009978b2b0f7b0ab82624fa2d4f
Author: Robert Hooker <sarvatt@ubuntu.com>
Date: Thu Mar 8 22:56:09 2012 -0500
Bump changelogs.
diff --git a/ChangeLog b/ChangeLog
index 11cca72..cdc3e13 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,78 @@
+commit 9f470c92bc2d194c8abb9154f42864e6c82f43ef
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Wed Mar 7 21:43:10 2012 -0800
+
+ libdmx 1.1.2
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 94c2e8ba375d968bd648097a484edac5d1c87c78
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Mar 2 17:38:24 2012 -0800
+
+ Stop casting away constness on dmx_extension_name
+
+ Fixes gcc warning:
+ dmx.c: In function 'find_display':
+ dmx.c:78:1: warning: cast discards qualifiers from pointer target type
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 19bea63b9b39d83da9b4aa277cc1db967a4928bd
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Fri Sep 16 22:06:15 2011 -0700
+
+ Strip trailing whitespace
+
+ Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
+ git diff -w & git diff -b show no diffs from this change
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 1ab0d436ceac0acef0cd97d8b280727b02062cc8
+Author: Alan Coopersmith <alan.coopersmith@oracle.com>
+Date: Tue May 17 20:32:38 2011 -0700
+
+ Fix various typos in man pages
+
+ Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
+
+commit 77701e9139f79db2e66026bebaab265a873b0856
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Wed Feb 2 11:43:46 2011 -0500
+
+ config: comment, minor upgrade, quote and layout configure.ac
+
+ Group statements per section as per Autoconf standard layout
+ Quote statements where appropriate.
+ Autoconf recommends not using dnl instead of # for comments
+
+ Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
+ Add AC_CONFIG_SRCDIR([Makefile.am])
+
+ This helps automated maintenance and release activities.
+ Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
+
+commit d970eb0954c0400bdab923c0b9c433b2f33dbe9d
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Fri Jan 28 19:41:37 2011 -0500
+
+ config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
+commit b865861d72a86024daec36c517a214e75ef4b973
+Author: Gaetan Nadon <memsize@videotron.ca>
+Date: Thu Jan 27 19:20:39 2011 -0500
+
+ config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
+
+ XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
+ AC_PROG_C_C99. This sets gcc with -std=gnu99.
+ If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
+
+ Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
+
commit 09d2ddd805a00568e4b7f668b0f500a63c350940
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Thu Oct 28 16:56:29 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index 6e67e5e..357af71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libdmx (1:1.1.2-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+
+ -- Robert Hooker <sarvatt@ubuntu.com> Thu, 08 Mar 2012 22:54:54 -0500
+
libdmx (1:1.1.1-1) unstable; urgency=low
[ Julien Cristau ]
commit 9f470c92bc2d194c8abb9154f42864e6c82f43ef
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Wed Mar 7 21:43:10 2012 -0800
libdmx 1.1.2
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/configure.ac b/configure.ac
index f47492e..24e03fc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@
# Initialize Autoconf
AC_PREREQ([2.60])
-AC_INIT([libdmx], [1.1.1],
+AC_INIT([libdmx], [1.1.2],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libdmx])
AC_CONFIG_SRCDIR([Makefile.am])
AC_CONFIG_HEADERS([config.h])
commit 94c2e8ba375d968bd648097a484edac5d1c87c78
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Mar 2 17:38:24 2012 -0800
Stop casting away constness on dmx_extension_name
Fixes gcc warning:
dmx.c: In function 'find_display':
dmx.c:78:1: warning: cast discards qualifiers from pointer target type
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/src/dmx.c b/src/dmx.c
index 7388458..201568e 100644
--- a/src/dmx.c
+++ b/src/dmx.c
@@ -76,7 +76,7 @@ static /* const */ XExtensionHooks dmx_extension_hooks = {
};
static XEXT_GENERATE_FIND_DISPLAY(find_display, dmx_extension_info,
- (char *)dmx_extension_name,
+ dmx_extension_name,
&dmx_extension_hooks,
0, NULL)
commit 19bea63b9b39d83da9b4aa277cc1db967a4928bd
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Fri Sep 16 22:06:15 2011 -0700
Strip trailing whitespace
Performed with: find * -type f | xargs perl -i -p -e 's{[ \t]+$}{}'
git diff -w & git diff -b show no diffs from this change
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/Makefile.am b/Makefile.am
index c1e1118..be67679 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
-#
+#
# Copyright 2005 Red Hat, Inc.
-#
+#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
@@ -10,7 +10,7 @@
# specific, written prior permission. Red Hat makes no
# representations about the suitability of this software for any purpose. It
# is provided "as is" without express or implied warranty.
-#
+#
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/include/X11/extensions/dmxext.h b/include/X11/extensions/dmxext.h
index 492aabf..93a1bfa 100644
--- a/include/X11/extensions/dmxext.h
+++ b/include/X11/extensions/dmxext.h
@@ -87,7 +87,7 @@ typedef enum {
} DMXInputEnum;
/** Client-library input information structure, returned by
- * #DMXGetInputAttributes. */
+ * #DMXGetInputAttributes. */
typedef struct {
DMXInputEnum inputType;
int physicalScreen;
diff --git a/man/DMXGetInputAttributes.man b/man/DMXGetInputAttributes.man
index 43c7e27..4a0b1cf 100644
--- a/man/DMXGetInputAttributes.man
+++ b/man/DMXGetInputAttributes.man
@@ -74,7 +74,7 @@ For local devices, all other fields returned, except
.I isCore " and " sendsCore ,
are invalid.
.PP
-For console devices,
+For console devices,
.I physicalScreen " and " physicalID
will be invalid, and
.I name
diff --git a/man/Makefile.am b/man/Makefile.am
index c1027c0..c2129c9 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,5 @@
# Copyright 2005 Red Hat, Inc.
-#
+#
# Permission to use, copy, modify, distribute, and sell this software and its
# documentation for any purpose is hereby granted without fee, provided that
# the above copyright notice appear in all copies and that both that
@@ -9,7 +9,7 @@
# specific, written prior permission. Red Hat makes no representations about
# the suitability of this software for any purpose. It is provided "as is" without
# express or implied warranty.
-#
+#
# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
diff --git a/src/dmx.c b/src/dmx.c
index 6167a01..7388458 100644
--- a/src/dmx.c
+++ b/src/dmx.c
@@ -251,7 +251,7 @@ Bool DMXGetScreenAttributes(Display *dpy, int physical_screen,
_XReadPad(dpy, attr->displayName, rep.displayNameLength);
attr->displayName[rep.displayNameLength] = '\0';
attr->logicalScreen = rep.logicalScreen;
-
+
attr->screenWindowWidth = rep.screenWindowWidth;
attr->screenWindowHeight = rep.screenWindowHeight;
attr->screenWindowXoffset = rep.screenWindowXoffset;
@@ -293,7 +293,7 @@ static int _DMXDumpScreenAttributes(Display *dpy,
unsigned long value_list[32];
unsigned long *value = value_list;
int count = 0;
-
+
for (i = 0; i < 32; i++) {
if (mask & (1 << i)) {
*value++ = _DMXGetScreenAttribute(i, attr);
@@ -383,7 +383,7 @@ int DMXChangeScreensAttributes(Display *dpy,
if (i < mask_count) mask = masks[i];
req->length += _DMXDumpScreenAttributes(dpy, mask, attrs + i);
}
-
+
if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
@@ -518,7 +518,7 @@ Bool DMXGetWindowAttributes(Display *dpy, Window window,
_XRead(dpy, (char *)windows, rep.screenCount * sizeof(*windows));
_XRead(dpy, (char *)pos, rep.screenCount * sizeof(*pos));
_XRead(dpy, (char *)vis, rep.screenCount * sizeof(*vis));
-
+
*screen_count = rep.screenCount;
for (current = 0;
current < rep.screenCount && current < (unsigned)available_count;
@@ -590,7 +590,7 @@ static int _DMXDumpDesktopAttributes(Display *dpy,
unsigned long value_list[32];
unsigned long *value = value_list;
int count = 0;
-
+
for (i = 0; i < 32; i++) {
if (mask & (1 << i)) {
*value++ = _DMXGetDesktopAttribute(i, attr);
@@ -606,7 +606,7 @@ static int _DMXDumpDesktopAttributes(Display *dpy,
* Available in DMX Protocol Version 2.0 */
int DMXChangeDesktopAttributes(Display *dpy,
unsigned int mask,
- DMXDesktopAttributes *attr)
+ DMXDesktopAttributes *attr)
{
XExtDisplayInfo *info = find_display(dpy);
xDMXChangeDesktopAttributesReply rep;
@@ -620,7 +620,7 @@ int DMXChangeDesktopAttributes(Display *dpy,
req->dmxReqType = X_DMXChangeDesktopAttributes;
req->valueMask = mask;
req->length +=_DMXDumpDesktopAttributes(dpy, mask, attr);
-
+
if (!_XReply(dpy, (xReply *)&rep, 0, xFalse)) {
UnlockDisplay(dpy);
SyncHandle();
@@ -754,7 +754,7 @@ Bool DMXAddBackendInput(Display *dpy, int screen, int sendsCore, int *newId)
unsigned int mask = (DMXInputType
| DMXInputPhysicalScreen
| DMXInputSendsCore);
-
+
attr.inputType = DMXBackendInputType;
attr.physicalScreen = screen;
attr.sendsCore = sendsCore;
@@ -769,7 +769,7 @@ Bool DMXAddConsoleInput(Display *dpy, const char *name, int sendsCore,
DMXInputAttributes attr;
unsigned int mask = (DMXInputType
| DMXInputSendsCore);
-
+
attr.inputType = DMXConsoleInputType;
attr.physicalScreen = 0;
attr.sendsCore = sendsCore;
commit 1ab0d436ceac0acef0cd97d8b280727b02062cc8
Author: Alan Coopersmith <alan.coopersmith@oracle.com>
Date: Tue May 17 20:32:38 2011 -0700
Fix various typos in man pages
Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com>
diff --git a/man/DMXAddInput.man b/man/DMXAddInput.man
index 287f9c3..5b0f834 100644
--- a/man/DMXAddInput.man
+++ b/man/DMXAddInput.man
@@ -82,8 +82,8 @@ typedef struct {
.fi
.PP
.I inputType
-may bave the value
-.B DmxConsoleInputType " or " DmxBackendInputType .
+may have the value
+.B DMXConsoleInputType " or " DMXBackendInputType .
.PP
For console devices,
.I name
diff --git a/man/DMXAddScreen.man b/man/DMXAddScreen.man
index e5859c3..a148af9 100644
--- a/man/DMXAddScreen.man
+++ b/man/DMXAddScreen.man
@@ -55,9 +55,9 @@ screen number for the attached screen.
The information stored in
.I mask " and " attr
is identical to that used by the
-.BR DMXChangeScreenAttributes (__libmansuffix__)
+.BR DMXChangeScreensAttributes (__libmansuffix__)
and
-.BR DMXGetScreenAttribues (__libmansuffix__)
+.BR DMXGetScreenAttributes (__libmansuffix__)
functions.
.SH "RETURN VALUE"
.B DMXAddScreen()
@@ -98,5 +98,5 @@ API, this function uses
for both input and output.
.SH "SEE ALSO"
.BR DMXRemoveScreen "(__libmansuffix__), "
-.BR DMXChangeScreenAttributes "(__libmansuffix__), " DMXGetScreenAttributes "(__libmansuffix__), "
+.BR DMXChangeScreensAttributes "(__libmansuffix__), " DMXGetScreenAttributes "(__libmansuffix__), "
.BR DMX "(__libmansuffix__), " Xdmx (1)
diff --git a/man/DMXChangeDesktopAttributes.man b/man/DMXChangeDesktopAttributes.man
index 0291d43..eebfe82 100644
--- a/man/DMXChangeDesktopAttributes.man
+++ b/man/DMXChangeDesktopAttributes.man
@@ -77,7 +77,7 @@ is not specified, the current values will be used. If
.I shiftX " or " shiftY
is not specified, 0 will be used.
.PP
-All coordinants are in the global DMX coordinant system. If Xinerama is
+All coordinates are in the global DMX coordinate system. If Xinerama is
not active, an error will be generated.
.SH "RETURN VALUE"
.B DMXChangeDesktopAttributes()
diff --git a/man/DMXForceWindowCreation.man b/man/DMXForceWindowCreation.man
index f90b051..01ad470 100644
--- a/man/DMXForceWindowCreation.man
+++ b/man/DMXForceWindowCreation.man
@@ -41,7 +41,7 @@ forces the immediate creation of the window requested.
returns
.B True
unless there is a protocol error.
-.B DMXForceWindwoCreation()
+.B DMXForceWindowCreation()
can generate
.B BadWindow
errors.
diff --git a/man/DMXGetInputAttributes.man b/man/DMXGetInputAttributes.man
index 6699147..43c7e27 100644
--- a/man/DMXGetInputAttributes.man
+++ b/man/DMXGetInputAttributes.man
@@ -38,7 +38,7 @@ returns information about the input device specified with
.IR id .
This information cannot be
obtained from the
-.BR XListInputDeivices (__libmansuffix__)
+.BR XListInputDevices (__libmansuffix__)
call.
.I id
is the same as that used by the
diff --git a/man/DMXGetScreenAttributes.man b/man/DMXGetScreenAttributes.man
index e4c0f56..e7a1fd1 100644
--- a/man/DMXGetScreenAttributes.man
+++ b/man/DMXGetScreenAttributes.man
@@ -83,14 +83,14 @@ coordinate system. Otherwise, these values are set to 0.
are a geometry specification (see
.BR X (7x))
for the location of the DMX screen on the back-end screen. The
-coordinant system of the back-end display is used for these values.
+coordinate system of the back-end display is used for these values.
.PP
.IR rootWindowWidth ", " rootWindowHeight ", "
.IR rootWindowXoffset ", and " rootWindowYoffset
are a geometry specification (see
.BR X (7x))
for the location of the root window on the screen window. The
-coordinant system of the screen window is used. In most cases, the root
+coordinate system of the screen window is used. In most cases, the root
window will have the same geometry as the DMX screen window, and will
occupy the same area of the back-end display. (This would not be the
case, for example, if automatic projector alignment is used.)
@@ -106,5 +106,5 @@ can generate
errors.
.SH "SEE ALSO"
.BR DMXGetScreenCount "(__libmansuffix__), "
-.BR DMXChangeScreenAttributes "(__libmansuffix__), "
+.BR DMXChangeScreensAttributes "(__libmansuffix__), "
.BR DMX "(__libmansuffix__), " Xdmx (1)
diff --git a/man/DMXGetScreenCount.man b/man/DMXGetScreenCount.man
index edcfaff..279f1f3 100644
--- a/man/DMXGetScreenCount.man
+++ b/man/DMXGetScreenCount.man
@@ -61,6 +61,6 @@ composite back-end screens that the
.BR Xdmx (1)
server is using.
.SH "SEE ALSO"
-.BR DMXGetScreenAttribtues "(__libmansuffix__), "
-.BR DMXChangeScreenAttributes "(__libmansuffix__), "
+.BR DMXGetScreenAttributes "(__libmansuffix__), "
+.BR DMXChangeScreensAttributes "(__libmansuffix__), "
.BR DMX "(__libmansuffix__), " Xdmx (1)
commit 77701e9139f79db2e66026bebaab265a873b0856
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Wed Feb 2 11:43:46 2011 -0500
config: comment, minor upgrade, quote and layout configure.ac
Group statements per section as per Autoconf standard layout
Quote statements where appropriate.
Autoconf recommends not using dnl instead of # for comments
Use AC_CONFIG_FILES to replace the deprecated AC_OUTPUT with parameters.
Add AC_CONFIG_SRCDIR([Makefile.am])
This helps automated maintenance and release activities.
Details can be found in http://wiki.x.org/wiki/NewModuleGuidelines
diff --git a/configure.ac b/configure.ac
index 27af157..f47492e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,49 +1,50 @@
-
-dnl Copyright 2005 Red Hat, Inc.
-dnl
-dnl Permission to use, copy, modify, distribute, and sell this software and its
-dnl documentation for any purpose is hereby granted without fee, provided that
-dnl the above copyright notice appear in all copies and that both that
-dnl copyright notice and this permission notice appear in supporting
-dnl documentation, and that the name of Red Hat not be used in
-dnl advertising or publicity pertaining to distribution of the software without
-dnl specific, written prior permission. Red Hat makes no
-dnl representations about the suitability of this software for any purpose. It
-dnl is provided "as is" without express or implied warranty.
-dnl
-dnl RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
-dnl INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
-dnl EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
-dnl CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
-dnl DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
-dnl TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
-dnl PERFORMANCE OF THIS SOFTWARE.
-dnl
-dnl Process this file with autoconf to create configure.
-
+# Copyright 2005 Red Hat, Inc.
+#
+# Permission to use, copy, modify, distribute, and sell this software and its
+# documentation for any purpose is hereby granted without fee, provided that
+# the above copyright notice appear in all copies and that both that
+# copyright notice and this permission notice appear in supporting
+# documentation, and that the name of Red Hat not be used in
+# advertising or publicity pertaining to distribution of the software without
+# specific, written prior permission. Red Hat makes no
+# representations about the suitability of this software for any purpose. It
+# is provided "as is" without express or implied warranty.
+#
+# RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE,
+# INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO
+# EVENT SHALL RED HAT BE LIABLE FOR ANY SPECIAL, INDIRECT OR
+# CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+# DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+# TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+# PERFORMANCE OF THIS SOFTWARE.
+#
+
+# Initialize Autoconf
AC_PREREQ([2.60])
-
AC_INIT([libdmx], [1.1.1],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], [libdmx])
+AC_CONFIG_SRCDIR([Makefile.am])
+AC_CONFIG_HEADERS([config.h])
+
+# Initialize Automake
AM_INIT_AUTOMAKE([foreign dist-bzip2])
AM_MAINTAINER_MODE
+# Initialize libtool
+AC_PROG_LIBTOOL
+
# Require X.Org macros 1.8 or later for MAN_SUBSTS set by XORG_MANPAGE_SECTIONS
m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AC_CONFIG_HEADERS(config.h)
-
-# Check for progs
-AC_PROG_LIBTOOL
+XORG_CHECK_MALLOC_ZERO
-# Check for dependencies
+# Obtain compiler/linker options for depedencies
PKG_CHECK_MODULES(DMX, x11 xext xextproto [dmxproto >= 2.2.99.1])
-XORG_CHECK_MALLOC_ZERO
-
-AC_OUTPUT([Makefile
- src/Makefile
- man/Makefile
- dmx.pc])
+AC_CONFIG_FILES([Makefile
+ src/Makefile
+ man/Makefile
+ dmx.pc])
+AC_OUTPUT
commit d970eb0954c0400bdab923c0b9c433b2f33dbe9d
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Fri Jan 28 19:41:37 2011 -0500
config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index 2b024f7..27af157 100644
--- a/configure.ac
+++ b/configure.ac
@@ -33,7 +33,7 @@ m4_ifndef([XORG_MACROS_VERSION],
[m4_fatal([must install xorg-macros 1.8 or later before running autoconf/autogen])])
XORG_MACROS_VERSION(1.8)
XORG_DEFAULT_OPTIONS
-AM_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS(config.h)
# Check for progs
AC_PROG_LIBTOOL
commit b865861d72a86024daec36c517a214e75ef4b973
Author: Gaetan Nadon <memsize@videotron.ca>
Date: Thu Jan 27 19:20:39 2011 -0500
config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
AC_PROG_C_C99. This sets gcc with -std=gnu99.
If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
diff --git a/configure.ac b/configure.ac
index dbda5ea..2b024f7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,7 +36,6 @@ XORG_DEFAULT_OPTIONS
AM_CONFIG_HEADER(config.h)
# Check for progs
-AC_PROG_CC
AC_PROG_LIBTOOL
# Check for dependencies
Reply to: