IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 10309


Ignore:
Timestamp:
Nov 29, 2006, 6:13:44 PM (19 years ago)
Author:
Paul Price
Message:

Adding MD5 hash calculation

Location:
trunk/psLib
Files:
3 added
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/psLib/configure.ac

    r10308 r10309  
    421421dnl ------- openssl ---------
    422422
    423 PKG_CHECK_MODULES([SSL], [openssl >= 0.9.6])
     423dnl save LIBS/CFLAGS/LDFLAGS
     424TMP_LIBS=${LIBS}
     425TMP_CFLAGS=${CFLAGS}
     426TMP_LDFLAGS=${LDFLAGS}
     427TMP_CPPFLAGS=${CPPFLAGS}
     428
     429AC_ARG_WITH(ssl,
     430[AS_HELP_STRING(--with-ssl=DIR,Specify location of SSL.)],
     431[SSL_CFLAGS="-I$withval/include"
     432 SSL_LDFLAGS="-L$withval/lib"])
     433AC_ARG_WITH(ssl-include,
     434[AS_HELP_STRING(--with-ssl-include=DIR,Specify SSL include directory.)],
     435[SSL_CFLAGS="-I$withval"])
     436AC_ARG_WITH(ssl-lib,
     437[AS_HELP_STRING(--with-ssl-lib=DIR,Specify SSL library directory.)],
     438[SSL_LDFLAGS="-L$withval"])
    424439PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${SSL_CFLAGS}"
    425 PSLIB_LIBS="${PSLIB_LIBS=} ${SSL_LIBS}"
     440PSLIB_LIBS="${PSLIB_LIBS=} $SSL_LDFLAGS -lssl"
     441
     442CFLAGS="${CFLAGS} ${SSL_CFLAGS}"
     443CPPFLAGS=${CFLAGS}
     444LDFLAGS="${LDFLAGS} ${SSL_LIBS}"
     445
     446AC_CHECK_HEADERS([openssl/md5.h],[],
     447  [AC_MSG_ERROR([SSL headers not found.  Obtain it at http://www.openssl.org/ or use --with-ssl to specify location.])]
     448)
     449AC_CHECK_LIB(ssl,MD5,[],
     450  [AC_MSG_ERROR([SSL library not found.  Obtain it at http://www.openssl.org/ or use --with-ssl to specify location.])]
     451)
     452
     453AC_SUBST([SSL_CFLAGS])
     454
     455dnl restore the CFLAGS/LDFLAGS
     456LIBS=${TMP_LIBS}
     457CFLAGS=${TMP_CFLAGS}
     458LDFLAGS=${TMP_LDFLAGS}
     459CPPFLAGS=${TMP_CPPFLAGS}
    426460
    427461dnl ------- enable -Werror after all of the probes have run ---------

  • trunk/psLib/src/math/Makefile.am

    r9909 r10309  
    1010        psCompare.c \
    1111        psEllipse.c \
     12        psMathUtils.c \
    1213        psMatrix.c \
     14        psMD5.c \
    1315        psMinimizeLMM.c \
    1416        psMinimizePowell.c \
    … …  
    2224        psSpline.c \
    2325        psStats.c \
    24         psMathUtils.c \
    2526        psVectorSmooth.c
    2627
    … …  
    3435        psConstants.h \
    3536        psEllipse.h \
     37        psMathUtils.h \
    3638        psMatrix.h \
     39        psMD5.h \
    3740        psMinimizeLMM.h \
    3841        psMinimizePowell.h \
    … …  
    4649        psSpline.h \
    4750        psStats.h \
    48         psMathUtils.h \
    4951        psVectorSmooth.h
    5052

  • trunk/psLib/src/pslib_strict.h

    r8997 r10309  
    99*  @author Eric Van Alst, MHPCC
    1010*
    11 *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
    12 *  @date $Date: 2006-09-27 01:31:46 $
     11*  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
     12*  @date $Date: 2006-11-30 04:13:44 $
    1313*
    1414*  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
    … …  
    5959#include "psConstants.h"
    6060#include "psMatrix.h"
     61#include "psMD5.h"
    6162#include "psMinimizeLMM.h"
    6263#include "psMinimizePowell.h"

  • trunk/psLib/test/math

    • Property svn:ignore

      •  

        old new  
        5151tap_psSparse
        5252tap_psStatsTiming
         53tap_psMD5

  • trunk/psLib/test/math/.cvsignore

    r10193 r10309  
    5151tap_psSparse
    5252tap_psStatsTiming
     53tap_psMD5

  • trunk/psLib/test/math/Makefile.am

    r10166 r10309  
    1313
    1414TEST_PROGS = \
     15        tap_psMD5 \
    1516        tap_psSparse \
    1617        tap_psStatsTiming
Note: See TracChangeset for help on using the changeset viewer.