From 72a0d33a73a7b00d07372225fb91c73e158c87a5 Mon Sep 17 00:00:00 2001
From: Kubat <mael.martin31@gmail.com>
Date: Mon, 21 Sep 2020 16:27:01 +0200
Subject: [PATCH] MISC: Fix compilation

- lktmodule.h include correct .c files when building not in static
  module mode
- define the endiannes defines with the integer 1 when ok
- fix lkt_show_config
- fix configure.ac for CFLAGS settings
---
 configure              | 17 ++++++-----------
 configure.ac           | 17 ++++++-----------
 inc/lektor/lktmodule.h |  8 ++++----
 3 files changed, 16 insertions(+), 26 deletions(-)

diff --git a/configure b/configure
index fe480525..a3110380 100755
--- a/configure
+++ b/configure
@@ -13610,14 +13610,14 @@ LKT_ENDIANES_LITTLE="$(echo -n I | od -to2 | head -n1 | cut -f2 -d" " | cut -c6)
 if test "$LKT_ENDIANES_LITTLE" = "1" ; then
 
 cat >>confdefs.h <<_ACEOF
-#define LKT_ENDIANES_LITTLE /**/
+#define LKT_ENDIANES_LITTLE 1
 _ACEOF
 
 
 else
 
 cat >>confdefs.h <<_ACEOF
-#define LKT_ENDIANES_BIG /**/
+#define LKT_ENDIANES_BIG 1
 _ACEOF
 
 
@@ -13627,13 +13627,8 @@ fi
 # CFLAGS #
 ##########
 
-BASEFLAGS="-Werror -Wall -Wextra"
-if test "x${LKT_DEBUG_ENABLED}" = "xyes" ; then
-    BASEFLAGS="${BASEFLAGS} -g"
-else
-    BASEFLAGS="${BASEFLAGS} -O3"
-fi
-CFLAGS="${CFLAGS} ${BASEFLAGS} -std=c11"
+BASEFLAGS=`test "x${LKT_DEBUG_ENABLED}" = 'xyes' && echo "-g" || echo "-O3"`
+CFLAGS="-Werror -Wall -Wextra ${BASEFLAGS} -std=c11"
 
 #################################
 # BUILD WITH THE DEPENDS SCRIPT #
@@ -16010,7 +16005,6 @@ fi
 # CONF RESULTS #
 ################
 
-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="
@@ -16024,7 +16018,8 @@ LKT_CONFIG_RESULT="
 ### Build options
 #
 # Modules.............. $(test $LKT_STATIC_MODULE = 'yes' && echo static || echo not static)
-# C Flags.............. $AFF_CFLAGS
+# C Flags.............. $CFLAGS
+# LD Flags............. $LDFLAGS
 # To link against...... -Wl,-rpath -Wl,$prefix/lib
 # Builtin depends...... $LKT_BUILD_DEPENDS
 #
diff --git a/configure.ac b/configure.ac
index be43146c..613902d0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,10 +113,10 @@ AC_SUBST([LKT_BUILD_STRING])
 
 LKT_ENDIANES_LITTLE="$(echo -n I | od -to2 | head -n1 | cut -f2 -d" " | cut -c6)"
 if test "$LKT_ENDIANES_LITTLE" = "1" ; then
-    AC_DEFINE_UNQUOTED([LKT_ENDIANES_LITTLE], [], [Little endian])
+    AC_DEFINE_UNQUOTED([LKT_ENDIANES_LITTLE], [1], [Little endian])
     AC_SUBST([LKT_ENDIANES_LITTLE])
 else
-    AC_DEFINE_UNQUOTED([LKT_ENDIANES_BIG], [], [Big endian])
+    AC_DEFINE_UNQUOTED([LKT_ENDIANES_BIG], [1], [Big endian])
     AC_SUBST([LKT_ENDIANES_BIG])
 fi
 
@@ -124,13 +124,8 @@ fi
 # CFLAGS #
 ##########
 
-BASEFLAGS="-Werror -Wall -Wextra"
-if test "x${LKT_DEBUG_ENABLED}" = "xyes" ; then
-    BASEFLAGS="${BASEFLAGS} -g"
-else
-    BASEFLAGS="${BASEFLAGS} -O3"
-fi
-CFLAGS="${CFLAGS} ${BASEFLAGS} -std=c11"
+BASEFLAGS=`test "x${LKT_DEBUG_ENABLED}" = 'xyes' && echo "-g" || echo "-O3"`
+CFLAGS="-Werror -Wall -Wextra ${BASEFLAGS} -std=c11"
 
 #################################
 # BUILD WITH THE DEPENDS SCRIPT #
@@ -174,7 +169,6 @@ AC_OUTPUT([
 # CONF RESULTS #
 ################
 
-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="
@@ -188,7 +182,8 @@ LKT_CONFIG_RESULT="
 ### Build options
 #
 # Modules.............. $(test $LKT_STATIC_MODULE = 'yes' && echo static || echo not static)
-# C Flags.............. $AFF_CFLAGS
+# C Flags.............. $CFLAGS
+# LD Flags............. $LDFLAGS
 # To link against...... -Wl,-rpath -Wl,$prefix/lib
 # Builtin depends...... $LKT_BUILD_DEPENDS
 #
diff --git a/inc/lektor/lktmodule.h b/inc/lektor/lktmodule.h
index 996cc2c6..3ec608e8 100644
--- a/inc/lektor/lktmodule.h
+++ b/inc/lektor/lktmodule.h
@@ -15,10 +15,10 @@
 
 /* Include source files, only do it once per module ! */
 #if defined(__LKT_MODULE_MAIN_SOURCE__) && ! defined(LKT_STATIC_MODULE)
-#include "../../../src/base/common.c"
-#include "../../../src/base/stack.c"
-#include "../../../src/database/queue.c"
-#include "../../../src/module/thread.c"
+#include "../../src/base/common.c"
+#include "../../src/base/stack.c"
+#include "../../src/database/queue.c"
+#include "../../src/module/thread.c"
 #endif /* __LKT_MODULE_MAIN_SOURCE__ && ! LKT_STATIC_MODULE*/
 
 #endif /* __LKT_LKTMODULE_H__ */
-- 
GitLab