Add support for setting CPPFLAGS and LDFLAGS

configure

@@ -263,6 +263,8 @@ fi
 
 [ x"$CXX" = x ] && CXX=g++
 [ x"$CXXFLAGS" = x ] || CXXFLAGS="$CXXFLAGS "
+[ x"$CPPFLAGS" = x ] || CPPFLAGS="$CPPFLAGS "
+[ x"$LDFLAGS" = x ] || LDFLAGS="$LDFLAGS "
 
 case x"$CXX" in
   x*g++*|x*clang++*) CXXFLAGS="${CXXFLAGS}-Wall -Wextra";;
@@ -497,6 +499,8 @@ sed \
 # This 'makefile' is generated from '../makefile.in'." \
 -e "s,@CXX@,$CXX," \
 -e "s#@CXXFLAGS@#$CXXFLAGS#" \
+-e "s#@CPPFLAGS@#$CPPFLAGS#" \
+-e "s#@LDFLAGS@#$LDFLAGS#" \
 -e "s#@LIBS@#$libs#" \
 -e "s#@CONTRIB@#$contrib#" \
 -e "s#@ROOT@#$root#" \

makefile.in

@@ -9,6 +9,8 @@
 
 CXX=@CXX@
 CXXFLAGS=@CXXFLAGS@
+CPPFLAGS=@CPPFLAGS@
+LDFLAGS=@LDFLAGS@
 
 LIBS=@LIBS@
 ROOT=@ROOT@
@@ -30,7 +32,7 @@ OBJ_CONTRIB=$(FILT_CONTRIB:.cpp=.o)
 # Include for current build directory is required for including the
 # generated build header build.hpp.
 DIR=../$(shell pwd|sed -e 's,.*/,,')
-COMPILE=$(CXX) $(CXXFLAGS) -I$(DIR) -I$(ROOT)/src
+COMPILE=$(CXX) $(CXXFLAGS) $(CPPFLAGS) -I$(DIR) -I$(ROOT)/src
 
 #--------------------------------------------------------------------------#
 
@@ -54,10 +56,10 @@ contrib/%.o: $(ROOT)/contrib/%.cpp $(ROOT)/contrib/%.hpp $(ROOT)/src/*.hpp makef
 # tester 'mobical') and the library are the main build targets.
 
 cadical: src/cadical.o libcadical.a makefile
-	$(COMPILE) -o $@ $< -L. -lcadical $(LIBS)
+	$(COMPILE) -o $@ $< $(LDFLAGS) -L. -lcadical $(LIBS)
 
 mobical: src/mobical.o libcadical.a makefile $(LIBS)
-	$(COMPILE) -o $@ $< -L. -lcadical
+	$(COMPILE) -o $@ $< $(LDFLAGS) -L. -lcadical
 
 libcadical.a: $(OBJ_SOLVER) $(OBJ_CONTRIB) makefile
 	ar rc $@ $(OBJ_SOLVER) $(OBJ_CONTRIB)

test/api/run.sh

@@ -47,9 +47,13 @@ makefile=$CADICALBUILD/makefile
 
 CXX=`grep '^CXX=' "$makefile"|sed -e 's,CXX=,,'`
 CXXFLAGS=`grep '^CXXFLAGS=' "$makefile"|sed -e 's,CXXFLAGS=,,'`
+CPPFLAGS=`grep '^CPPFLAGS=' "$makefile"|sed -e 's,CPPFLAGS=,,'`
+LDFLAGS=`grep '^LDFLAGS=' "$makefile"|sed -e 's,LDFLAGS=,,'`
 
 msg "using CXX=$CXX"
 msg "using CXXFLAGS=$CXXFLAGS"
+msg "using CPPFLAGS=$CPPFLAGS"
+msg "using LDFLAGS=$LDFLAGS"
 
 tests=../test/api
 
@@ -73,20 +77,20 @@ run () {
   then
     src=$tests/$1.c
     language=" -x c"
-    COMPILE="$CXX `echo $CXXFLAGS|sed -e 's,-std=c++11,-std=c11,'`"
+    COMPILE="$CXX `echo $CXXFLAGS|sed -e 's,-std=c++11,-std=c11,'` $CPPFLAGS"
   elif [ -f $tests/$1.cpp ]
   then
     src=$tests/$1.cpp
     language=""
-    COMPILE="$CXX $CXXFLAGS"
+    COMPILE="$CXX $CXXFLAGS $CPPFLAGS"
   else
     die "can not find '$tests.c' nor '$tests.cpp'"
   fi
   name=$CADICALBUILD/test-api-$1
   rm -f $name.log $name.o $name
   status=0
   cmd $COMPILE$language -o $name.o -c $src
-  cmd $COMPILE -o $name $name.o -L$CADICALBUILD -lcadical
+  cmd $COMPILE -o $name $name.o $LDFLAGS -L$CADICALBUILD -lcadical
   cmd $name
   if test $status = 0
   then

test/cnf/run.sh

@@ -25,6 +25,9 @@ die "needs to be called from a top-level sub-directory of CaDiCaL"
 
 [ x"$CADICALBUILD" = x ] && CADICALBUILD="../build"
 
+[ -f "$CADICALBUILD/makefile" ] || \
+  die "can not find '$CADICALBUILD/makefile' (run 'configure' first)"
+
 [ -x "$CADICALBUILD/cadical" ] || \
   die "can not find '$CADICALBUILD/cadical' (run 'make' first)"
 
@@ -47,12 +50,22 @@ lratchecker=$CADICALBUILD/lrat-trim
 solutionchecker=$CADICALBUILD/precochk
 makefile=$CADICALBUILD/makefile
 
+CXX=`grep '^CXX=' "$makefile"|sed -e 's,CXX=,,'`
+CXXFLAGS=`grep '^CXXFLAGS=' "$makefile"|sed -e 's,CXXFLAGS=,,'`
+CPPFLAGS=`grep '^CPPFLAGS=' "$makefile"|sed -e 's,CPPFLAGS=,,'`
+LDFLAGS=`grep '^LDFLAGS=' "$makefile"|sed -e 's,LDFLAGS=,,'`
+
+msg "using CXX=$CXX"
+msg "using CXXFLAGS=$CXXFLAGS"
+msg "using CPPFLAGS=$CPPFLAGS"
+msg "using LDFLAGS=$LDFLAGS"
+
 if [ ! -f $solutionchecker -o ! -f $dratchecker -o ! -f $lratchecker ]
 then
 
   if [ ! -f $solutionchecker -o ../test/cnf/precochk.c -nt $solutionchecker ]
   then
-    cmd="cc -O -o $solutionchecker ../test/cnf/precochk.c -lz"
+    cmd="cc -O `echo $CXXFLAGS|sed -e 's,-std=c++11,-std=c11,'` $CPPFLAGS -o $solutionchecker ../test/cnf/precochk.c -lz $LDFLAGS"
     cecho "$cmd"
     if $cmd 2>/dev/null
     then
@@ -66,7 +79,7 @@ then
 
   if [ ! -f $dratchecker -o ../test/cnf/drat-trim.c -nt $dratchecker ]
   then
-    cmd="cc -O -o $dratchecker ../test/cnf/drat-trim.c"
+    cmd="cc -O `echo $CXXFLAGS|sed -e 's,-std=c++11,-std=c11,'` $CPPFLAGS -o $dratchecker ../test/cnf/drat-trim.c $LDFLAGS"
     if $cmd 2>/dev/null
     then
       msg "external proof checking with '$dratchecker'"
@@ -79,7 +92,7 @@ then
 
   if [ ! -f $lratchecker -o ../test/cnf/lrat-trim.c -nt $lratchecker ]
   then
-    cmd="cc -O -o $lratchecker ../test/cnf/lrat-trim.c"
+    cmd="cc -O `echo $CXXFLAGS|sed -e 's,-std=c++11,-std=c11,'` $CPPFLAGS -o $lratchecker ../test/cnf/lrat-trim.c $LDFLAGS"
     if $cmd 2>/dev/null
     then
       msg "external proof checking with '$lratchecker'"