diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-04-12 18:33:35 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-04-22 10:39:28 +0200 |
| commit | 263118a6681918add6861eaede318657ee23b7c4 (patch) | |
| tree | 136b78115830104b4395b882dcfeae9e551fb79a | |
| parent | 20e078293697dd99ddcf2c2151c9f075409cc185 (diff) | |
build: Remove configure check for libcrypt.
GNU libc has provided the 'crypt' function in libcrypt for a long time,
making this check unnecessary.
* configure.ac: Remove libcrypt check and 'LIBCRYPT' substitution.
* config.make.in (LIBCRYPT): Remove.
* trans/Makefile (password-LDLIBS): Change $(LIBCRYPT) to -lcrypt.
* utils/Makefile (login-LDLIBS, addauth-LDLIBS, setauth-LDLIBS):
Likewise.
| -rw-r--r-- | config.make.in | 3 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | trans/Makefile | 4 | ||||
| -rw-r--r-- | utils/Makefile | 8 |
4 files changed, 6 insertions, 13 deletions
diff --git a/config.make.in b/config.make.in index c5d4e68d..0f1390a7 100644 --- a/config.make.in +++ b/config.make.in @@ -65,9 +65,6 @@ gnu89-inline-CFLAGS = @libc_cv_gnu89_inline@ # `yes' or `no' to indicate if ld --version-script is available. VERSIONING = @VERSIONING@ -# If a separate libcrypt is available, use it. -LIBCRYPT = @LIBCRYPT@ - # How to link against Parted libraries, if at all. PARTED_LIBS = @PARTED_LIBS@ diff --git a/configure.ac b/configure.ac index ecabfdfd..873ced81 100644 --- a/configure.ac +++ b/configure.ac @@ -106,10 +106,6 @@ fi dnl Let these propagate from the environment. AC_SUBST(CFLAGS) AC_SUBST(CPPFLAGS) AC_SUBST(LDFLAGS) -# See if there's a separate libcrypt (many systems put crypt there). -AC_CHECK_LIB(crypt, crypt, LIBCRYPT=-lcrypt) -AC_SUBST(LIBCRYPT) - hurd_MIG_RETCODE # See if --version-script is available. diff --git a/trans/Makefile b/trans/Makefile index a2942820..71e64248 100644 --- a/trans/Makefile +++ b/trans/Makefile @@ -1,6 +1,6 @@ # # Copyright (C) 1994, 1995, 1996, 1997, 1999, 2000, 2001, 2002, 2006, 2007, -# 2008, 2013 Free Software Foundation, Inc. +# 2008, 2013, 2014 Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or # modify it under the terms of the GNU General Public License as @@ -31,7 +31,7 @@ OBJS = $(SRCS:.c=.o) fsysServer.o ifsockServer.o passwordServer.o \ device_replyServer.o elfcore.o HURDLIBS = ports netfs trivfs iohelp fshelp pipe ihash shouldbeinlibc LDLIBS += -lpthread -password-LDLIBS = $(LIBCRYPT) +password-LDLIBS = -lcrypt password-MIGSFLAGS=\ "-DIO_INTRAN=trivfs_protid_t trivfs_begin_using_protid (io_t)" \ "-DIO_DESTRUCTOR=trivfs_end_using_protid (trivfs_protid_t)" \ diff --git a/utils/Makefile b/utils/Makefile index 81fa2932..241b0604 100644 --- a/utils/Makefile +++ b/utils/Makefile @@ -1,4 +1,4 @@ -# Copyright (C) 1994,95,96,97,98,99,2000,01,02,12 Free Software Foundation, +# Copyright (C) 1994,95,96,97,98,99,2000,01,02,12,14 Free Software Foundation, # Inc. # # This program is free software; you can redistribute it and/or @@ -36,9 +36,9 @@ SRCS = shd.c ps.c settrans.c syncfs.c showtrans.c addauth.c rmauth.c \ OBJS = $(filter-out %.sh,$(SRCS:.c=.o)) HURDLIBS = ps ihash store fshelp ports ftpconn shouldbeinlibc LDLIBS += -lpthread -login-LDLIBS = -lutil $(LIBCRYPT) -addauth-LDLIBS = $(LIBCRYPT) -setauth-LDLIBS = $(LIBCRYPT) +login-LDLIBS = -lutil -lcrypt +addauth-LDLIBS = -lcrypt +setauth-LDLIBS = -lcrypt mount-LDLIBS = $(libblkid_LIBS) mount-CPPFLAGS = $(libblkid_CFLAGS) |