170 lines
5.5 KiB
Plaintext
170 lines
5.5 KiB
Plaintext
$OpenBSD: patch-configure,v 1.7 2001/09/23 05:08:45 brad Exp $
|
|
--- configure.orig Fri Sep 14 20:47:29 2001
|
|
+++ configure Sat Sep 22 18:33:32 2001
|
|
@@ -1220,52 +1220,32 @@ echo "configure:1220: checking for worki
|
|
# Run test in a subshell; some versions of sh will print an error if
|
|
# an executable is not found, even if stderr is redirected.
|
|
# Redirect stdin to placate older versions of autoconf. Sigh.
|
|
-if (aclocal --version) < /dev/null > /dev/null 2>&1; then
|
|
- ACLOCAL=aclocal
|
|
- echo "$ac_t""found" 1>&6
|
|
-else
|
|
- ACLOCAL="$missing_dir/missing aclocal"
|
|
- echo "$ac_t""missing" 1>&6
|
|
-fi
|
|
+ACLOCAL="$missing_dir/missing aclocal"
|
|
+echo "$ac_t""missing" 1>&6
|
|
|
|
echo $ac_n "checking for working autoconf""... $ac_c" 1>&6
|
|
echo "configure:1233: checking for working autoconf" >&5
|
|
# Run test in a subshell; some versions of sh will print an error if
|
|
# an executable is not found, even if stderr is redirected.
|
|
# Redirect stdin to placate older versions of autoconf. Sigh.
|
|
-if (autoconf --version) < /dev/null > /dev/null 2>&1; then
|
|
- AUTOCONF=autoconf
|
|
- echo "$ac_t""found" 1>&6
|
|
-else
|
|
- AUTOCONF="$missing_dir/missing autoconf"
|
|
- echo "$ac_t""missing" 1>&6
|
|
-fi
|
|
+AUTOCONF="$missing_dir/missing autoconf"
|
|
+echo "$ac_t""missing" 1>&6
|
|
|
|
echo $ac_n "checking for working automake""... $ac_c" 1>&6
|
|
echo "configure:1246: checking for working automake" >&5
|
|
# Run test in a subshell; some versions of sh will print an error if
|
|
# an executable is not found, even if stderr is redirected.
|
|
# Redirect stdin to placate older versions of autoconf. Sigh.
|
|
-if (automake --version) < /dev/null > /dev/null 2>&1; then
|
|
- AUTOMAKE=automake
|
|
- echo "$ac_t""found" 1>&6
|
|
-else
|
|
- AUTOMAKE="$missing_dir/missing automake"
|
|
- echo "$ac_t""missing" 1>&6
|
|
-fi
|
|
+AUTOMAKE="$missing_dir/missing automake"
|
|
+echo "$ac_t""missing" 1>&6
|
|
|
|
echo $ac_n "checking for working autoheader""... $ac_c" 1>&6
|
|
echo "configure:1259: checking for working autoheader" >&5
|
|
# Run test in a subshell; some versions of sh will print an error if
|
|
# an executable is not found, even if stderr is redirected.
|
|
# Redirect stdin to placate older versions of autoconf. Sigh.
|
|
-if (autoheader --version) < /dev/null > /dev/null 2>&1; then
|
|
- AUTOHEADER=autoheader
|
|
- echo "$ac_t""found" 1>&6
|
|
-else
|
|
- AUTOHEADER="$missing_dir/missing autoheader"
|
|
- echo "$ac_t""missing" 1>&6
|
|
-fi
|
|
+AUTOHEADER="$missing_dir/missing autoheader"
|
|
+echo "$ac_t""missing" 1>&6
|
|
|
|
echo $ac_n "checking for working makeinfo""... $ac_c" 1>&6
|
|
echo "configure:1272: checking for working makeinfo" >&5
|
|
@@ -2260,6 +2240,16 @@ newos6*)
|
|
lt_cv_file_magic_test_file=/usr/lib/libnls.so
|
|
;;
|
|
|
|
+openbsd*)
|
|
+ lt_cv_file_magic_cmd=/usr/bin/file
|
|
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
|
|
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
|
+ lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
|
|
+ else
|
|
+ lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
|
|
+ fi
|
|
+ ;;
|
|
+
|
|
osf3* | osf4* | osf5*)
|
|
# this will be overridden with pass_all, but let us keep it just in case
|
|
lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
|
|
@@ -2968,7 +2958,14 @@ old_postuninstall_cmds=
|
|
|
|
if test -n "$RANLIB"; then
|
|
old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
|
|
- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
|
+ case "$host_os" in
|
|
+ openbsd*)
|
|
+ old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
|
|
+ ;;
|
|
+ *)
|
|
+ old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
|
|
+ ;;
|
|
+ esac
|
|
fi
|
|
|
|
# Allow CC to be a program name with arguments.
|
|
@@ -3465,7 +3462,9 @@ cygwin* | mingw* | pw32* )
|
|
with_gnu_ld=no
|
|
fi
|
|
;;
|
|
-
|
|
+openbsd*)
|
|
+ with_gnu_ld=no
|
|
+ ;;
|
|
esac
|
|
|
|
ld_shlibs=yes
|
|
@@ -3869,10 +3868,24 @@ else
|
|
;;
|
|
|
|
openbsd*)
|
|
- archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
|
- hardcode_libdir_flag_spec='-R$libdir'
|
|
hardcode_direct=yes
|
|
hardcode_shlibpath_var=no
|
|
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
|
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
|
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
|
|
+ export_dynamic_flag_spec='${wl}-E'
|
|
+ else
|
|
+ case "$host_os" in
|
|
+ openbsd[01].* | openbsd2.[0-7] | openbsd2.[0-7].*)
|
|
+ archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
|
|
+ hardcode_libdir_flag_spec='-R$libdir'
|
|
+ ;;
|
|
+ *)
|
|
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
|
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
|
|
+ ;;
|
|
+ esac
|
|
+ fi
|
|
;;
|
|
|
|
os2*)
|
|
@@ -4349,9 +4362,21 @@ newsos6)
|
|
|
|
openbsd*)
|
|
version_type=sunos
|
|
- if test "$with_gnu_ld" = yes; then
|
|
- need_lib_prefix=no
|
|
- need_version=no
|
|
+ need_lib_prefix=no
|
|
+ need_version=no
|
|
+ sys_lib_search_path_spec="/usr/lib"
|
|
+ sys_lib_dlsearch_path_spec="/usr/lib /usr/local/lib"
|
|
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
|
+ case "$host_os" in
|
|
+ openbsd2.[89] | openbsd2.[89].*)
|
|
+ shlibpath_overrides_runpath=no
|
|
+ ;;
|
|
+ *)
|
|
+ shlibpath_overrides_runpath=yes
|
|
+ ;;
|
|
+ esac
|
|
+ else
|
|
+ shlibpath_overrides_runpath=yes
|
|
fi
|
|
library_names_spec='${libname}${release}.so$versuffix ${libname}.so$versuffix'
|
|
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
|
@@ -8375,7 +8400,7 @@ else
|
|
;;
|
|
esac
|
|
fi
|
|
-EMACS="$ac_cv_path_EMACS"
|
|
+EMACS=no
|
|
if test -n "$EMACS"; then
|
|
echo "$ac_t""$EMACS" 1>&6
|
|
else
|