aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.in12
-rw-r--r--scripts/Makefile.am3
-rw-r--r--src/charon/Makefile.am3
-rw-r--r--src/charon/plugins/nm/Makefile.am2
-rw-r--r--src/charon/plugins/sql/Makefile.am3
-rw-r--r--src/charon/plugins/stroke/Makefile.am2
-rw-r--r--src/charon/plugins/updown/Makefile.am2
-rw-r--r--src/dumm/Makefile.am4
-rw-r--r--src/libstrongswan/Makefile.am3
-rw-r--r--src/libstrongswan/plugins/x509/Makefile.am2
-rw-r--r--src/openac/Makefile.am3
-rw-r--r--src/pluto/Makefile.am3
-rw-r--r--src/scepclient/Makefile.am3
13 files changed, 22 insertions, 23 deletions
diff --git a/configure.in b/configure.in
index 8763e0fee..7bd96bf4a 100644
--- a/configure.in
+++ b/configure.in
@@ -18,7 +18,6 @@ dnl ===========================
AC_INIT(strongSwan,4.3.1)
AM_INIT_AUTOMAKE(tar-ustar)
-AC_C_BIGENDIAN
AC_SUBST(confdir, '${sysconfdir}')
PKG_PROG_PKG_CONFIG
@@ -706,6 +705,16 @@ AC_ARG_ENABLE(
)
dnl =========================
+dnl set up compiler and flags
+dnl =========================
+
+if test -z "$CFLAGS"; then
+ AC_SUBST(CFLAGS, "-g -O2 -Wall -Wno-format -Wno-pointer-sign -Wno-strict-aliasing")
+fi
+AC_PROG_CC
+AC_C_BIGENDIAN
+
+dnl =========================
dnl check required programs
dnl =========================
@@ -713,7 +722,6 @@ AC_PROG_INSTALL
AC_PROG_LIBTOOL
AC_PROG_LEX
AC_PROG_YACC
-AC_PROG_CC()
AC_PATH_PROG([GPERF], [gperf], [], [$PATH:/bin:/usr/bin:/usr/local/bin])
AC_PATH_PROG([PERL], [perl], [], [$PATH:/bin:/usr/bin:/usr/local/bin])
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 77e76d714..ca6c47e54 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -1,7 +1,6 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan
AM_CFLAGS = \
--DIPSEC_PLUGINDIR=\"${plugindir}\" \
--Wformat=0
+-DIPSEC_PLUGINDIR=\"${plugindir}\"
noinst_PROGRAMS = bin2array bin2sql id2sql key2keyid keyid2sql thread_analysis
bin2array_SOURCES = bin2array.c
diff --git a/src/charon/Makefile.am b/src/charon/Makefile.am
index 964402869..7c5e139e4 100644
--- a/src/charon/Makefile.am
+++ b/src/charon/Makefile.am
@@ -105,8 +105,7 @@ AM_CFLAGS = -rdynamic \
-DIPSEC_DIR=\"${ipsecdir}\" \
-DIPSEC_PIDDIR=\"${piddir}\" \
-DIPSEC_PLUGINDIR=\"${plugindir}\" \
- -DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
- -Wformat=0
+ -DSTRONGSWAN_CONF=\"${strongswan_conf}\"
charon_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lpthread -lm -ldl
EXTRA_DIST = config/proposal_keywords.txt
diff --git a/src/charon/plugins/nm/Makefile.am b/src/charon/plugins/nm/Makefile.am
index 30c1c00db..9a0b48cd2 100644
--- a/src/charon/plugins/nm/Makefile.am
+++ b/src/charon/plugins/nm/Makefile.am
@@ -1,7 +1,7 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon ${nm_CFLAGS}
-AM_CFLAGS = -rdynamic -Wformat=0
+AM_CFLAGS = -rdynamic
plugin_LTLIBRARIES = libstrongswan-nm.la
libstrongswan_nm_la_SOURCES = \
diff --git a/src/charon/plugins/sql/Makefile.am b/src/charon/plugins/sql/Makefile.am
index 1e9694456..ea39ce0d5 100644
--- a/src/charon/plugins/sql/Makefile.am
+++ b/src/charon/plugins/sql/Makefile.am
@@ -4,8 +4,7 @@ INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon
AM_CFLAGS = -rdynamic \
-DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
-DIPSEC_PLUGINDIR=\"${plugindir}\" \
- -DPLUGINS=\""${libstrongswan_plugins}\"" \
- -Wformat=0
+ -DPLUGINS=\""${libstrongswan_plugins}\""
plugin_LTLIBRARIES = libstrongswan-sql.la
libstrongswan_sql_la_SOURCES = sql_plugin.h sql_plugin.c \
diff --git a/src/charon/plugins/stroke/Makefile.am b/src/charon/plugins/stroke/Makefile.am
index a8ab074da..fb58ba62b 100644
--- a/src/charon/plugins/stroke/Makefile.am
+++ b/src/charon/plugins/stroke/Makefile.am
@@ -2,7 +2,7 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon -I$(top_srcdir)/src/stroke
AM_CFLAGS = \
--rdynamic -Wformat=0 \
+-rdynamic \
-DIPSEC_CONFDIR=\"${confdir}\" \
-DIPSEC_PIDDIR=\"${piddir}\"
diff --git a/src/charon/plugins/updown/Makefile.am b/src/charon/plugins/updown/Makefile.am
index 21bb733da..de60d9fbf 100644
--- a/src/charon/plugins/updown/Makefile.am
+++ b/src/charon/plugins/updown/Makefile.am
@@ -1,7 +1,7 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan -I$(top_srcdir)/src/charon
-AM_CFLAGS = -rdynamic -Wformat=0
+AM_CFLAGS = -rdynamic
plugin_LTLIBRARIES = libstrongswan-updown.la
libstrongswan_updown_la_SOURCES = \
diff --git a/src/dumm/Makefile.am b/src/dumm/Makefile.am
index 730767642..029290fb6 100644
--- a/src/dumm/Makefile.am
+++ b/src/dumm/Makefile.am
@@ -16,6 +16,4 @@ irdumm_LDADD = libdumm.la -lruby1.8
INCLUDES = -I$(top_srcdir)/src/libstrongswan ${gtk_CFLAGS} \
-I/usr/lib/ruby/1.8/i486-linux/
-AM_CFLAGS = \
--D_FILE_OFFSET_BITS=64 \
--Wformat=0
+AM_CFLAGS = -D_FILE_OFFSET_BITS=64
diff --git a/src/libstrongswan/Makefile.am b/src/libstrongswan/Makefile.am
index 9494f44d4..acce5702b 100644
--- a/src/libstrongswan/Makefile.am
+++ b/src/libstrongswan/Makefile.am
@@ -59,8 +59,7 @@ libstrongswan_la_LIBADD = -lpthread -ldl
INCLUDES = -I$(top_srcdir)/src/libstrongswan
AM_CFLAGS = \
-DIPSEC_DIR=\"${ipsecdir}\" \
--DIPSEC_PLUGINDIR=\"${plugindir}\" \
--Wformat=0
+-DIPSEC_PLUGINDIR=\"${plugindir}\"
if USE_LEAK_DETECTIVE
AM_CFLAGS += -DLEAK_DETECTIVE
diff --git a/src/libstrongswan/plugins/x509/Makefile.am b/src/libstrongswan/plugins/x509/Makefile.am
index a4f3990f8..3f9f85c36 100644
--- a/src/libstrongswan/plugins/x509/Makefile.am
+++ b/src/libstrongswan/plugins/x509/Makefile.am
@@ -1,7 +1,7 @@
INCLUDES = -I$(top_srcdir)/src/libstrongswan
-AM_CFLAGS = -rdynamic -Wformat=0
+AM_CFLAGS = -rdynamic
plugin_LTLIBRARIES = libstrongswan-x509.la
diff --git a/src/openac/Makefile.am b/src/openac/Makefile.am
index cc9b72e16..005486779 100644
--- a/src/openac/Makefile.am
+++ b/src/openac/Makefile.am
@@ -7,7 +7,6 @@ AM_CFLAGS = \
-DIPSEC_CONFDIR=\"${confdir}\" \
-DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
-DIPSEC_PLUGINDIR=\"${plugindir}\" \
- -DPLUGINS=\""${libstrongswan_plugins}\"" \
- -Wformat=0
+ -DPLUGINS=\""${libstrongswan_plugins}\""
openac_LDADD = $(top_builddir)/src/libstrongswan/libstrongswan.la -lgmp
diff --git a/src/pluto/Makefile.am b/src/pluto/Makefile.am
index 0e749f6ab..2e46de924 100644
--- a/src/pluto/Makefile.am
+++ b/src/pluto/Makefile.am
@@ -86,8 +86,7 @@ AM_CFLAGS = \
-DIPSEC_PLUGINDIR=\"${plugindir}\" \
-DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
-DKERNEL26_SUPPORT -DKERNEL26_HAS_KAME_DUPLICATES \
--DPLUTO -DKLIPS -DDEBUG \
--Wformat=0
+-DPLUTO -DKLIPS -DDEBUG
pluto_LDADD = \
$(LIBSTRONGSWANDIR)/libstrongswan.la \
diff --git a/src/scepclient/Makefile.am b/src/scepclient/Makefile.am
index ed40d2951..2661bc318 100644
--- a/src/scepclient/Makefile.am
+++ b/src/scepclient/Makefile.am
@@ -19,8 +19,7 @@ AM_CFLAGS = \
-DIPSEC_CONFDIR=\"${confdir}\" \
-DIPSEC_PLUGINDIR=\"${plugindir}\" \
-DSTRONGSWAN_CONF=\"${strongswan_conf}\" \
--DDEBUG -DNO_PLUTO \
--Wformat=0
+-DDEBUG -DNO_PLUTO
LIBSTRONGSWANBUILDDIR=$(top_builddir)/src/libstrongswan
LIBFREESWANBUILDDIR=$(top_builddir)/src/libfreeswan
generated by cgit v1.2.3 (git 2.25.1) at 2025-09-15 13:32:12 +0000