ViewVC Help
View File | Revision Log | Show Annotations | View Changeset | Root Listing
root/group/trunk/OOPSE/ac-tools/aclocal.m4
(Generate patch)

Comparing trunk/OOPSE/ac-tools/aclocal.m4 (file contents):
Revision 815 by mmeineke, Tue Sep 30 16:00:15 2003 UTC vs.
Revision 816 by gezelter, Fri Oct 24 17:36:02 2003 UTC

# Line 55 | Line 55 | AC_DEFUN([AM_PATH_SPRNG],[
55                            Prefix where SPRNG is installed ],
56                             sprng_prefix="$withval",
57                             sprng_prefix="/usr/local")
58 <  AC_ARG_WITH(sprng_lib_prefix, [  --with-sprng_lib_prefix=PREFIX  SPRNG library directory],
59 <                           sprng_lib_prefix="$withval",
60 <                           sprng_lib_prefix="/usr/local/lib")
61 <  AC_ARG_WITH(sprng_include_prefix, [  --with-sprng_include_prefix=PREFIX
58 >  AC_ARG_WITH(sprng-libdir, [  --with-sprng-libdir=PREFIX  SPRNG library directory],
59 >                           sprng_libdir="$withval",
60 >                           sprng_libdir="/usr/local/lib")
61 >  AC_ARG_WITH(sprng-include, [  --with-sprng-include=PREFIX
62                            SPRNG include directory],
63 <                           sprng_include_prefix="$withval",
64 <                           sprng_include_prefix="/usr/local/include/sprng")
63 >                           sprng_include="$withval",
64 >                           sprng_include="/usr/local/include/sprng")
65  
66 <  if test x$sprng_lib_prefix = x ; then
67 <    sprng_lib_prefix=${sprng_prefix}/lib
66 >  if test x$sprng_libdir = x ; then
67 >    sprng_libdir=${sprng_prefix}/lib
68    fi
69  
70 <  if test x$sprng_include_prefix = x ; then
71 <    sprng_include_prefix=${sprng_prefix}/include
70 >  if test x$sprng_include = x ; then
71 >    sprng_include=${sprng_prefix}/include
72    fi
73  
74 <  AC_MSG_CHECKING(for SPRNG include files in $sprng_include_prefix)
75 <  if test -f ${sprng_include_prefix}/sprng.h; then
74 >  AC_MSG_CHECKING(for SPRNG include files in $sprng_include)
75 >  if test -f ${sprng_include}/sprng.h; then
76      have_sprngincl=yes
77      AC_MSG_RESULT(yes)
78    else
# Line 81 | Line 81 | AC_DEFUN([AM_PATH_SPRNG],[
81      AC_MSG_ERROR(Could not locate the SPRNG include files)
82    fi
83  
84 <  AC_MSG_CHECKING(for SPRNG libraries in $sprng_lib_prefix)
85 <  if test -f ${sprng_lib_prefix}/libsprng.a; then
84 >  AC_MSG_CHECKING(for SPRNG libraries in $sprng_libdir)
85 >  if test -f ${sprng_libdir}/libsprng.a; then
86      have_sprnglib=yes
87      AC_MSG_RESULT(yes)
88    else
# Line 94 | Line 94 | AC_DEFUN([AM_PATH_SPRNG],[
94    AC_LANG_SAVE()
95    AC_LANG([C])
96    ac_save_CPPFLAGS=$CPPFLAGS
97 <  CPPFLAGS="${CPPFLAGS} -I${sprng_include_prefix}"
97 >  CPPFLAGS="${CPPFLAGS} -I${sprng_include}"
98    ac_save_LDFLAGS=$LDFLAGS
99 <  LDFLAGS="${LDFLAGS} -L${sprng_lib_prefix} -lsprng"
99 >  LDFLAGS="${LDFLAGS} -L${sprng_libdir} -lsprng"
100    AC_CHECK_HEADER(sprng.h, [
101      AC_CHECK_LIB(sprng,
102                   init_rng,
103 <                    [SPRNG_LIBDIR="${sprng_lib_prefix}"
104 <                     SPRNG_LIB="-lsprng" SPRNG_INC="-I${sprng_include_prefix}"
103 >                    [SPRNG_LIBDIR="${sprng_libdir}"
104 >                     SPRNG_LIB="-lsprng" SPRNG_INC="-I${sprng_include}"
105                       HAVE_SPRNG="yes"])])
106    CPPFLAGS=$ac_save_CPPFLAGS
107    LDFLAGS=$ac_save_LDFLAGS

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines