From 77c12827c214065350d417acc01e383a711b4c1f Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Mon, 21 Sep 2020 10:36:27 +0200
Subject: [PATCH] MISC: Show more informations in lkt_show_config
---
configure | 7 +++++--
configure.ac | 7 +++++--
2 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/configure b/configure
index da92aded..c997750d 100755
--- a/configure
+++ b/configure
@@ -13627,7 +13627,7 @@ fi
# CFLAGS #
##########
-BASEFLAGS="-Werror -Wall"
+BASEFLAGS="-Werror -Wall -Wextra"
if test "x${LKT_DEBUG_ENABLED}" = "xyes" ; then
BASEFLAGS="${BASEFLAGS} -g"
else
@@ -16002,12 +16002,15 @@ fi
################
AFF_CFLAGS=$(echo $CFLAGS | sed -e "s+$PWD+\$BUILD_PATH+g")
+AFF_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+AFF_VERSION=$(git -C $LKT_PATH_SOURCE rev-list --count HEAD).$(git -C $LKT_PATH_SOURCE rev-parse --short HEAD)
LKT_CONFIG_RESULT="
########## Lektor configuration ###########
#
# Configure run on..... $(date)
# Compiler C........... $(basename $CC)
-# Version.............. mk7.$(git -C $LKT_PATH_SOURCE rev-list --count HEAD).$(git -C $LKT_PATH_SOURCE rev-parse --short HEAD)
+# Version.............. mk7.$AFF_VERSION
+# Branch............... $AFF_BRANCH
#
### Build options
#
diff --git a/configure.ac b/configure.ac
index 3ac6d1ea..711dc54e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -124,7 +124,7 @@ fi
# CFLAGS #
##########
-BASEFLAGS="-Werror -Wall"
+BASEFLAGS="-Werror -Wall -Wextra"
if test "x${LKT_DEBUG_ENABLED}" = "xyes" ; then
BASEFLAGS="${BASEFLAGS} -g"
else
@@ -166,12 +166,15 @@ AC_OUTPUT([
################
AFF_CFLAGS=$(echo $CFLAGS | sed -e "s+$PWD+\$BUILD_PATH+g")
+AFF_BRANCH=$(git rev-parse --abbrev-ref HEAD)
+AFF_VERSION=$(git -C $LKT_PATH_SOURCE rev-list --count HEAD).$(git -C $LKT_PATH_SOURCE rev-parse --short HEAD)
LKT_CONFIG_RESULT="
########## Lektor configuration ###########
#
# Configure run on..... $(date)
# Compiler C........... $(basename $CC)
-# Version.............. mk7.$(git -C $LKT_PATH_SOURCE rev-list --count HEAD).$(git -C $LKT_PATH_SOURCE rev-parse --short HEAD)
+# Version.............. mk7.$AFF_VERSION
+# Branch............... $AFF_BRANCH
#
### Build options
#
--
GitLab