46 lines
1.4 KiB
Plaintext
46 lines
1.4 KiB
Plaintext
$OpenBSD: patch-configure_in,v 1.4 2005/05/10 18:21:00 fgsch Exp $
|
|
--- configure.in.orig Thu Feb 24 13:17:57 2005
|
|
+++ configure.in Tue May 10 14:34:59 2005
|
|
@@ -5,15 +5,7 @@
|
|
|
|
AC_INIT(main.c)
|
|
|
|
-<<<<<<< configure.in
|
|
-<<<<<<< configure.in
|
|
-AM_INIT_AUTOMAKE(links, 2.1pre15)
|
|
-=======
|
|
-AM_INIT_AUTOMAKE(links, 2.1pre16)
|
|
->>>>>>> 1.111
|
|
-=======
|
|
AM_INIT_AUTOMAKE(links, 2.1pre17)
|
|
->>>>>>> 1.116
|
|
|
|
ACLOCAL="./missing aclocal"
|
|
AUTOCONF="./missing autoconf"
|
|
@@ -73,6 +65,8 @@ AC_CHECK_HEADERS(sys/cygwin.h)
|
|
AC_CHECK_HEADERS(io.h)
|
|
AC_CHECK_HEADERS(setjmp.h)
|
|
AC_CHECK_HEADERS(langinfo.h)
|
|
+AC_CHECK_HEADERS(langinfo.h)
|
|
+AC_CHECK_HEADERS(inttypes.h)
|
|
|
|
dnl Checks for typedefs, structures, and compiler characteristics.
|
|
AC_C_CONST
|
|
@@ -144,6 +138,7 @@ AC_HAVE_FUNCS(getpagesize)
|
|
AC_HAVE_FUNCS(strptime)
|
|
AC_HAVE_FUNCS(setlocale)
|
|
AC_HAVE_FUNCS(nl_langinfo)
|
|
+AC_HAVE_FUNCS(MD5Init MD5Data)
|
|
dnl AC_HAVE_FUNCS(sigsetjmp siglongjmp)
|
|
|
|
AC_CACHE_CHECK([for sigsetjmp/siglongjmp], ac_cv_have_sigsetjmp,
|
|
@@ -297,7 +292,7 @@ CPPFLAGS_X="$CPPFLAGS"
|
|
LIBS_X="$LIBS"
|
|
cf_result=no
|
|
if test -z "$disable_ssl"; then
|
|
- PKG_CHECK_MODULES(OPENSSL,openssl,pkgconfig_openssl=yes,pkgconfig_openssl=no)
|
|
+# PKG_CHECK_MODULES(OPENSSL,openssl,pkgconfig_openssl=yes,pkgconfig_openssl=no)
|
|
if test "$pkgconfig_openssl" = "yes"; then
|
|
AC_MSG_CHECKING([for OpenSSL])
|
|
CPPFLAGS="$CPPFLAGS `pkg-config openssl --cflags-only-I`"
|