--- trunk/OOPSE/ac-tools/aclocal.m4	2003/10/23 19:57:37	815
+++ trunk/OOPSE/ac-tools/aclocal.m4	2003/10/24 17:36:02	816
@@ -55,24 +55,24 @@ AC_DEFUN([AM_PATH_SPRNG],[
                           Prefix where SPRNG is installed ],
                            sprng_prefix="$withval",
                            sprng_prefix="/usr/local")
-  AC_ARG_WITH(sprng_lib_prefix, [  --with-sprng_lib_prefix=PREFIX  SPRNG library directory],
-                           sprng_lib_prefix="$withval",
-                           sprng_lib_prefix="/usr/local/lib")
-  AC_ARG_WITH(sprng_include_prefix, [  --with-sprng_include_prefix=PREFIX
+  AC_ARG_WITH(sprng-libdir, [  --with-sprng-libdir=PREFIX  SPRNG library directory],
+                           sprng_libdir="$withval",
+                           sprng_libdir="/usr/local/lib")
+  AC_ARG_WITH(sprng-include, [  --with-sprng-include=PREFIX
                           SPRNG include directory],
-                           sprng_include_prefix="$withval",
-                           sprng_include_prefix="/usr/local/include/sprng")
+                           sprng_include="$withval",
+                           sprng_include="/usr/local/include/sprng")
 
-  if test x$sprng_lib_prefix = x ; then
-    sprng_lib_prefix=${sprng_prefix}/lib
+  if test x$sprng_libdir = x ; then
+    sprng_libdir=${sprng_prefix}/lib
   fi
 
-  if test x$sprng_include_prefix = x ; then
-    sprng_include_prefix=${sprng_prefix}/include
+  if test x$sprng_include = x ; then
+    sprng_include=${sprng_prefix}/include
   fi
 
-  AC_MSG_CHECKING(for SPRNG include files in $sprng_include_prefix)
-  if test -f ${sprng_include_prefix}/sprng.h; then
+  AC_MSG_CHECKING(for SPRNG include files in $sprng_include)
+  if test -f ${sprng_include}/sprng.h; then
     have_sprngincl=yes
     AC_MSG_RESULT(yes)
   else
@@ -81,8 +81,8 @@ AC_DEFUN([AM_PATH_SPRNG],[
     AC_MSG_ERROR(Could not locate the SPRNG include files)
   fi
 
-  AC_MSG_CHECKING(for SPRNG libraries in $sprng_lib_prefix)
-  if test -f ${sprng_lib_prefix}/libsprng.a; then
+  AC_MSG_CHECKING(for SPRNG libraries in $sprng_libdir)
+  if test -f ${sprng_libdir}/libsprng.a; then
     have_sprnglib=yes
     AC_MSG_RESULT(yes)
   else
@@ -94,14 +94,14 @@ AC_DEFUN([AM_PATH_SPRNG],[
   AC_LANG_SAVE()
   AC_LANG([C])
   ac_save_CPPFLAGS=$CPPFLAGS
-  CPPFLAGS="${CPPFLAGS} -I${sprng_include_prefix}"
+  CPPFLAGS="${CPPFLAGS} -I${sprng_include}"
   ac_save_LDFLAGS=$LDFLAGS
-  LDFLAGS="${LDFLAGS} -L${sprng_lib_prefix} -lsprng"
+  LDFLAGS="${LDFLAGS} -L${sprng_libdir} -lsprng"
   AC_CHECK_HEADER(sprng.h, [
     AC_CHECK_LIB(sprng, 
                  init_rng, 
-                    [SPRNG_LIBDIR="${sprng_lib_prefix}"
-                     SPRNG_LIB="-lsprng" SPRNG_INC="-I${sprng_include_prefix}"
+                    [SPRNG_LIBDIR="${sprng_libdir}"
+                     SPRNG_LIB="-lsprng" SPRNG_INC="-I${sprng_include}"
                      HAVE_SPRNG="yes"])])
   CPPFLAGS=$ac_save_CPPFLAGS 
   LDFLAGS=$ac_save_LDFLAGS