--- qsampler.pro.in
+++ qsampler.pro.in
@@ -57,9 +57,17 @@
 
 TRANSLATIONS += translations/qsampler_ru.ts
 
-LIBS     += @ac_libs@
+LIBS     += @ac_libs@ -lX11
 INCPATH  += @ac_incpath@
 
+QMAKE_CC		= @CC@
+QMAKE_CFLAGS		= @CFLAGS@
+QMAKE_CXX		= @CXX@
+QMAKE_CXXFLAGS		= @CXXFLAGS@
+
+QMAKE_LINK		= @CXX@
+QMAKE_LFLAGS	 	= @LDFLAGS@
+
 OBJECTS_DIR = .obj
 MOC_DIR     = .moc
 UI_DIR      = .ui
--- Makefile.in
+++ Makefile.in
@@ -68,7 +68,7 @@
 	@$(qmake) -o $(name).mak $(name).pro
 
 $(name):	$(name).mak $(sources) $(headers) $(forms)
-	@make -f $(name).mak
+	@$(MAKE) -f $(name).mak
 
 %.ts:	$(name).pro $(sources) $(headers) $(forms)
 	@$(lupdate) -verbose $(name).pro
@@ -98,6 +98,6 @@
 		rm -vf $(DESTDIR)$(prefix)/share/locale/`basename $$x`; done
 
 clean:	$(name).mak
-	@make -f $(name).mak clean
+	@$(MAKE) -f $(name).mak clean
 	@rm -f $(name) $(name).mak
 	@rm -rf *.cache *.log *.status $(translations_targets)
--- configure.ac	2011-12-26 23:36:05.000000000 +1100
+++ configure.ac	2011-12-26 23:41:07.000000000 +1100
@@ -293,7 +293,7 @@
       AC_MSG_CHECKING([for gig::File::SetAutoLoad() method in libgig])
       AC_LANG_SAVE
       AC_LANG_CPLUSPLUS
-      CXXFLAGS="$ac_libs"
+      CXXFLAGS="$ac_libs ${CXXFLAGS}"
       AC_TRY_RUN([
 #include <stdlib.h>
 #include <gig.h>