Changeset 12502 for trunk/psLib/configure.ac

Timestamp:

Mar 19, 2007, 3:13:54 PM (19 years ago)

Author:

Paul Price

Message:

Pulling out openssl/crypto dependency (we've had SO much trouble getting it to behave with us) in favour of libmd5-rfc. I put the source code (from sourceforge.net/projects/libmd5-rfc/) directly into the tree, because the original distribution doesn't build a library, and we don't want the user to have to go and grab it. The license (zlib/libpng) is compatible with the GPL, so no problems there. Changed the source code a little bit so that it behaves a little bit better with 32/64 bit issues ('unsigned int' --> 'uint32_t'), and got it to use the autoconf WORDS_BIGENDIAN flag.

File:

• trunk/psLib/configure.ac (modified) (2 diffs)

trunk/psLib/configure.ac

@@ -84 +84 @@
 dnl check the systems endianness
 AC_C_BIGENDIAN
+
+dnl set NO_STRCASESTR if we can't find strcasestr
+AC_CHECK_FUNC([strcasestr], [], [AC_SUBST(NO_STRCASESTR, [1])])
 
 AC_PREFIX_DEFAULT([/usr/local])
@@ -409 +412 @@
 LDFLAGS=${TMP_LDFLAGS}
 CPPFLAGS=${TMP_CPPFLAGS}
-
-dnl ------- openssl ---------
-
-dnl save LIBS/CFLAGS/LDFLAGS
-TMP_LIBS=${LIBS}
-TMP_CFLAGS=${CFLAGS}
-TMP_LDFLAGS=${LDFLAGS}
-TMP_CPPFLAGS=${CPPFLAGS}
-
-AC_ARG_WITH(ssl,
-[AS_HELP_STRING(--with-ssl=DIR,Specify location of SSL.)],
-[SSL_CFLAGS="-I$withval/include"
- SSL_LDFLAGS="-L$withval/lib"])
-AC_ARG_WITH(ssl-include,
-[AS_HELP_STRING(--with-ssl-include=DIR,Specify SSL include directory.)],
-[SSL_CFLAGS="-I$withval"])
-AC_ARG_WITH(ssl-lib,
-[AS_HELP_STRING(--with-ssl-lib=DIR,Specify SSL library directory.)],
-[SSL_LDFLAGS="-L$withval"])
-
-CFLAGS="${CFLAGS} ${SSL_CFLAGS}"
-CPPFLAGS=${CFLAGS}
-LDFLAGS="${LDFLAGS} ${SSL_LIBS}"
-
-AC_CHECK_HEADERS([openssl/md5.h],[],
-        [AC_CHECK_HEADERS([sys/md5.h],[],
-                [AC_MSG_ERROR([SSL headers not found.  Obtain it at http://www.openssl.org/ or use --with-ssl to specify location.])]
-        )]
-)
-AC_CHECK_LIB(crypto,MD5,[],
-  [AC_MSG_ERROR([SSL library not found.  Obtain it at http://www.openssl.org/ or use --with-ssl to specify location.])]
-)
-
-PSLIB_CFLAGS="${PSLIB_CFLAGS=} ${SSL_CFLAGS}"
-PSLIB_LIBS="${PSLIB_LIBS=} ${SSL_LDFLAGS=} ${LIBS}"
-
-AC_SUBST([SSL_CFLAGS])
-AC_SUBST([SSL_LDFLAGS])
-
-dnl restore the CFLAGS/LDFLAGS
-LIBS=${TMP_LIBS}
-CFLAGS=${TMP_CFLAGS}
-LDFLAGS=${TMP_LDFLAGS}
-CPPFLAGS=${TMP_CPPFLAGS}
-
-dnl set NO_STRCASESTR if we can't find strcasestr
-AC_CHECK_FUNC([strcasestr], [], [AC_SUBST(NO_STRCASESTR, [1])])
 
 dnl ------- enable -Werror after all of the probes have run ---------