ea7846a86f
The distfiles should be publically available shortly. this fixes a few nits: build accessibility, move cvscheck to avoid conflicts. i18n files missing.
118 lines
4.7 KiB
Plaintext
118 lines
4.7 KiB
Plaintext
$OpenBSD: patch-aclocal_m4,v 1.3 2004/03/07 21:08:44 espie Exp $
|
|
--- aclocal.m4.orig 2004-02-29 22:25:14.000000000 +0100
|
|
+++ aclocal.m4 2004-03-01 13:18:30.000000000 +0100
|
|
@@ -4050,8 +4050,8 @@ fi
|
|
|
|
AC_CACHE_VAL(kde_cv_try_link_python_$1,
|
|
[
|
|
-kde_save_cflags="$CFLAGS"
|
|
-CFLAGS="$CFLAGS $PYTHONINC"
|
|
+kde_save_cppflags="$CPPFLAGS"
|
|
+CPPFLAGS="$CPPFLAGS $PYTHONINC"
|
|
kde_save_libs="$LIBS"
|
|
LIBS="$LIBS $LIBPYTHON $2 $LIBDL $LIBSOCKET"
|
|
kde_save_ldflags="$LDFLAGS"
|
|
@@ -4066,7 +4066,7 @@ AC_TRY_LINK(
|
|
[kde_cv_try_link_python_$1=yes],
|
|
[kde_cv_try_link_python_$1=no]
|
|
)
|
|
-CFLAGS="$kde_save_cflags"
|
|
+CPPFLAGS="$kde_save_cppflags"
|
|
LIBS="$kde_save_libs"
|
|
LDFLAGS="$kde_save_ldflags"
|
|
])
|
|
@@ -6475,6 +6475,7 @@ AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER]
|
|
[AC_MSG_CHECKING([dynamic linker characteristics])
|
|
library_names_spec=
|
|
libname_spec='lib$name'
|
|
+modname_spec='lib$name'
|
|
soname_spec=
|
|
shrext=".so"
|
|
postinstall_cmds=
|
|
@@ -6877,6 +6878,7 @@ openbsd*)
|
|
need_lib_prefix=no
|
|
need_version=no
|
|
library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
|
|
+ modname_spec='lib_$name'
|
|
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
|
|
shlibpath_var=LD_LIBRARY_PATH
|
|
if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
|
|
@@ -7606,6 +7608,7 @@ openbsd*)
|
|
else
|
|
lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
|
|
fi
|
|
+ lt_cv_deplibs_check_method=pass_all
|
|
;;
|
|
|
|
osf3* | osf4* | osf5*)
|
|
@@ -8553,6 +8556,16 @@ case $host_os in
|
|
# Workaround some broken pre-1.5 toolchains
|
|
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
|
|
;;
|
|
+ openbsd*)
|
|
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
|
|
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
|
|
+
|
|
+ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
|
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
|
|
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R$libdir'
|
|
+ _LT_AC_TAGVAR(remove_libsearchpath, $1)='yes'
|
|
+ _LT_AC_TAGVAR(remove_lgcc, $1)='yes'
|
|
+ ;;
|
|
osf3*)
|
|
case $cc_basename in
|
|
KCC)
|
|
@@ -8926,15 +8939,24 @@ if AC_TRY_EVAL(ac_compile); then
|
|
else
|
|
_LT_AC_TAGVAR(compiler_lib_search_path, $1)="${_LT_AC_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
|
|
fi
|
|
+ if test "x$_LT_AC_TAGVAR(remove_libsearchpath, $1)" = "xyes"; then
|
|
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=""
|
|
+ fi
|
|
;;
|
|
# The "-l" case would never come before the object being
|
|
# linked, so don't bother handling this case.
|
|
esac
|
|
else
|
|
+ add="${prev}$p"
|
|
+ if test "x$_LT_AC_TAGVAR(remove_lgcc, $1)" = "xyes"; then
|
|
+ case "$add" in
|
|
+ -lgcc ) add="" ;;
|
|
+ esac
|
|
+ fi
|
|
if test -z "$_LT_AC_TAGVAR(postdeps, $1)"; then
|
|
- _LT_AC_TAGVAR(postdeps, $1)="${prev}${p}"
|
|
+ _LT_AC_TAGVAR(postdeps, $1)="$add"
|
|
else
|
|
- _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${prev}${p}"
|
|
+ _LT_AC_TAGVAR(postdeps, $1)="${_LT_AC_TAGVAR(postdeps, $1)} ${add}"
|
|
fi
|
|
fi
|
|
;;
|
|
@@ -9191,7 +9213,8 @@ if test -f "$ltmain"; then
|
|
# careful not to overquote the AC_SUBSTed values. We take copies of the
|
|
# variables and quote the copies for generation of the libtool script.
|
|
for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
|
|
- libname_spec library_names_spec soname_spec extract_expsyms_cmds \
|
|
+ libname_spec modname_spec library_names_spec soname_spec \
|
|
+ extract_expsyms_cmds \
|
|
old_striplib striplib file_magic_cmd finish_cmds finish_eval \
|
|
deplibs_check_method reload_flag reload_cmds need_locks \
|
|
lt_cv_sys_global_symbol_pipe lt_cv_sys_global_symbol_to_cdecl \
|
|
@@ -9455,6 +9478,7 @@ version_type=$version_type
|
|
|
|
# Format of library name prefix.
|
|
libname_spec=$lt_libname_spec
|
|
+modname_spec=$lt_modname_spec
|
|
|
|
# List of archive names. First name is the real one, the rest are links.
|
|
# The last name is the one that the linker finds with -lNAME.
|
|
@@ -10884,6 +10908,7 @@ EOF
|
|
_LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
|
|
_LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
|
|
_LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
|
|
+ _LT_AC_TAGVAR(remove_lgcc, $1)='yes'
|
|
;;
|
|
|
|
osf3*)
|