Changeset: 3abd2f1a2856 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=3abd2f1a2856
Modified Files:
clients/mapilib/Makefile.ag
clients/mapilib/mapi.c
configure.ag
Branch: Feb2013
Log Message:
crypt: drop now it's unnecessary (was used by proto v8)
diffs (57 lines):
diff --git a/clients/mapilib/Makefile.ag b/clients/mapilib/Makefile.ag
--- a/clients/mapilib/Makefile.ag
+++ b/clients/mapilib/Makefile.ag
@@ -25,7 +25,7 @@ lib_mapi = {
SOURCES = mapi.c mapi.rc
LIBS = $(SOCKET_LIBS) ../../common/stream/libstream \
../../common/options/libmoptions \
- ../../common/utils/libmcrypt $(openssl_LIBS) $(CRYPT_LIBS)
+ ../../common/utils/libmcrypt $(openssl_LIBS)
}
headers_mapi = {
diff --git a/clients/mapilib/mapi.c b/clients/mapilib/mapi.c
--- a/clients/mapilib/mapi.c
+++ b/clients/mapilib/mapi.c
@@ -823,14 +823,6 @@
# endif
#endif
-#ifdef HAVE_CRYPT_H
-# include <crypt.h>
-#else
-# if defined(HAVE_CRYPT) && defined(__MINGW32__)
-_CRTIMP char *__cdecl crypt(const char *key, const char *salt);
-# endif
-#endif
-
#ifndef INVALID_SOCKET
#define INVALID_SOCKET (-1)
#endif
diff --git a/configure.ag b/configure.ag
--- a/configure.ag
+++ b/configure.ag
@@ -2238,7 +2238,7 @@ AC_HEADER_STDC
AC_HEADER_TIME
AC_HEADER_DIRENT
# NOTE: these header files are in alphabetical order to ease maintenance
-AC_CHECK_HEADERS([crypt.h \
+AC_CHECK_HEADERS([ \
dlfcn.h \
execinfo.h \
fcntl.h \
@@ -2540,14 +2540,7 @@ AC_CHECK_FUNCS([\
trunc \
uname \
])
-
LIBS="$save_LIBS"
-save_LIBS="$LIBS"
-LIBS=
-AC_SEARCH_LIBS(crypt, crypt, AC_DEFINE(HAVE_CRYPT, 1, [crypt]))
-CRYPT_LIBS="$LIBS"
-LIBS="$save_LIBS"
-AC_SUBST(CRYPT_LIBS)
dnl check for getopt in standard library
AC_CHECK_HEADERS([getopt.h])
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
