1e8a14910a
detection scheme in configure to properly handle our -pthread and includes db-3.1.17 directly into the port, removing the version constraint on the db port. This also addresses the CORE security advisory ID CORE-20030304-01.
82 lines
3.9 KiB
Plaintext
82 lines
3.9 KiB
Plaintext
$OpenBSD: patch-aclocal_m4,v 1.3 2003/04/10 15:59:49 marcm Exp $
|
|
--- aclocal.m4.orig Mon Mar 31 08:36:49 2003
|
|
+++ aclocal.m4 Fri Apr 4 10:54:29 2003
|
|
@@ -402,7 +402,7 @@ AC_DEFUN(AC_PROG_XML_I18N_TOOLS,
|
|
XML_I18N_MERGE_DESKTOP_RULE='%.desktop: %.desktop.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -d X18T_PFORG1'
|
|
XML_I18N_MERGE_DIRECTORY_RULE='%.directory: %.directory.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -d X18T_PFORG1'
|
|
XML_I18N_MERGE_KEYS_RULE='%.keys: %.keys.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -k X18T_KEYS_KIND'
|
|
- XML_I18N_MERGE_OAF_RULE='%.oaf: %.oaf.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -o -p'
|
|
+ XML_I18N_MERGE_OAF_RULE='%.oaf: %.oaf.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; sed s/_value/value/ $< > [$]@'
|
|
XML_I18N_MERGE_PONG_RULE='%.pong: %.pong.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -x X18T_PFORG1'
|
|
XML_I18N_MERGE_SERVER_RULE='%.server: %.server.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -o -u'
|
|
XML_I18N_MERGE_SHEET_RULE='%.sheet: %.sheet.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -x -u'
|
|
@@ -2119,8 +2119,8 @@ else
|
|
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 $linker_flags'
|
|
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
|
+ 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
|
|
@@ -2129,8 +2129,8 @@ else
|
|
hardcode_libdir_flag_spec='-R$libdir'
|
|
;;
|
|
*)
|
|
- archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $linker_flags'
|
|
- hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
|
|
+ archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
|
|
+ hardcode_libdir_flag_spec='${wl}-R$libdir'
|
|
;;
|
|
esac
|
|
fi
|
|
@@ -4599,8 +4599,26 @@ dnl
|
|
dnl And better, use gthreads instead...
|
|
dnl
|
|
|
|
-AC_DEFUN([GNOME_PTHREAD_CHECK],[
|
|
+AC_DEFUN([GCC_PTHREAD_CHECK],[
|
|
PTHREAD_LIB=""
|
|
+ AC_CACHE_CHECK(
|
|
+ [if compiler recognizes -pthread],
|
|
+ evo_cv_gcc_pthread,
|
|
+ ac_save_LDFLAGS=$LDFLAGS
|
|
+ LDFLAGS="$LDFLAGS -pthread"
|
|
+ AC_TRY_LINK(
|
|
+ [#include <pthread.h>],
|
|
+ [void *p = pthread_create;],
|
|
+ [PTHREAD_LIB="-pthread" evo_cv_gcc_pthread=yes],
|
|
+ [CFLAGS=$ac_save_CFLAGS evo_cv_gcc_pthread=no]
|
|
+ )
|
|
+ )
|
|
+ AC_PROVIDE([GCC_PTHREAD_CHECK])
|
|
+])
|
|
+
|
|
+AC_DEFUN([GNOME_PTHREAD_CHECK],[
|
|
+ AC_REQUIRE([GCC_PTHREAD_CHECK])
|
|
+ if test "$evo_cv_gcc_pthread" = "no"; then
|
|
AC_CHECK_LIB(pthread, pthread_create, PTHREAD_LIB="-lpthread",
|
|
[AC_CHECK_LIB(pthreads, pthread_create, PTHREAD_LIB="-lpthreads",
|
|
[AC_CHECK_LIB(c_r, pthread_create, PTHREAD_LIB="-lc_r",
|
|
@@ -4610,6 +4628,7 @@ AC_DEFUN([GNOME_PTHREAD_CHECK],[
|
|
)]
|
|
)]
|
|
)
|
|
+ fi
|
|
AC_SUBST(PTHREAD_LIB)
|
|
AC_PROVIDE([GNOME_PTHREAD_CHECK])
|
|
])
|
|
@@ -4674,6 +4693,10 @@ AC_DEFUN([AM_GNOME_WITH_NLS],
|
|
gt_cv_func_gettext_libintl=yes,
|
|
gt_cv_func_gettext_libintl=no)],
|
|
gt_cv_func_gettext_libintl=no)])
|
|
+ fi
|
|
+
|
|
+ if test "$gt_cv_func_gettext_libintl" = "yes"; then
|
|
+ LIBS="$LIBS -lintl";
|
|
fi
|
|
|
|
if test "$gt_cv_func_gettext_libc" = "yes" \
|