diff options
| author | marha <marha@users.sourceforge.net> | 2012-04-20 17:39:30 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-04-20 17:39:30 +0200 |
| commit | ae228baa2cfe88bd7c7de40d5038ad2cc1ecffa4 (patch) | |
| tree | b18ae337e913f36a95f97530f6a792e9366a393c /xorg-server/xkeyboard-config/autogen.sh | |
| parent | 4207bc7b2972aed9a45756fae8c48957d323fa21 (diff) | |
| parent | 0e3699334faf92f508b6c187a261548b656b0dd3 (diff) | |
| download | vcxsrv-ae228baa2cfe88bd7c7de40d5038ad2cc1ecffa4.tar.gz vcxsrv-ae228baa2cfe88bd7c7de40d5038ad2cc1ecffa4.tar.bz2 vcxsrv-ae228baa2cfe88bd7c7de40d5038ad2cc1ecffa4.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/dix/dispatch.c
xorg-server/dix/resource.c
Diffstat (limited to 'xorg-server/xkeyboard-config/autogen.sh')
| -rw-r--r-- | xorg-server/xkeyboard-config/autogen.sh | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xorg-server/xkeyboard-config/autogen.sh b/xorg-server/xkeyboard-config/autogen.sh index f9cd42b58..f9c238482 100644 --- a/xorg-server/xkeyboard-config/autogen.sh +++ b/xorg-server/xkeyboard-config/autogen.sh @@ -6,9 +6,8 @@ test -z "$srcdir" && srcdir=. ORIGDIR=`pwd` cd $srcdir -intltoolize +autopoint --force +AUTOPOINT='intltoolize --automake --copy' autoreconf -v --install --force || exit 1 -autoreconf -v --install || exit 1 cd $ORIGDIR || exit $? - $srcdir/configure --enable-maintainer-mode "$@" |