libxkbcommon build system updates
The following changes since commit f94a64cc08b47cdbfdfea5b5756340246fc391ed: Link with -no-undefined (2010-10-26 14:11:38 -0400) are available in the git repository at: git://dev.medozas.de/libxkbcommon master Jan Engelhardt (5): build: use AC_CONFIG_MACRO_DIR as per libtoolize warning build: use proper quoting in autogen.sh build: run autoupdate xkbscan: resolve build warning/rpmlint error Update .gitignore .gitignore | 34 +- Makefile.am |2 ++ autogen.sh |8 configure.ac |8 +--- m4/.gitignore|2 ++ src/xkbcomp/parseutils.h |4 ++-- src/xkbcomp/xkbscan.l|2 +- 7 files changed, 33 insertions(+), 27 deletions(-) create mode 100644 m4/.gitignore ___ xorg@lists.freedesktop.org: X.Org support Archives: http://lists.freedesktop.org/archives/xorg Info: http://lists.freedesktop.org/mailman/listinfo/xorg Your subscription address: arch...@mail-archive.com
[PATCH 2/5] build: use proper quoting in autogen.sh
Signed-off-by: Jan Engelhardt jeng...@medozas.de --- autogen.sh |8 1 files changed, 4 insertions(+), 4 deletions(-) diff --git a/autogen.sh b/autogen.sh index 904cd67..90d2520 100755 --- a/autogen.sh +++ b/autogen.sh @@ -1,12 +1,12 @@ #! /bin/sh -srcdir=`dirname $0` +srcdir=`dirname $0` test -z $srcdir srcdir=. ORIGDIR=`pwd` -cd $srcdir +cd $srcdir autoreconf -v --install || exit 1 -cd $ORIGDIR || exit $? +cd $ORIGDIR || exit $? -$srcdir/configure --enable-maintainer-mode $@ +exec $srcdir/configure --enable-maintainer-mode $@ -- 1.7.1 ___ xorg@lists.freedesktop.org: X.Org support Archives: http://lists.freedesktop.org/archives/xorg Info: http://lists.freedesktop.org/mailman/listinfo/xorg Your subscription address: arch...@mail-archive.com
[PATCH 3/5] build: run autoupdate
Signed-off-by: Jan Engelhardt jeng...@medozas.de
---
configure.ac |7 ---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/configure.ac b/configure.ac
index 7669027..56fb27b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -20,7 +20,7 @@ dnl PERFORMANCE OF THIS SOFTWARE.
dnl
dnl Process this file with autoconf to create configure.
-AC_PREREQ([2.57])
+AC_PREREQ([2.65])
AC_INIT([libxkbcommon], [0.1.0],
[https://bugs.freedesktop.org/enter_bug.cgi?product=xorg])
AM_INIT_AUTOMAKE([dist-bzip2 foreign])
@@ -86,7 +86,7 @@ AC_SUBST([XF86KEYSYM_H])
AC_SUBST([KS_HEADERS], ['$(KEYSYMDEF_H) $(XF86KEYSYM_H)'])
AC_ARG_WITH([xkb_config_root],
-[AC_HELP_STRING([--with-xkb-config-root=paths],
+[AS_HELP_STRING([--with-xkb-config-root=paths],
[Set default XKB config root (default: ${datadir}/X11/xkb)])],
[XKBCONFIGROOT=$withval],
[XKBCONFIGROOT='${datadir}/X11/xkb'])
@@ -95,7 +95,7 @@ AC_SUBST([XKBCONFIGROOT])
XORG_RELEASE_VERSION
XORG_CHANGELOG
-AC_OUTPUT([
+AC_CONFIG_FILES([
Makefile
xkbcommon.pc
include/Makefile
@@ -104,3 +104,4 @@ src/makekeys/Makefile
src/xkbcomp/Makefile
test/Makefile
])
+AC_OUTPUT
--
1.7.1
___
xorg@lists.freedesktop.org: X.Org support
Archives: http://lists.freedesktop.org/archives/xorg
Info: http://lists.freedesktop.org/mailman/listinfo/xorg
Your subscription address: arch...@mail-archive.com
[PATCH 4/5] xkbscan: resolve build warning/rpmlint error
xkbscan.l: In function 'setScanState':
xkbscan.l:201:1: warning: control reaches end of non-void function
I: Program returns random data in a function
E: libxkbcommon no-return-in-nonvoid-function xkbscan.l:201
Change return type of setScanState to void, since a return value is
never used by its callers.
Signed-off-by: Jan Engelhardt jeng...@medozas.de
---
src/xkbcomp/parseutils.h |4 ++--
src/xkbcomp/xkbscan.l|2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/xkbcomp/parseutils.h b/src/xkbcomp/parseutils.h
index 6169b87..9cf5097 100644
--- a/src/xkbcomp/parseutils.h
+++ b/src/xkbcomp/parseutils.h
@@ -191,8 +191,8 @@ extern void yyerror(const char */* s */
extern int yylex(void);
extern int yyparse(void);
-extern int setScanState(char * /* file */ ,
-int /* line */
+extern void setScanState(char * /* file */ ,
+ int /* line */
);
extern FILE *yyin;
diff --git a/src/xkbcomp/xkbscan.l b/src/xkbcomp/xkbscan.l
index 0d3cab6..5ffec1b 100644
--- a/src/xkbcomp/xkbscan.l
+++ b/src/xkbcomp/xkbscan.l
@@ -193,7 +193,7 @@ yyerror(const char *s)
return;
}
-int setScanState(char *file, int lineno)
+void setScanState(char *file, int lineno)
{
yylineno = 1;
scanFile = file;
--
1.7.1
___
xorg@lists.freedesktop.org: X.Org support
Archives: http://lists.freedesktop.org/archives/xorg
Info: http://lists.freedesktop.org/mailman/listinfo/xorg
Your subscription address: arch...@mail-archive.com
[PATCH 1/5] build: use AC_CONFIG_MACRO_DIR as per libtoolize warning
libtoolize: Consider adding AC_CONFIG_MACRO_DIR([m4]) to configure.ac and libtoolize: rerunning libtoolize, to keep the correct libtool macros in-tree. libtoolize: Consider adding -I m4 to ACLOCAL_AMFLAGS in Makefile.am. Signed-off-by: Jan Engelhardt jeng...@medozas.de --- Makefile.am |2 ++ configure.ac |1 + m4/.gitignore |2 ++ 3 files changed, 5 insertions(+), 0 deletions(-) create mode 100644 m4/.gitignore diff --git a/Makefile.am b/Makefile.am index 6c97739..80a4553 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,3 +1,5 @@ +ACLOCAL_AMFLAGS = -I m4 + SUBDIRS = include src test pkgconfigdir = $(libdir)/pkgconfig diff --git a/configure.ac b/configure.ac index 670700f..7669027 100644 --- a/configure.ac +++ b/configure.ac @@ -26,6 +26,7 @@ AC_INIT([libxkbcommon], [0.1.0], AM_INIT_AUTOMAKE([dist-bzip2 foreign]) AM_SILENT_RULES([yes]) AC_CONFIG_HEADERS([src/config.h]) +AC_CONFIG_MACRO_DIR([m4]) AC_PROG_LIBTOOL AC_PROG_CC diff --git a/m4/.gitignore b/m4/.gitignore new file mode 100644 index 000..8d0c756 --- /dev/null +++ b/m4/.gitignore @@ -0,0 +1,2 @@ +/lt*.m4 +/libtool.m4 -- 1.7.1 ___ xorg@lists.freedesktop.org: X.Org support Archives: http://lists.freedesktop.org/archives/xorg Info: http://lists.freedesktop.org/mailman/listinfo/xorg Your subscription address: arch...@mail-archive.com
[PATCH 5/5] Update .gitignore
Limit exclusion of files to their respective directory that they can appear in. Signed-off-by: Jan Engelhardt jeng...@medozas.de --- .gitignore | 34 +- 1 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.gitignore b/.gitignore index a640dea..9f41f50 100644 --- a/.gitignore +++ b/.gitignore @@ -1,23 +1,23 @@ *.lo *.o -ChangeLog -INSTALL +/ChangeLog +/INSTALL Makefile Makefile.in -aclocal.m4 -autom4te.cache/ -config.guess -config.log -config.status -config.sub -configure -depcomp -install-sh -libtool -ltmain.sh -missing -stamp-h1 -xkbcommon.pc -ylwrap +/aclocal.m4 +/autom4te.cache/ +/config.guess +/config.log +/config.status +/config.sub +/configure +/depcomp +/install-sh +/libtool +/ltmain.sh +/missing +/stamp-h1 +/xkbcommon.pc +/ylwrap .deps/ .libs/ -- 1.7.1 ___ xorg@lists.freedesktop.org: X.Org support Archives: http://lists.freedesktop.org/archives/xorg Info: http://lists.freedesktop.org/mailman/listinfo/xorg Your subscription address: arch...@mail-archive.com
Re: [PATCH 1/5] build: use AC_CONFIG_MACRO_DIR as per libtoolize warning
On Sunday 2010-11-28 19:45, Gaetan Nadon wrote: On Sun, 2010-11-28 at 15:46 +0100, Jan Engelhardt wrote: +ACLOCAL_AMFLAGS = -I m4 This will fail if m4 does not exist at clone time. It won't because there is a .gotognore file in there. However, it will be suggested later to use the same toplevel .gitignore file that is used in all other 240 xorg modules. Then perhaps you need to update the master xorg .gitignore, because the suggestion to use ACLOACL_AMFLAGS will appear on any project with a libtool library. ___ xorg@lists.freedesktop.org: X.Org support Archives: http://lists.freedesktop.org/archives/xorg Info: http://lists.freedesktop.org/mailman/listinfo/xorg Your subscription address: arch...@mail-archive.com
Resolution 1360x768 not selected
Hi, I need assistance in finding out just why on earth xorg decides not to use 1360x768 despite the monitor returning this in the DDC and having it in the Modes/PreferredMode option. Xorg.0.log: http://pastebin.ca/1329034 xorg.conf: http://pastebin.ca/1329035 ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: Resolution 1360x768 not selected
On Monday 2009-02-09 12:47, Jan Engelhardt wrote: I need assistance in finding out just why on earth xorg decides not to use 1360x768 despite the monitor returning this in the DDC and having it in the Modes/PreferredMode option. Xorg.0.log: http://pastebin.ca/1329034 xorg.conf: http://pastebin.ca/1329035 I sort of solved this, but not quite happy with how it's done. Quoting xorg.conf(5): Specifying video modes is optional because the server will use the DDC or other information provided by the monitor to automatically configure the list of modes available. Further, When modes are specified explicitly in the Monitor section (with the Modes, ModeLine, or UseModes keywords), built-in modes with the same names are not included. So according to this, removing the explicit ModeLines should give priority to the DDC-provided modes. But - the PreferredMode or Subsection Display Modes list will _NOT_ make use of these DDC modes, leaving me to having to explicitly specify the ModeLine for 1360x768 (at least that dose work). That is _bad_. ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
Re: Resolution 1360x768 not selected
On Monday 2009-02-09 16:33, Bill Crawford wrote: On Monday 09 February 2009 11:47:44 Jan Engelhardt wrote: Hi, I need assistance in finding out just why on earth xorg decides not to use 1360x768 despite the monitor returning this in the DDC and having it in the Modes/PreferredMode option. Xorg.0.log: http://pastebin.ca/1329034 xorg.conf: http://pastebin.ca/1329035 But that log appears to show the server using that mode (lines 779 onwards show 1360 x 768 mode being set)? As I found out [ http://lists.freedesktop.org/archives/xorg/2009-February/043598.html ] it did not use 1360x768 because it seems that the Modes option in the Display subsection completely ignores DDC-obtained modelines. ___ xorg mailing list xorg@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/xorg
