summaryrefslogtreecommitdiff
path: root/lib-src
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1996-08-28 15:52:48 +0000
committerRichard M. Stallman <rms@gnu.org>1996-08-28 15:52:48 +0000
commitf38210883cd2e003e06076a9cd725ee6890e12c7 (patch)
tree008cac8ea68d5fb3870e52eaaa5cb464e40e66af /lib-src
parentace825e70b6349e97bd40a1aeed81d95a1b7ddc3 (diff)
downloademacs-f38210883cd2e003e06076a9cd725ee6890e12c7.tar.gz
(INSTALL_STRIP): New variable.
(${archlibdir}): Use INSTALL_STRIP. (MOVE_LIBS): Use conditionals on KERBEROS, HAVE_LIBKRB, HAVE_LIBDES, HAVE_LIBCOM_ERR to set it up.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/Makefile.in30
1 files changed, 19 insertions, 11 deletions
diff --git a/lib-src/Makefile.in b/lib-src/Makefile.in
index a3579754283..da9a0b5b278 100644
--- a/lib-src/Makefile.in
+++ b/lib-src/Makefile.in
@@ -83,6 +83,8 @@ archlibdir=@archlibdir@
INSTALL = @INSTALL@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_DATA = @INSTALL_DATA@
+# By default, we uphold the dignity of our programs.
+INSTALL_STRIP =
# ========================== Lists of Files ===========================
@@ -179,18 +181,24 @@ MOVE_FLAGS=
#define BLESSMAIL
#endif
-#if defined (KERBEROS) && defined (HAVE_LIBKRB) && defined (HAVE_LIBDES)
-MOVE_LIBS= -lkrb -ldes -lcom_err
-/* For KERBEROS + KRB5
- MOVE_LIBS= -lkrb5 -lcrypto -lisode -lcom_err
- Add "-lhesiod" if HESIOD is defined. */
-#else
-#if defined (KERBEROS) && defined (HAVE_LIBKRB)
-MOVE_LIBS= -lkrb -lcom_err
-#else
-MOVE_LIBS=
+#ifdef KERBEROS
+#ifdef HAVE_LIBKRB
+ /* For krb5, use -lkrb5 */
+ KRBLIB=-lkrb
+#endif
+#ifdef HAVE_LIBDES
+ /* For krb4, use -lcrypto */
+ DESLIB=-ldes
#endif
+#ifdef HAVE_LIBCOM_ERR
+ COM_ERRLIB=-lcom_err
#endif
+#endif /* KERBEROS */
+
+/* If HESIOD is defined, set this to "-lhesiod". */
+HESIODLIB=
+
+MOVE_LIBS=$(KRBLIB) $(DESLIB) $(COM_ERRLIB) $(HESIODLIB)
LOADLIBES=LIBS_SYSTEM LIBS_MACHINE LIB_STANDARD_LIBSRC
@@ -246,7 +254,7 @@ ${archlibdir}: all
$(top_srcdir)/mkinstalldirs ${archlibdir}
if [ `(cd ${archlibdir} && /bin/pwd)` != `/bin/pwd` ]; then \
for file in ${UTILITIES}; do \
- $(INSTALL_PROGRAM) $$file ${archlibdir}/$$file ; \
+ $(INSTALL_PROGRAM) $(INSTALL_STRIP) $$file ${archlibdir}/$$file ; \
done ; \
fi
if [ `(cd ${archlibdir} && /bin/pwd)` \