From 0acae1edcf10f56e8098388b0a5a289ee8270bff Mon Sep 17 00:00:00 2001 From: Theodore Tso Date: Thu, 2 Nov 1995 22:15:24 +0000 Subject: [PATCH] Add support for Linux shared libraries git-svn-id: svn://anonsvn.mit.edu/krb5/trunk@7011 dc483132-0cff-0310-8789-dd5450dbe970 --- src/ChangeLog | 4 ++++ src/configure.in | 8 ++++---- src/util/ChangeLog | 4 ++++ src/util/autoconf/configure | 40 +++++++++++++++++++++++++++++++++++++ src/util/makeshlib.sh | 10 ++++++++++ 5 files changed, 62 insertions(+), 4 deletions(-) diff --git a/src/ChangeLog b/src/ChangeLog index 57bd260cb..0c95fec46 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,7 @@ +Thu Nov 2 16:57:45 1995 + + * configure.in: Added support for Linux shared libraries. + Sat Oct 21 15:03:06 1995 Ezra Peisach * configure.in (CONFIG_DIRS): Add config-files to list of diff --git a/src/configure.in b/src/configure.in index 11ae6e7a4..1f5ff206d 100644 --- a/src/configure.in +++ b/src/configure.in @@ -45,13 +45,13 @@ krb5_cv_shlibs_versioned_filenames=yes # version in filename of library krb5_cv_shlibs_cflags=-fPIC krb5_cv_shlibs_ext=so krb5_cv_noshlibs_ext=a -krb5_cv_shlibs_versioned_filenames=yes + krb5_cv_shlibs_versioned_filenames=yes krb5_cv_shlibs_need_nover=yes krb5_cv_shlibs_dir=shared - krb5_cv_shlibs_ldflag="-dy" - krb5_cv_noshlibs_ldflag="-dn" + krb5_cv_shlibs_ldflag= + krb5_cv_noshlibs_ldflag="-static" krb5_cv_shlibs_sym_ufo="-u " - krb5_cv_shlibs_dirhead="-R " + krb5_cv_shlibs_dirhead="-Wl,-rpath -Wl," krb5_cv_exe_need_dirs=yes krb5_cv_shlibs_use_dirs=yes krb5_cv_shlibs_use_colon_dirs=no diff --git a/src/util/ChangeLog b/src/util/ChangeLog index e8fe2fbde..02900c09f 100644 --- a/src/util/ChangeLog +++ b/src/util/ChangeLog @@ -1,3 +1,7 @@ +Thu Nov 2 17:05:05 1995 + + * makeshlib.sh: Added support for Linux shared libraries. + Wed Oct 11 17:21:16 1995 Sam Hartman * makeshlib.sh: bring in library version and do something with it for AIX. diff --git a/src/util/autoconf/configure b/src/util/autoconf/configure index cd17c0645..a54238fad 100644 --- a/src/util/autoconf/configure +++ b/src/util/autoconf/configure @@ -1,5 +1,26 @@ #! /bin/sh + +kadm_deplib='' +kadm_lib='' + +kdb5_deplib='' +kdb5_lib='' + +kdb4_deplib='' +kdb4_lib='' + +krb4_deplib='' +krb5_lib='' + +ss_deplib='' +ss_lib='' + + + + + + # Guess values for system-dependent variables and create Makefiles. # Generated automatically using autoconf version 2.4 # Copyright (C) 1992, 1993, 1994 Free Software Foundation, Inc. @@ -523,6 +544,25 @@ else echo "configure: warning: autoscan will not be built since perl is not found" 1>&2 fi +ac_aux_dir= +for ac_dir in $srcdir $srcdir/.. $srcdir/../..; do + if test -f $ac_dir/install-sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install-sh -c" + break + elif test -f $ac_dir/install.sh; then + ac_aux_dir=$ac_dir + ac_install_sh="$ac_aux_dir/install.sh -c" + break + fi +done +if test -z "$ac_aux_dir"; then + { echo "configure: error: can not find install-sh or install.sh in $srcdir $srcdir/.. $srcdir/../.." 1>&2; exit 1; } +fi +ac_config_guess=$ac_aux_dir/config.guess +ac_config_sub=$ac_aux_dir/config.sub +ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. + # Find a good install program. We prefer a C program (faster), # so one script is as good as another. But avoid the broken or # incompatible versions: diff --git a/src/util/makeshlib.sh b/src/util/makeshlib.sh index 18697c59f..10ec0be81 100644 --- a/src/util/makeshlib.sh +++ b/src/util/makeshlib.sh @@ -29,6 +29,16 @@ case $host in ld -Bshareable $ldflags -o $library $FILES $libdirfl $liblist stat=$? ;; +*-*-linux*) + FILES=`for i + do + sed -e "s;^;$i/shared/;" -e "s; ; $i/shared/;g" $i/DONE + done` + + echo $CC -G $ldflags -o $library $optflags $FILES $libdirfl $liblist + $CC --shared $ldflags -o $library $FILES $libdirfl $liblist + stat=$? + ;; *-*-solaris*) FILES=`for i do -- 2.26.2