Index: trunk/psLib/configure.ac
===================================================================
--- trunk/psLib/configure.ac	(revision 4209)
+++ trunk/psLib/configure.ac	(revision 4541)
@@ -13,4 +13,6 @@
 
 SUBDIR="etc src test" dnl don't include 'swig', as it is optional
+
+SRCDIRS="sys astro db fft fits imageops math mathtypes types xml"
 
 AC_DISABLE_STATIC
@@ -70,4 +72,13 @@
 AC_FUNC_VPRINTF
 AC_CHECK_FUNCS([floor gethostname gettimeofday memmove memset mkdir pow regcomp sqrt strchr strcspn strerror strrchr strstr strtol strtoul strtoull])
+
+dnl Add the src directories to the include path
+SRCPATH="`pwd`/src"
+SRCINC=`echo "${SRCDIRS=}" | sed "s|\(\\w\+\)|-I\${SRCPATH=}/\1|g"`
+SRCSUBLIBS=`echo "${SRCDIRS=}" | sed "s|\(\\w\+\)|\1/libpslib\1.la|g"`
+AC_SUBST(SRCSUBLIBS,${SRCSUBLIBS=})
+CFLAGS="${CFLAGS=} -I${SRCPATH=} ${SRCINC=}"
+AC_SUBST(SRCINC,${SRCINC=})
+
 
 dnl ----------------- MYSQL options --------------------
@@ -238,16 +249,23 @@
 
 AC_SUBST(SUBDIR,[$SUBDIR])
+AC_SUBST(SRCDIRS,[$SRCDIRS])
 AC_SUBST(PSLIB_LIBS,[$PSLIB_LIBS])
 AC_SUBST(PSLIB_CFLAGS,[$PSLIB_CFLAGS])
+
+AC_SUBST(LANG,[en])
 
 AC_CONFIG_FILES([
   Makefile
   src/Makefile
-  src/astronomy/Makefile
-  src/collections/Makefile
-  src/dataManip/Makefile
-  src/dataIO/Makefile
-  src/image/Makefile
-  src/sysUtils/Makefile
+  src/astro/Makefile
+  src/db/Makefile
+  src/fft/Makefile
+  src/fits/Makefile
+  src/imageops/Makefile
+  src/math/Makefile
+  src/mathtypes/Makefile
+  src/sys/Makefile
+  src/types/Makefile
+  src/xml/Makefile
   test/FullUnitTest
   test/Makefile