Index: trunk/pswarp/configure.ac
===================================================================
--- trunk/pswarp/configure.ac	(revision 10947)
+++ trunk/pswarp/configure.ac	(revision 11533)
@@ -8,10 +8,4 @@
 AM_CONFIG_HEADER([src/config.h])
 AM_MAINTAINER_MODE
-
-dnl otherwise AC_PROG_CC will default CFLAGS to "-g -02"
-if test -z ${CFLAGS} ; then
-  CFLAGS=""
-fi
-AC_SUBST([CFLAGS])
 
 AC_LANG(C)
@@ -20,34 +14,5 @@
 AC_PROG_INSTALL
 AC_PROG_LIBTOOL
-
-dnl enable largefile supports
 AC_SYS_LARGEFILE
-
-dnl handle debug building
-AC_ARG_ENABLE(optimize,
-  [AS_HELP_STRING(--enable-optimize,enable compiler optimization)],
-  [AC_MSG_RESULT(compile optimization enabled)
-   CFLAGS="${CFLAGS=} -O2 -g"],
-  [AC_MSG_RESULT([compile optimization disabled])
-    if test x"${CFLAGS}" == x; then
-      CFLAGS="-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 turn off trace messages
-AC_ARG_ENABLE(trace,
-  [AS_HELP_STRING(--disable-trace,disable psTrace functionality)],
-  [AC_MSG_RESULT(psTrace disabled)
-   PSWARP_CFLAGS="${PSWARP_CFLAGS=} -DPS_NO_TRACE"]
-)
 
 dnl ------------------------------------------------------------
@@ -220,4 +185,5 @@
 
 dnl Set CFLAGS for build
+IPP_STDOPTS
 CFLAGS="${CFLAGS} -Wall -Werror -std=c99"
 echo "PSWARP_CFLAGS: $PSWARP_CFLAGS"
