--- src/Makefile.in.orig	Wed Nov 15 04:44:04 2000
+++ src/Makefile.in	Wed Nov 15 05:01:56 2000
@@ -85,10 +85,10 @@
 INCLUDES = $(all_includes) -I$(QTINCDIR)
 LDFLAGS = 
 qhacc_LDFLAGS = -L$(QTLIBDIR) $(LDFLAGS)
-qhacc_LDADD = -lqt
-MOC = $(QTMOCDIR)/moc
+qhacc_LDADD = -lqt2
+MOC = $(QTMOCDIR)/moc2
 
-CXXFLAGS = -O2 -Wall $(MYFLAGS)
+CXXFLAGS = @CXXFLAGS@ $(MYFLAGS)
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = ../config.h
 CONFIG_CLEAN_FILES =