rendercheck: 3 commits - autogen.sh configure.ac

Peter Hutterer whot at kemper.freedesktop.org
Thu Jan 26 01:04:33 UTC 2017


 autogen.sh   |   13 +++++++------
 configure.ac |    2 --
 2 files changed, 7 insertions(+), 8 deletions(-)

New commits:
commit 855f6762fafcc34000474ce781c7bcb54c0bf1bb
Author: Emil Velikov <emil.l.velikov at gmail.com>
Date:   Thu Jan 26 10:23:18 2017 +1000

    autogen.sh: use quoted string variables
    
    Place quotes around the $srcdir, $ORIGDIR and $0 variables to prevent
    fall-outs, when they contain space.
    
    Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/autogen.sh b/autogen.sh
index 785db85..5b20136 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,17 +1,17 @@
 #! /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 $?
 
 git config --local --get format.subjectPrefix ||
     git config --local format.subjectPrefix "PATCH rendercheck"
 
 if test -z "$NOCONFIGURE"; then
-    exec $srcdir/configure $@
+    exec "$srcdir"/configure "$@"
 fi
commit 708c55b8a3e30b4752250910612bb56fe26a0352
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Jan 26 10:18:15 2017 +1000

    autogen.sh: honor NOCONFIGURE=1
    
    We're using exec now, so shuffle it down.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/autogen.sh b/autogen.sh
index 5299039..785db85 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -7,10 +7,11 @@ ORIGDIR=`pwd`
 cd $srcdir
 
 autoreconf -v --install || exit 1
-
 cd $ORIGDIR || exit $?
 
-$srcdir/configure "$@"
-
 git config --local --get format.subjectPrefix ||
     git config --local format.subjectPrefix "PATCH rendercheck"
+
+if test -z "$NOCONFIGURE"; then
+    exec $srcdir/configure $@
+fi
commit 7aab513f31a31a5a3f7e4579c42e31855dbad01a
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Thu Jan 26 10:19:01 2017 +1000

    autogen.sh: drop --enable-maintainer-mode
    
    See xserver commit 4bf3eac5fe2: "All this does is make it so editing
    configure.ac or Makefile.am doesn't rebuild the makefiles.  Which is just
    stupid."
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/autogen.sh b/autogen.sh
index c262d6b..5299039 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,7 +10,7 @@ autoreconf -v --install || exit 1
 
 cd $ORIGDIR || exit $?
 
-$srcdir/configure --enable-maintainer-mode "$@"
+$srcdir/configure "$@"
 
 git config --local --get format.subjectPrefix ||
     git config --local format.subjectPrefix "PATCH rendercheck"
diff --git a/configure.ac b/configure.ac
index 8ad0b3b..2a42793 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,8 +10,6 @@ AC_INIT([rendercheck],
 AC_CONFIG_SRCDIR([Makefile.am])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
 
-AM_MAINTAINER_MODE
-
 # 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])])


More information about the xorg-commit mailing list