Fixed merge

gap-packages · Sep 21, 2013 · a7fd6ed · a7fd6ed
1 parent 65fc028
commit a7fd6ed
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/cnf/m4/ac_check_libdogleg.m4 b/cnf/m4/ac_check_libdogleg.m4
@@ -71,10 +71,10 @@ AC_MSG_NOTICE([I will compile libdogleg for you from the extern/ directory])
 LIBDOGLEG_MAKELIB=`printf 'libdogleg:
 	mkdir -p "$(EXTERN)/include" "$(EXTERN)/lib"
 	if [[ ! -f "$(EXTERN)/include/dogleg.h" ]]; then \\
-		$(MAKE) -B -C "$(LIBDOGLEG)" && \\
-		cp "$(LIBDOGLEG)/libdogleg.a" "$(EXTERN)/lib/" && \\
-		cp "$(LIBDOGLEG)/dogleg.h" "$(EXTERN)/include/" && \\
-		if [[ "$(shell uname)" = Darwin ]]; then install_name_tool -id "$(EXTERN)/lib/libdogleg.dylib" "$(EXTERN)/lib/libdogleg.dylib"; fi; \\
+		$(MAKE) CFLAGS="$(CHOLMOD_CFLAGS)" -B -C $(LIBDOGLEG) && \\
+		cp $(LIBDOGLEG)/libdogleg.a $(EXTERN)/lib/ && \\
+		cp $(LIBDOGLEG)/dogleg.h $(EXTERN)/include/ && \\
+		if [[ "$(shell uname)" = Darwin ]]; then install_name_tool -id $(EXTERN)/lib/libdogleg.dylib $(EXTERN)/lib/libdogleg.dylib; fi; \\
 	fi\n'`
 
 MAKE_LIBTARGETS="$MAKE_LIBTARGETS libdogleg"