Index: /trunk/psLib/Makefile.am
===================================================================
--- /trunk/psLib/Makefile.am	(revision 11492)
+++ /trunk/psLib/Makefile.am	(revision 11493)
@@ -1,3 +1,3 @@
-SUBDIRS = $(SUBDIR)
+SUBDIRS = m4 $(SUBDIR)
 
 bin_SCRIPTS = pslib-config 
@@ -9,7 +9,5 @@
     pslib-config.in \
     pslib.pc.in \
-    autogen.sh \
-	m4/acx_pthread.m4 \
-	m4/ax_lib_mysql.m4
+    autogen.sh
 
 if HAVE_DOXYGEN
Index: /trunk/psLib/configure.ac
===================================================================
--- /trunk/psLib/configure.ac	(revision 11492)
+++ /trunk/psLib/configure.ac	(revision 11493)
@@ -39,38 +39,5 @@
 AC_PROG_MAKE_SET
 
-dnl handle optimized building
-AC_ARG_ENABLE(optimize,
-  [AS_HELP_STRING(--enable-optimize,enable compiler optimization)],
-  [AC_MSG_RESULT(compile optimization enabled)
-   CFLAGS="${CFLAGS=} -pipe -O2 -g"
-   PSLIB_CFLAGS="${PSLIB_CFLAGS=} -DPS_NO_TRACE"],
-  [AC_MSG_RESULT([compile optimization disabled])
-    if test x"${CFLAGS}" == x; then
-      CFLAGS="-pipe -O0 -g"
-    fi
-  ]
-)
-
-dnl handle profiler building
-AC_ARG_ENABLE(profile,
-  [AS_HELP_STRING(--enable-profile,enable compiler profiler information inclusion)],
-  [AC_MSG_RESULT(compile optimization enabled)
-   CFLAGS="${CFLAGS=} -pg -g"
-   LDFLAGS="${LDFLAGS=} -pg"]
-)
-
-dnl handle path coverage checking
-AC_ARG_ENABLE(coverage,
-  [AS_HELP_STRING(--enable-coverage,enable path coverage checking)],
-  [AC_MSG_RESULT(path coverage enabled)
-   CFLAGS="${CFLAGS=} -lgcov -fprofile-arcs -ftest-coverage -pg"]
-)
-
-dnl turn off trace messages
-AC_ARG_ENABLE(trace,
-  [AS_HELP_STRING(--disable-trace,disable psTrace functionality)],
-  [AC_MSG_RESULT(psTrace disabled)
-   PSLIB_CFLAGS="${PSLIB_CFLAGS=} -DPS_NO_TRACE"]
-)
+IPP_STDOPTS
 
 dnl build tests at the same time as the source code
@@ -486,7 +453,12 @@
 
 AC_CONFIG_FILES([
+  Doxyfile
   Makefile
+  etc/Makefile
+  m4/Makefile
+  pslib-config
+  pslib.pc
+  share/Makefile
   src/Makefile
-  src/sys/Makefile
   src/astro/Makefile
   src/db/Makefile
@@ -497,7 +469,7 @@
   src/math/Makefile
   src/mathtypes/Makefile
+  src/sys/Makefile
   src/types/Makefile
   test/Makefile
-  test/sys/Makefile
   test/astro/Makefile
   test/db/Makefile
@@ -508,13 +480,9 @@
   test/math/Makefile
   test/mathtypes/Makefile
-  test/types/Makefile
   test/pstap/Makefile
   test/pstap/src/Makefile
+  test/sys/Makefile
+  test/types/Makefile
   utils/Makefile
-  etc/Makefile
-  share/Makefile
-  pslib-config
-  pslib.pc
-  Doxyfile
 ])
 dnl src/xml/Makefile
Index: /trunk/psLib/m4/Makefile.am
===================================================================
--- /trunk/psLib/m4/Makefile.am	(revision 11493)
+++ /trunk/psLib/m4/Makefile.am	(revision 11493)
@@ -0,0 +1,9 @@
+installed_m4 = ipp_stdopts.m4
+
+EXTRA_DIST= \
+	m4/acx_pthread.m4 \
+    m4/ax_lib_mysql.m4 \
+	$(installed_m4)
+
+m4datadir = $(datadir)/aclocal
+m4data_DATA = $(installed_m4)
Index: /trunk/psLib/m4/ipp_stdopts.m4
===================================================================
--- /trunk/psLib/m4/ipp_stdopts.m4	(revision 11493)
+++ /trunk/psLib/m4/ipp_stdopts.m4	(revision 11493)
@@ -0,0 +1,29 @@
+
+AC_DEFUN([IPP_STDOPTS],
+[
+    AC_ARG_ENABLE(optimize,
+      [AS_HELP_STRING(--enable-optimize,enable compiler optimization)],
+      [AC_MSG_RESULT(compile optimization enabled)
+       CFLAGS="${CFLAGS=} -pipe -O2 -g"
+       PSLIB_CFLAGS="${PSLIB_CFLAGS=} -DPS_NO_TRACE"],
+      [AC_MSG_RESULT([compile optimization disabled])
+        if test x"${CFLAGS}" == x; then
+          CFLAGS="-pipe -O0 -g"
+        fi
+      ]
+    )
+
+    dnl handle profiler building
+    AC_ARG_ENABLE(profile,   [AS_HELP_STRING(--enable-profile,enable compiler profiler information inclusion)],
+      [AC_MSG_RESULT(compile optimization enabled)
+       CFLAGS="${CFLAGS=} -pg -g"
+       LDFLAGS="${LDFLAGS=} -pg"]
+    )
+
+    dnl handle path coverage checking
+    AC_ARG_ENABLE(coverage,
+      [AS_HELP_STRING(--enable-coverage,enable path coverage checking)],
+      [AC_MSG_RESULT(path coverage enabled)
+       CFLAGS="${CFLAGS=} -lgcov -fprofile-arcs -ftest-coverage -pg"]
+    )
+])