147 lines
4.5 KiB
Plaintext
147 lines
4.5 KiB
Plaintext
$OpenBSD: patch-configure,v 1.4 2007/11/01 12:59:15 steven Exp $
|
|
--- configure.orig Fri Feb 1 20:32:41 2002
|
|
+++ configure Thu Nov 1 14:09:57 2007
|
|
@@ -15,6 +15,7 @@ if test "X${PATH_SEPARATOR+set}" != Xset; then
|
|
*-DOS) lt_cv_sys_path_separator=';' ;;
|
|
*) lt_cv_sys_path_separator=':' ;;
|
|
esac
|
|
+ PATH_SEPARATOR=$lt_cv_sys_path_separator
|
|
fi
|
|
|
|
# Check that we are running under the correct shell.
|
|
@@ -2669,6 +2670,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'
|
|
@@ -3616,7 +3627,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.
|
|
@@ -4175,7 +4193,9 @@ cygwin* | mingw* | pw32* )
|
|
with_gnu_ld=no
|
|
fi
|
|
;;
|
|
-
|
|
+openbsd*)
|
|
+ with_gnu_ld=no
|
|
+ ;;
|
|
esac
|
|
|
|
ld_shlibs=yes
|
|
@@ -4579,10 +4599,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*)
|
|
@@ -5063,9 +5097,22 @@ 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 "`echo __ELF__ | $CC -E - | grep __ELF__`" = "" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
|
+ deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB shared object'
|
|
+ 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'
|
|
@@ -8848,7 +8895,7 @@ if test "${ac_cv_lib_intl_bindtextdomain+set}" = set;
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lintl $LIBS"
|
|
+LIBS="-lintl -liconv $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line 8853 "configure"
|
|
#include "confdefs.h"
|
|
@@ -8903,7 +8950,7 @@ if test "${ac_cv_lib_intl_gettext+set}" = set; then
|
|
echo $ECHO_N "(cached) $ECHO_C" >&6
|
|
else
|
|
ac_check_lib_save_LIBS=$LIBS
|
|
-LIBS="-lintl $LIBS"
|
|
+LIBS="-lintl -liconv $LIBS"
|
|
cat >conftest.$ac_ext <<_ACEOF
|
|
#line 8908 "configure"
|
|
#include "confdefs.h"
|
|
@@ -8959,6 +9006,10 @@ fi
|
|
|
|
fi
|
|
|
|
+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
|
|
+ LIBS="$LIBS -lintl";
|
|
+ fi
|
|
+
|
|
if test "$gt_cv_func_gettext_libc" = "yes" \
|
|
|| test "$gt_cv_func_gettext_libintl" = "yes"; then
|
|
cat >>confdefs.h <<\EOF
|
|
@@ -10611,7 +10662,7 @@ s,@GENCAT@,$GENCAT,;t t
|
|
s,@USE_INCLUDED_LIBINTL@,$USE_INCLUDED_LIBINTL,;t t
|
|
s,@CATALOGS@,$CATALOGS,;t t
|
|
s,@CATOBJEXT@,$CATOBJEXT,;t t
|
|
-s,@DATADIRNAME@,$DATADIRNAME,;t t
|
|
+s,@DATADIRNAME@,share,;t t
|
|
s,@GMOFILES@,$GMOFILES,;t t
|
|
s,@INSTOBJEXT@,$INSTOBJEXT,;t t
|
|
s,@INTLDEPS@,$INTLDEPS,;t t
|