Index: trunk/psLib/configure.in
===================================================================
--- trunk/psLib/configure.in	(revision 3153)
+++ trunk/psLib/configure.in	(revision 3182)
@@ -6,6 +6,18 @@
 AC_SUBST(PSLIB_LT_VERSION,$PSLIB_LT_VERSION)
 
+dnl Setup CFLAGS with project-particulars
+CFLAGS="${CFLAGS=} -Wall -Werror -std=c99 -D_GNU_SOURCE"
+
 AC_DISABLE_STATIC
 AC_PROG_MAKE_SET
+
+dnl handle debug building
+AC_ARG_ENABLE(debug,
+  [AC_HELP_STRING([--enable-debug],[Enable debug information in compilation])],
+  [AC_MSG_RESULT(debug information enabled)
+   AC_DEFINE(DEBUG)
+   CFLAGS="${CFLAGS=} -O0 -g2"],
+  [AC_MSG_RESULT(debug information disabled)]
+)
 
 AC_LANG(C)
@@ -16,10 +28,10 @@
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
+AC_CHECK_FUNC(strtoll)
+AC_CHECK_FUNC(strtoull)
 
 AC_PREFIX_DEFAULT([`pwd`])
 test "$prefix" = NONE && prefix=`pwd`
 
-dnl Setup CFLAGS/FFLAGS/LDFLAGS with project-particulars
-CFLAGS="${CFLAGS=} -Wall -std=c99 -D_GNU_SOURCE"
 
 dnl Setup the info for psLib for pkg-config
@@ -112,20 +124,8 @@
 AC_SUBST(PERL_PREFIX,$PERL_PREFIX)
 
-dnl ---------------- config dir options ------------------
-AC_ARG_WITH(configdir,
-[AS_HELP_STRING([--with-configdir=DIR],[Specify location of psLib's config directory. [default=PREFIX/config]])],
-[CONFIG_FILE="$withval/psTime.config"
- XML_CONFIG_FILE="$withval/psTime.xml"],
-[CONFIG_FILE="${prefix}/config/psTime.config"
- XML_CONFIG_FILE="${prefix}/config/psTime.xml"])
-AC_DEFINE_UNQUOTED(CONFIG_FILE, "$CONFIG_FILE", [Location of the psTime.config file])
-AC_DEFINE_UNQUOTED(XML_CONFIG_FILE, "$XML_CONFIG_FILE", [Location of the psTime.xml file])
-
-dnl ----------------- data dir options -------------------
-AC_ARG_WITH(datadir,
-[AS_HELP_STRING([--with-datadir=DIR],[Specify location of psLib's data directory. [default=PREFIX/data]])],
-[UTC_DAT_FILE="$withval/tai_utc.dat"],
-[UTC_DAT_FILE="${prefix}/data/tai_utc.dat"])
-AC_DEFINE_UNQUOTED(UTC_DAT_FILE, "$UTC_DAT_FILE", [Location of the tai_utc.dat file])
+dnl --------- set config/data file location --------------
+AC_DEFINE_UNQUOTED(CONFIG_FILE, "$sysconfdir/psTime.config", [Location of the psTime.config file])
+AC_DEFINE_UNQUOTED(XML_CONFIG_FILE, "$sysconfdir/psTime.xml", [Location of the psTime.xml file])
+AC_DEFINE_UNQUOTED(UTC_DAT_FILE, "$datadir/tai_utc.dat", [Location of the tai_utc.dat file])
 
 dnl for MacOSX, where sqrtf is in mx
@@ -158,5 +158,5 @@
 AC_CONFIG_FILES([ test/image/Makefile ])
 AC_CONFIG_FILES([ test/sysUtils/Makefile ])
-AC_CONFIG_FILES([ config/Makefile ])
+AC_CONFIG_FILES([ etc/pslib/Makefile ])
 AC_CONFIG_FILES([ pslib-config ])
 AC_CONFIG_FILES([ pslib.pc ])