Skip to content

Commit

Permalink
Pass cxxflags to configure if needed
Browse files Browse the repository at this point in the history
  • Loading branch information
Cropi committed Mar 2, 2020
1 parent 62a30a4 commit f01e3f0
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 4 deletions.
6 changes: 5 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,8 @@
### 0.0.3 - 2020-02-24
### 0.0.5 - 2020-03-02
## Added
- Pass FLAGS to configure script

### 0.0.4 - 2020-02-24
## Added
- Configuration file now has an additional option to use either systemd-system-unitdir or systemd-user-unitdir

Expand Down
8 changes: 5 additions & 3 deletions configure.ac
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
AC_PREREQ([2.69])

AC_INIT([usbguard-notifier], [0.0.4], [[email protected]])
AC_INIT([usbguard-notifier], [0.0.5], [[email protected]])
AC_CONFIG_SRCDIR([src/])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
Expand All @@ -9,6 +9,8 @@ m4_pattern_allow([AC_MSG_FAILURE])
# if it's possible enable silent compilation
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])

EXTERNAL_CXXFLAGS="$CXXFLAGS"

AM_INIT_AUTOMAKE([foreign subdir-objects tar-pax])

AC_PROG_MAKE_SET
Expand Down Expand Up @@ -128,7 +130,7 @@ fi
AC_SUBST([catch_CFLAGS])
AC_SUBST([catch_LIBS])

CXXFLAGS_DEBUG="-g -O0"
CXXFLAGS_DEBUG="-g -O2"
AC_ARG_ENABLE(
[debug-build],
[AC_HELP_STRING([--enable-debug-build], [enable debugging flags (default=no)])],
Expand All @@ -140,7 +142,7 @@ AC_ARG_ENABLE(
[debug=no]
)

CXXFLAGS=
CXXFLAGS=" $EXTERNAL_CXXFLAGS"
CXXFLAGS+=" -std=c++11"
CXXFLAGS+=" -pedantic"
CXXFLAGS+=" -Wno-unknown-pragmas"
Expand Down

0 comments on commit f01e3f0

Please sign in to comment.