bin/Makefile.am            |  2 +-
 configure.in               | 18 +++---------------
 src/forcefield/Makefile.am |  4 ++--
 src/lib/Makefile.am        |  2 +-
 4 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/bin/Makefile.am b/bin/Makefile.am
index c9f5f40..0f1d790 100644
--- a/bin/Makefile.am
+++ b/bin/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I../..  -I../include/almost
+INCLUDES = -I$(top_srcdir)  -I$(top_srcdir)/include/almost
 bin_PROGRAMS=camshift
 
 if LIBBZ2
diff --git a/configure.in b/configure.in
index e0d186d..9b15335 100644
--- a/configure.in
+++ b/configure.in
@@ -167,9 +167,6 @@ echo Constraint disabled value $
 fi
 
 
-#C and CPPFLAFS
-CFLAGS="-O9 -ffast-math -fomit-frame-pointer"
-CXXFLAGS="-O9 -ffast-math"
 
 #alm_sse
 mkasm=false
@@ -231,11 +228,6 @@ else
 echo OS ${host-os}
 fi
 
-if test x$darwin = xtrue; then
-CFLAGS=$CFLAGS" -fast"
-CXXFLAGS=$CXXFLAGS" -fast"
-fi
-
 if test x$powerpc = xtrue; then
 AC_DEFINE([POWERPC],[],"PowerPC CPU")
 fi
@@ -250,17 +242,13 @@ AM_CONDITIONAL(IX86, test x$ix86 = xtrue)
 
 if test x$darwin = xtrue; then
 if test x$ix86 = xtrue; then
-CXXFLAGS=$CXXFLAGS" -msse -msse2 -mmmx"
-CFLAGS=$CFLAGS" -msse -msse2 -mmmx"
-fi
-fi
-
-if test x$darwin = xtrue; then
-if test x$ix86 = xtrue; then
 CCAS=$PWD/darwinas
 fi
 fi
 
+PKG_CHECK_MODULES(BLAS, blas)
+PKG_CHECK_MODULES(LAPACK, lapack)
+
 echo ${host} ${host-cpu}  ${host-vendor} ${host-os} $ix86 $powerpc
 AC_OUTPUT(
 		almost.h 
diff --git a/src/forcefield/Makefile.am b/src/forcefield/Makefile.am
index 8d143ab..4b72814 100644
--- a/src/forcefield/Makefile.am
+++ b/src/forcefield/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I../../include/almost
+INCLUDES = -I$(top_srcdir)/include/almost
 
 lib_LIBRARIES= libnbimpl.a
-libnbimpl_a_SOURCES=enefunc.c enefuncvdw.c pbcenefunc.c forcefunc.c forcefuncvdw.c pbcforcefunc.c sasaenefunc.c pbcsasaenefunc.c sasaforcefunc.c pbcsasaforcefunc.c eneforcefunc.c enefunchs.c  forcefunchs.c enefuncsoft.c forcefuncsoft.c qvdwfunc.c $(ASMF)
\ No newline at end of file
+libnbimpl_a_SOURCES=enefunc.c enefuncvdw.c pbcenefunc.c forcefunc.c forcefuncvdw.c pbcforcefunc.c sasaenefunc.c pbcsasaenefunc.c sasaforcefunc.c pbcsasaforcefunc.c eneforcefunc.c enefunchs.c  forcefunchs.c enefuncsoft.c forcefuncsoft.c qvdwfunc.c $(ASMF)
diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 02ee6ee..0e9001f 100644
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES=-I../../include/almost
+INCLUDES=-I$(top_srcdir)/include/almost
 lib_LIBRARIES=libAlm.a
 PBDSOURCES = 	pdb/pdbatomline.cpp \
 		pdb/pdbauthorline.cpp \