--- a/Makefile	2011-08-17 18:13:49.661719735 +0400
+++ b/Makefile	2011-08-17 18:14:03.953719732 +0400
@@ -23,7 +23,7 @@
 ## LIBRARY_TYPE variable
 
 build_library_type:
-	${GPRBUILD} -m -j${PROCESSORS} -XLIBRARY_TYPE=${LIBRARY_TYPE} -Pgnatcoll_build -p
+	${GPRBUILD} -m -j${PROCESSORS} -XLIBRARY_TYPE=${LIBRARY_TYPE} -Pgnatcoll_build -p ${GNAT_OPTFLAGS}
 ifeq (${WITH_GTK},yes)
 	${MAKE} -C src -f Makefile.gtk buildall
 endif
--- a/Makefile.conf.in	2011-08-17 18:14:12.556719730 +0400
+++ b/Makefile.conf.in	2011-08-17 18:14:29.777719729 +0400
@@ -96,7 +96,7 @@
 .PHONY: buildall libinstall
 buildall:
 	@echo Building project ${PROJECT}
-	${GPRBUILD} -m -j${PROCESSORS} -XLIBRARY_TYPE=${LIBRARY_TYPE} -P${PROJECT} -p
+	${GPRBUILD} -m -j${PROCESSORS} -XLIBRARY_TYPE=${LIBRARY_TYPE} -P${PROJECT} -p ${GNAT_OPTFLAGS}
 
 libinstall: installprint installsources installobj installlinks
 
--- a/src/Makefile.tools	2011-08-17 18:14:39.475719727 +0400
+++ b/src/Makefile.tools	2011-08-17 18:15:03.152719724 +0400
@@ -12,7 +12,7 @@
 buildall: gnatcoll_db2ada
 
 gnatcoll_db2ada: force
-	${GPRBUILD} -m -j${PROCESSORS} -P$(PROJECT) $@ -p -largs $(POSTGRES_PATH)
+	${GPRBUILD} -m -j${PROCESSORS} -P$(PROJECT) $@ -p -largs ${GNAT_OPTFLAGS} $(POSTGRES_PATH)
 
 installbin: force
 	$(CP) obj/gnatcoll_db2ada ${DESTDIR}/$(bindir)