2 files changed, 15 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 01dd825..d2b0b10 100644
--- a/Makefile
+++ b/Makefile
@@ -18,11 +18,11 @@ CFLAGS += -g -O3
 CFLAGS += -D_XOPEN_SOURCE=700                      # POSIX
 CFLAGS += -D_DEFAULT_SOURCE=1                      # for random_r
 CFLAGS += -I. -I$(SOURCE_DIR)
-CFLAGS += $(CFLAGS_DEP)
+CFLAGS += $(CFLAGS_DEP) $(CFLAGS_EXTRA)
 
 NASMFLAGS += -Dprivate_prefix=mg2di
 
-LDFLAGS_COMMON  = $(LDFLAGS_DEP)
+LDFLAGS_COMMON  = $(LDFLAGS_DEP) $(LDFLAGS_EXTRA)
 LDFLAGS_COMMON += -lm -llapacke -lblas -lthreadpool -lndarray
 LDFLAGS_TARGET  = -shared -Wl,--version-script=$(SOURCE_DIR)/libmg2d.v
 
diff --git a/configure b/configure
index a2dfa88..a8b5804 100755
--- a/configure
+++ b/configure
@@ -79,7 +79,17 @@ for arg; do
         continue
 	fi
 
-    die "Unknown commandline argument: $name $val"
+    case "$name" in
+        extra_cflags)
+            extra_cflags=$val $extra_cflags
+            ;;
+        extra_ldflags)
+            extra_ldflags=$val $extra_ldflags
+            ;;
+        *)
+            die "Unknown commandline argument: $arg"
+            ;;
+    esac
 done
 
 probe_arch
@@ -109,7 +119,9 @@ cat > config.mak <<EOF
 SOURCE_DIR = $source_dir
 CC = $cc
 CFLAGS_DEP = $mpi_cflags
+CFLAGS_EXTRA = $extra_cflags
 LDFLAGS_DEP = $mpi_libs
+LDFLAGS_EXTRA = $extra_ldflags
 EOF
 
 cat > config.h <<EOF