Commit 3cc89f6baeedc5242f637244fdc91d4f0e761887

Thomas de Grivel 2022-08-12T15:11:10

use original CPPFLAGS in configure

diff --git a/cli/configure b/cli/configure
index 2275f47..49a8bc3 100755
--- a/cli/configure
+++ b/cli/configure
@@ -14,7 +14,6 @@ echo "OBJECTS = $OBJECTS" >> ${CONFIG_MK}
 
 PROG_OBJECTS=rtbuf_cli_main.o
 
-CPPFLAGS=
 if test -d /usr/local/include; then
     CPPFLAGS="$CPPFLAGS -I/usr/local/include"
 fi
@@ -29,7 +28,7 @@ fi
 CFLAGS="$CFLAGS -W -Wall -Werror -std=c89 -pedantic"
 echo "CFLAGS = $CFLAGS" >> ${CONFIG_MK}
 
-LDFLAGS="-pthread"
+LDFLAGS="$LDFLAGS -pthread"
 echo "LDFLAGS = $LDFLAGS" >> ${CONFIG_MK}
 
 LIBS="../librtbuf/librtbuf.la -lreadline"
diff --git a/gtk3/configure b/gtk3/configure
index c5a1da9..03267b4 100755
--- a/gtk3/configure
+++ b/gtk3/configure
@@ -13,7 +13,6 @@ echo "SOURCES = $SOURCES" >> ${CONFIG_MK}
 OBJECTS="$(c2o "$SOURCES")"
 echo "OBJECTS = $OBJECTS" >> ${CONFIG_MK}
 
-CPPFLAGS=
 if test -d /usr/local/include; then
     CPPFLAGS="$CPPFLAGS -I/usr/local/include"
     CPPFLAGS="$CPPFLAGS $(pkg-config --cflags-only-I gtk+-3.0)"
@@ -29,7 +28,7 @@ CFLAGS="$CFLAGS -W -Wall -Werror"
 CFLAGS="$CFLAGS $(pkg-config --cflags-only-other gtk+-3.0)"
 echo "CFLAGS = $CFLAGS" >> ${CONFIG_MK}
 
-LDFLAGS="-pthread"
+LDFLAGS="$LDFLAGS -pthread"
 echo "LDFLAGS = $LDFLAGS" >> ${CONFIG_MK}
 
 LIBS=""
diff --git a/lib/dynamic/configure b/lib/dynamic/configure
index d9723a6..8ad2103 100755
--- a/lib/dynamic/configure
+++ b/lib/dynamic/configure
@@ -6,7 +6,7 @@ set -e
 SOURCES="$(ls *.c | tr '\n' ' ')"
 
 if test -d /usr/local/include; then
-    CPPFLAGS="-I/usr/local/include"
+    CPPFLAGS="$CPPFLAGS -I/usr/local/include"
 fi
 CPPFLAGS="$CPPFLAGS"
 echo "CPPFLAGS = $CPPFLAGS" >> ${CONFIG_MK}
@@ -19,7 +19,6 @@ fi
 CFLAGS="$CFLAGS -W -Wall -Werror -std=c89 -pedantic"
 echo "CFLAGS = $CFLAGS" >> ${CONFIG_MK}
 
-LDFLAGS=""
 echo "LDFLAGS = $LDFLAGS" >> ${CONFIG_MK}
 
 LIBS="../librtbuf_signal.la ../../librtbuf/librtbuf.la"
diff --git a/lib/signal/configure b/lib/signal/configure
index a38dd3b..da4a3c6 100755
--- a/lib/signal/configure
+++ b/lib/signal/configure
@@ -6,7 +6,7 @@ set -e
 SOURCES="$(ls *.c | tr '\n' ' ')"
 
 if test -d /usr/local/include; then
-    CPPFLAGS="-I/usr/local/include"
+    CPPFLAGS="$CPPFLAGS -I/usr/local/include"
 fi
 CPPFLAGS="$CPPFLAGS"
 echo "CPPFLAGS = $CPPFLAGS" >> ${CONFIG_MK}
@@ -20,7 +20,6 @@ CFLAGS="$CFLAGS -W -Wall -Werror -std=c89 -pedantic"
 CFLAGS="$CFLAGS -D_DEFAULT_SOURCE -D__USE_MISC"
 echo "CFLAGS = $CFLAGS" >> ${CONFIG_MK}
 
-LDFLAGS=""
 echo "LDFLAGS = $LDFLAGS" >> ${CONFIG_MK}
 
 LIBS="../../librtbuf/librtbuf.la ../librtbuf_signal.la -lm"
diff --git a/lib/synth/configure b/lib/synth/configure
index 9d78a47..5220569 100755
--- a/lib/synth/configure
+++ b/lib/synth/configure
@@ -6,7 +6,7 @@ set -e
 SOURCES="$(ls *.c | tr '\n' ' ')"
 
 if test -d /usr/local/include; then
-    CPPFLAGS="-I/usr/local/include"
+    CPPFLAGS="$CPPFLAGS -I/usr/local/include"
 fi
 CPPFLAGS="$CPPFLAGS"
 echo "CPPFLAGS = $CPPFLAGS" >> ${CONFIG_MK}
@@ -19,7 +19,6 @@ fi
 CFLAGS="$CFLAGS -W -Wall -Werror -std=c89 -pedantic"
 echo "CFLAGS = $CFLAGS" >> ${CONFIG_MK}
 
-LDFLAGS=""
 echo "LDFLAGS = $LDFLAGS" >> ${CONFIG_MK}
 
 LIBS=""