Mercurial > mxe-octave

annotate src/vmime-0.9.1-svn-r533-20100215.patch @ 745:8ea29766f021

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgrade package vmime to 0.9.1-svn-r533
author Mark Brand <mabrand@mabrand.nl>
date Mon, 15 Feb 2010 11:05:16 +0100
parents
children 1f5b2dfe8966
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
745
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
1 This file is part of mingw-cross-env.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
2 diff -urN b/m4/lib-link.m4 c/m4/lib-link.m4
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
3 --- b/m4/lib-link.m4 2008-01-05 18:49:17.000000000 +0100
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
4 +++ c/m4/lib-link.m4 2010-02-15 10:38:53.572219098 +0100
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
5 @@ -1,17 +1,19 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
6 -# lib-link.m4 serial 6 (gettext-0.14.3)
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
7 -dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
8 +# lib-link.m4 serial 13 (gettext-0.17)
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
9 +dnl Copyright (C) 2001-2007 Free Software Foundation, Inc.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
10 dnl This file is free software; the Free Software Foundation
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
11 dnl gives unlimited permission to copy and/or distribute it,
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
12 dnl with or without modifications, as long as this notice is preserved.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
13
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
14 dnl From Bruno Haible.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
15
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
16 -AC_PREREQ(2.50)
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
17 +AC_PREREQ(2.54)
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
18
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
19 dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
20 dnl the libraries corresponding to explicit and implicit dependencies.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
21 dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
22 dnl augments the CPPFLAGS variable.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
23 +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
24 +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
25 AC_DEFUN([AC_LIB_LINKFLAGS],
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
26 [
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
27 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
28 @@ -24,13 +26,16 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
29 ac_cv_lib[]Name[]_libs="$LIB[]NAME"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
30 ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
31 ac_cv_lib[]Name[]_cppflags="$INC[]NAME"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
32 + ac_cv_lib[]Name[]_prefix="$LIB[]NAME[]_PREFIX"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
33 ])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
34 LIB[]NAME="$ac_cv_lib[]Name[]_libs"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
35 LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
36 INC[]NAME="$ac_cv_lib[]Name[]_cppflags"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
37 + LIB[]NAME[]_PREFIX="$ac_cv_lib[]Name[]_prefix"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
38 AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME)
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
39 AC_SUBST([LIB]NAME)
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
40 AC_SUBST([LTLIB]NAME)
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
41 + AC_SUBST([LIB]NAME[_PREFIX])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
42 dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
43 dnl results of this search when this library appears as a dependency.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
44 HAVE_LIB[]NAME=yes
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
45 @@ -46,6 +51,8 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
46 dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
47 dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
48 dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
49 +dnl Sets and AC_SUBSTs the LIB${NAME}_PREFIX variable to nonempty if libname
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
50 +dnl was found in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
51 AC_DEFUN([AC_LIB_HAVE_LINKFLAGS],
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
52 [
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
53 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
54 @@ -82,17 +89,23 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
55 CPPFLAGS="$ac_save_CPPFLAGS"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
56 LIB[]NAME=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
57 LTLIB[]NAME=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
58 + LIB[]NAME[]_PREFIX=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
59 fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
60 AC_SUBST([HAVE_LIB]NAME)
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
61 AC_SUBST([LIB]NAME)
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
62 AC_SUBST([LTLIB]NAME)
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
63 + AC_SUBST([LIB]NAME[_PREFIX])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
64 undefine([Name])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
65 undefine([NAME])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
66 ])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
67
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
68 dnl Determine the platform dependent parameters needed to use rpath:
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
69 -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator,
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
70 -dnl hardcode_direct, hardcode_minus_L.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
71 +dnl acl_libext,
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
72 +dnl acl_shlibext,
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
73 +dnl acl_hardcode_libdir_flag_spec,
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
74 +dnl acl_hardcode_libdir_separator,
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
75 +dnl acl_hardcode_direct,
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
76 +dnl acl_hardcode_minus_L.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
77 AC_DEFUN([AC_LIB_RPATH],
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
78 [
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
79 dnl Tell automake >= 1.10 to complain if config.rpath is missing.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
80 @@ -109,12 +122,14 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
81 acl_cv_rpath=done
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
82 ])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
83 wl="$acl_cv_wl"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
84 - libext="$acl_cv_libext"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
85 - shlibext="$acl_cv_shlibext"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
86 - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
87 - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
88 - hardcode_direct="$acl_cv_hardcode_direct"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
89 - hardcode_minus_L="$acl_cv_hardcode_minus_L"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
90 + acl_libext="$acl_cv_libext"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
91 + acl_shlibext="$acl_cv_shlibext"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
92 + acl_libname_spec="$acl_cv_libname_spec"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
93 + acl_library_names_spec="$acl_cv_library_names_spec"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
94 + acl_hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
95 + acl_hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
96 + acl_hardcode_direct="$acl_cv_hardcode_direct"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
97 + acl_hardcode_minus_L="$acl_cv_hardcode_minus_L"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
98 dnl Determine whether the user wants rpath handling at all.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
99 AC_ARG_ENABLE(rpath,
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
100 [ --disable-rpath do not hardcode runtime library paths],
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
101 @@ -124,19 +139,24 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
102 dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
103 dnl the libraries corresponding to explicit and implicit dependencies.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
104 dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
105 +dnl Also, sets the LIB${NAME}_PREFIX variable to nonempty if libname was found
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
106 +dnl in ${LIB${NAME}_PREFIX}/$acl_libdirstem.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
107 AC_DEFUN([AC_LIB_LINKFLAGS_BODY],
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
108 [
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
109 + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
110 define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-],
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
111 [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
112 + dnl Autoconf >= 2.61 supports dots in --with options.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
113 + define([N_A_M_E],[m4_if(m4_version_compare(m4_defn([m4_PACKAGE_VERSION]),[2.61]),[-1],[translit([$1],[.],[_])],[$1])])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
114 dnl By default, look in $includedir and $libdir.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
115 use_additional=yes
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
116 AC_LIB_WITH_FINAL_PREFIX([
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
117 eval additional_includedir=\"$includedir\"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
118 eval additional_libdir=\"$libdir\"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
119 ])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
120 - AC_LIB_ARG_WITH([lib$1-prefix],
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
121 -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
122 - --without-lib$1-prefix don't search for lib$1 in includedir and libdir],
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
123 + AC_LIB_ARG_WITH([lib]N_A_M_E[-prefix],
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
124 +[ --with-lib]N_A_M_E[-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
125 + --without-lib]N_A_M_E[-prefix don't search for lib$1 in includedir and libdir],
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
126 [
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
127 if test "X$withval" = "Xno"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
128 use_additional=no
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
129 @@ -148,7 +168,7 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
130 ])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
131 else
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
132 additional_includedir="$withval/include"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
133 - additional_libdir="$withval/lib"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
134 + additional_libdir="$withval/$acl_libdirstem"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
135 fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
136 fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
137 ])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
138 @@ -157,6 +177,7 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
139 LIB[]NAME=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
140 LTLIB[]NAME=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
141 INC[]NAME=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
142 + LIB[]NAME[]_PREFIX=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
143 rpathdirs=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
144 ltrpathdirs=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
145 names_already_handled=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
146 @@ -196,22 +217,55 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
147 found_la=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
148 found_so=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
149 found_a=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
150 + eval libname=\"$acl_libname_spec\" # typically: libname=lib$name
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
151 + if test -n "$acl_shlibext"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
152 + shrext=".$acl_shlibext" # typically: shrext=.so
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
153 + else
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
154 + shrext=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
155 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
156 if test $use_additional = yes; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
157 - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
158 - found_dir="$additional_libdir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
159 - found_so="$additional_libdir/lib$name.$shlibext"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
160 - if test -f "$additional_libdir/lib$name.la"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
161 - found_la="$additional_libdir/lib$name.la"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
162 - fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
163 - else
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
164 - if test -f "$additional_libdir/lib$name.$libext"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
165 - found_dir="$additional_libdir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
166 - found_a="$additional_libdir/lib$name.$libext"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
167 - if test -f "$additional_libdir/lib$name.la"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
168 - found_la="$additional_libdir/lib$name.la"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
169 + dir="$additional_libdir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
170 + dnl The same code as in the loop below:
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
171 + dnl First look for a shared library.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
172 + if test -n "$acl_shlibext"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
173 + if test -f "$dir/$libname$shrext"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
174 + found_dir="$dir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
175 + found_so="$dir/$libname$shrext"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
176 + else
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
177 + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
178 + ver=`(cd "$dir" && \
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
179 + for f in "$libname$shrext".*; do echo "$f"; done \
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
180 + | sed -e "s,^$libname$shrext\\\\.,," \
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
181 + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
182 + | sed 1q ) 2>/dev/null`
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
183 + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
184 + found_dir="$dir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
185 + found_so="$dir/$libname$shrext.$ver"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
186 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
187 + else
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
188 + eval library_names=\"$acl_library_names_spec\"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
189 + for f in $library_names; do
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
190 + if test -f "$dir/$f"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
191 + found_dir="$dir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
192 + found_so="$dir/$f"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
193 + break
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
194 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
195 + done
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
196 fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
197 fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
198 fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
199 + dnl Then look for a static library.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
200 + if test "X$found_dir" = "X"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
201 + if test -f "$dir/$libname.$acl_libext"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
202 + found_dir="$dir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
203 + found_a="$dir/$libname.$acl_libext"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
204 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
205 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
206 + if test "X$found_dir" != "X"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
207 + if test -f "$dir/$libname.la"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
208 + found_la="$dir/$libname.la"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
209 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
210 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
211 fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
212 if test "X$found_dir" = "X"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
213 for x in $LDFLAGS $LTLIB[]NAME; do
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
214 @@ -219,21 +273,46 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
215 case "$x" in
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
216 -L*)
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
217 dir=`echo "X$x" | sed -e 's/^X-L//'`
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
218 - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
219 - found_dir="$dir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
220 - found_so="$dir/lib$name.$shlibext"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
221 - if test -f "$dir/lib$name.la"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
222 - found_la="$dir/lib$name.la"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
223 - fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
224 - else
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
225 - if test -f "$dir/lib$name.$libext"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
226 + dnl First look for a shared library.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
227 + if test -n "$acl_shlibext"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
228 + if test -f "$dir/$libname$shrext"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
229 found_dir="$dir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
230 - found_a="$dir/lib$name.$libext"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
231 - if test -f "$dir/lib$name.la"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
232 - found_la="$dir/lib$name.la"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
233 + found_so="$dir/$libname$shrext"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
234 + else
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
235 + if test "$acl_library_names_spec" = '$libname$shrext$versuffix'; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
236 + ver=`(cd "$dir" && \
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
237 + for f in "$libname$shrext".*; do echo "$f"; done \
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
238 + | sed -e "s,^$libname$shrext\\\\.,," \
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
239 + | sort -t '.' -n -r -k1,1 -k2,2 -k3,3 -k4,4 -k5,5 \
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
240 + | sed 1q ) 2>/dev/null`
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
241 + if test -n "$ver" && test -f "$dir/$libname$shrext.$ver"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
242 + found_dir="$dir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
243 + found_so="$dir/$libname$shrext.$ver"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
244 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
245 + else
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
246 + eval library_names=\"$acl_library_names_spec\"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
247 + for f in $library_names; do
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
248 + if test -f "$dir/$f"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
249 + found_dir="$dir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
250 + found_so="$dir/$f"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
251 + break
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
252 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
253 + done
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
254 fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
255 fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
256 fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
257 + dnl Then look for a static library.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
258 + if test "X$found_dir" = "X"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
259 + if test -f "$dir/$libname.$acl_libext"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
260 + found_dir="$dir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
261 + found_a="$dir/$libname.$acl_libext"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
262 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
263 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
264 + if test "X$found_dir" != "X"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
265 + if test -f "$dir/$libname.la"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
266 + found_la="$dir/$libname.la"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
267 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
268 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
269 ;;
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
270 esac
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
271 if test "X$found_dir" != "X"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
272 @@ -248,7 +327,7 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
273 dnl Linking with a shared library. We attempt to hardcode its
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
274 dnl directory into the executable's runpath, unless it's the
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
275 dnl standard /usr/lib.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
276 - if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/lib"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
277 + if test "$enable_rpath" = no || test "X$found_dir" = "X/usr/$acl_libdirstem"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
278 dnl No hardcoding is needed.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
279 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
280 else
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
281 @@ -267,12 +346,12 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
282 ltrpathdirs="$ltrpathdirs $found_dir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
283 fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
284 dnl The hardcoding into $LIBNAME is system dependent.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
285 - if test "$hardcode_direct" = yes; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
286 + if test "$acl_hardcode_direct" = yes; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
287 dnl Using DIR/libNAME.so during linking hardcodes DIR into the
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
288 dnl resulting binary.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
289 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
290 else
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
291 - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
292 + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
293 dnl Use an explicit option to hardcode DIR into the resulting
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
294 dnl binary.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
295 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
296 @@ -303,13 +382,13 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
297 if test -z "$haveit"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
298 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
299 fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
300 - if test "$hardcode_minus_L" != no; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
301 + if test "$acl_hardcode_minus_L" != no; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
302 dnl FIXME: Not sure whether we should use
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
303 dnl "-L$found_dir -l$name" or "-L$found_dir $found_so"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
304 dnl here.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
305 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
306 else
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
307 - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
308 + dnl We cannot use $acl_hardcode_runpath_var and LD_RUN_PATH
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
309 dnl here, because this doesn't fit in flags passed to the
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
310 dnl compiler. So give up. No hardcoding. This affects only
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
311 dnl very old systems.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
312 @@ -334,8 +413,9 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
313 dnl Assume the include files are nearby.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
314 additional_includedir=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
315 case "$found_dir" in
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
316 - */lib | */lib/)
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
317 - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'`
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
318 + */$acl_libdirstem | */$acl_libdirstem/)
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
319 + basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e "s,/$acl_libdirstem/"'*$,,'`
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
320 + LIB[]NAME[]_PREFIX="$basedir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
321 additional_includedir="$basedir/include"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
322 ;;
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
323 esac
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
324 @@ -396,9 +476,9 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
325 dnl 3. if it's already present in $LDFLAGS or the already
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
326 dnl constructed $LIBNAME,
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
327 dnl 4. if it doesn't exist as a directory.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
328 - if test "X$additional_libdir" != "X/usr/lib"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
329 + if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
330 haveit=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
331 - if test "X$additional_libdir" = "X/usr/local/lib"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
332 + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
333 if test -n "$GCC"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
334 case $host_os in
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
335 linux* | gnu* | k*bsd*-gnu) haveit=yes;;
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
336 @@ -497,18 +577,18 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
337 done
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
338 done
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
339 if test "X$rpathdirs" != "X"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
340 - if test -n "$hardcode_libdir_separator"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
341 + if test -n "$acl_hardcode_libdir_separator"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
342 dnl Weird platform: only the last -rpath option counts, the user must
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
343 dnl pass all path elements in one option. We can arrange that for a
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
344 dnl single library, but not when more than one $LIBNAMEs are used.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
345 alldirs=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
346 for found_dir in $rpathdirs; do
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
347 - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
348 + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$found_dir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
349 done
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
350 - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
351 + dnl Note: acl_hardcode_libdir_flag_spec uses $libdir and $wl.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
352 acl_save_libdir="$libdir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
353 libdir="$alldirs"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
354 - eval flag=\"$hardcode_libdir_flag_spec\"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
355 + eval flag=\"$acl_hardcode_libdir_flag_spec\"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
356 libdir="$acl_save_libdir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
357 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
358 else
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
359 @@ -516,7 +596,7 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
360 for found_dir in $rpathdirs; do
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
361 acl_save_libdir="$libdir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
362 libdir="$found_dir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
363 - eval flag=\"$hardcode_libdir_flag_spec\"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
364 + eval flag=\"$acl_hardcode_libdir_flag_spec\"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
365 libdir="$acl_save_libdir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
366 LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
367 done
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
368 @@ -551,3 +631,79 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
369 fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
370 done
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
371 ])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
372 +
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
373 +dnl For those cases where a variable contains several -L and -l options
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
374 +dnl referring to unknown libraries and directories, this macro determines the
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
375 +dnl necessary additional linker options for the runtime path.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
376 +dnl AC_LIB_LINKFLAGS_FROM_LIBS([LDADDVAR], [LIBSVALUE], [USE-LIBTOOL])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
377 +dnl sets LDADDVAR to linker options needed together with LIBSVALUE.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
378 +dnl If USE-LIBTOOL evaluates to non-empty, linking with libtool is assumed,
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
379 +dnl otherwise linking without libtool is assumed.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
380 +AC_DEFUN([AC_LIB_LINKFLAGS_FROM_LIBS],
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
381 +[
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
382 + AC_REQUIRE([AC_LIB_RPATH])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
383 + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
384 + $1=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
385 + if test "$enable_rpath" != no; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
386 + if test -n "$acl_hardcode_libdir_flag_spec" && test "$acl_hardcode_minus_L" = no; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
387 + dnl Use an explicit option to hardcode directories into the resulting
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
388 + dnl binary.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
389 + rpathdirs=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
390 + next=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
391 + for opt in $2; do
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
392 + if test -n "$next"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
393 + dir="$next"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
394 + dnl No need to hardcode the standard /usr/lib.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
395 + if test "X$dir" != "X/usr/$acl_libdirstem"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
396 + rpathdirs="$rpathdirs $dir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
397 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
398 + next=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
399 + else
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
400 + case $opt in
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
401 + -L) next=yes ;;
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
402 + -L*) dir=`echo "X$opt" | sed -e 's,^X-L,,'`
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
403 + dnl No need to hardcode the standard /usr/lib.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
404 + if test "X$dir" != "X/usr/$acl_libdirstem"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
405 + rpathdirs="$rpathdirs $dir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
406 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
407 + next= ;;
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
408 + *) next= ;;
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
409 + esac
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
410 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
411 + done
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
412 + if test "X$rpathdirs" != "X"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
413 + if test -n ""$3""; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
414 + dnl libtool is used for linking. Use -R options.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
415 + for dir in $rpathdirs; do
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
416 + $1="${$1}${$1:+ }-R$dir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
417 + done
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
418 + else
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
419 + dnl The linker is used for linking directly.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
420 + if test -n "$acl_hardcode_libdir_separator"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
421 + dnl Weird platform: only the last -rpath option counts, the user
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
422 + dnl must pass all path elements in one option.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
423 + alldirs=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
424 + for dir in $rpathdirs; do
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
425 + alldirs="${alldirs}${alldirs:+$acl_hardcode_libdir_separator}$dir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
426 + done
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
427 + acl_save_libdir="$libdir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
428 + libdir="$alldirs"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
429 + eval flag=\"$acl_hardcode_libdir_flag_spec\"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
430 + libdir="$acl_save_libdir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
431 + $1="$flag"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
432 + else
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
433 + dnl The -rpath options are cumulative.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
434 + for dir in $rpathdirs; do
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
435 + acl_save_libdir="$libdir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
436 + libdir="$dir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
437 + eval flag=\"$acl_hardcode_libdir_flag_spec\"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
438 + libdir="$acl_save_libdir"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
439 + $1="${$1}${$1:+ }$flag"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
440 + done
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
441 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
442 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
443 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
444 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
445 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
446 + AC_SUBST([$1])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
447 +])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
448 diff -urN b/m4/lib-prefix.m4 c/m4/lib-prefix.m4
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
449 --- b/m4/lib-prefix.m4 2008-01-05 18:49:17.000000000 +0100
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
450 +++ c/m4/lib-prefix.m4 2010-02-15 10:39:25.710466533 +0100
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
451 @@ -1,4 +1,4 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
452 -# lib-prefix.m4 serial 4 (gettext-0.14.2)
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
453 +# lib-prefix.m4 serial 5 (gettext-0.15)
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
454 dnl Copyright (C) 2001-2005 Free Software Foundation, Inc.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
455 dnl This file is free software; the Free Software Foundation
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
456 dnl gives unlimited permission to copy and/or distribute it,
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
457 @@ -24,6 +24,7 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
458 AC_BEFORE([$0], [AC_LIB_LINKFLAGS])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
459 AC_REQUIRE([AC_PROG_CC])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
460 AC_REQUIRE([AC_CANONICAL_HOST])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
461 + AC_REQUIRE([AC_LIB_PREPARE_MULTILIB])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
462 AC_REQUIRE([AC_LIB_PREPARE_PREFIX])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
463 dnl By default, look in $includedir and $libdir.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
464 use_additional=yes
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
465 @@ -45,7 +46,7 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
466 ])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
467 else
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
468 additional_includedir="$withval/include"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
469 - additional_libdir="$withval/lib"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
470 + additional_libdir="$withval/$acl_libdirstem"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
471 fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
472 fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
473 ])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
474 @@ -87,7 +88,7 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
475 dnl 2. if it's already present in $LDFLAGS,
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
476 dnl 3. if it's /usr/local/lib and we are using GCC on Linux,
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
477 dnl 4. if it doesn't exist as a directory.
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
478 - if test "X$additional_libdir" != "X/usr/lib"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
479 + if test "X$additional_libdir" != "X/usr/$acl_libdirstem"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
480 haveit=
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
481 for x in $LDFLAGS; do
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
482 AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
483 @@ -97,7 +98,7 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
484 fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
485 done
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
486 if test -z "$haveit"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
487 - if test "X$additional_libdir" = "X/usr/local/lib"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
488 + if test "X$additional_libdir" = "X/usr/local/$acl_libdirstem"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
489 if test -n "$GCC"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
490 case $host_os in
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
491 linux*) haveit=yes;;
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
492 @@ -151,3 +152,34 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
493 exec_prefix="$acl_save_exec_prefix"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
494 prefix="$acl_save_prefix"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
495 ])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
496 +
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
497 +dnl AC_LIB_PREPARE_MULTILIB creates a variable acl_libdirstem, containing
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
498 +dnl the basename of the libdir, either "lib" or "lib64".
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
499 +AC_DEFUN([AC_LIB_PREPARE_MULTILIB],
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
500 +[
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
501 + dnl There is no formal standard regarding lib and lib64. The current
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
502 + dnl practice is that on a system supporting 32-bit and 64-bit instruction
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
503 + dnl sets or ABIs, 64-bit libraries go under $prefix/lib64 and 32-bit
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
504 + dnl libraries go under $prefix/lib. We determine the compiler's default
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
505 + dnl mode by looking at the compiler's library search path. If at least
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
506 + dnl of its elements ends in /lib64 or points to a directory whose absolute
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
507 + dnl pathname ends in /lib64, we assume a 64-bit ABI. Otherwise we use the
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
508 + dnl default, namely "lib".
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
509 + acl_libdirstem=lib
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
510 + searchpath=`(LC_ALL=C $CC -print-search-dirs) 2>/dev/null | sed -n -e 's,^libraries: ,,p' | sed -e 's,^=,,'`
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
511 + if test -n "$searchpath"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
512 + acl_save_IFS="${IFS= }"; IFS=":"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
513 + for searchdir in $searchpath; do
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
514 + if test -d "$searchdir"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
515 + case "$searchdir" in
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
516 + */lib64/ | */lib64 ) acl_libdirstem=lib64 ;;
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
517 + *) searchdir=`cd "$searchdir" && pwd`
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
518 + case "$searchdir" in
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
519 + */lib64 ) acl_libdirstem=lib64 ;;
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
520 + esac ;;
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
521 + esac
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
522 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
523 + done
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
524 + IFS="$acl_save_IFS"
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
525 + fi
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
526 +])
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
527 diff -urN b/SConstruct c/SConstruct
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
528 --- b/SConstruct 2010-02-15 10:42:41.522349056 +0100
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
529 +++ c/SConstruct 2010-02-15 10:38:27.636218961 +0100
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
530 @@ -459,15 +459,15 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
531
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
532
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
533 # Command line options
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
534 -opts = Options('options.cache')
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
535 +opts = Variables('options.cache')
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
536
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
537 -opts.AddOptions(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
538 +opts.AddVariables(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
539 (
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
540 'prefix',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
541 'Installation prefix directory',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
542 '/usr'
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
543 ),
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
544 - EnumOption(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
545 + EnumVariable(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
546 'debug',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
547 'Debug version (useful for developers only)',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
548 'no',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
549 @@ -475,7 +475,7 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
550 map = { },
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
551 ignorecase = 1
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
552 ),
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
553 - EnumOption(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
554 + EnumVariable(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
555 'with_messaging',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
556 'Messaging support (connection to mail store/transport servers)',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
557 'yes',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
558 @@ -483,7 +483,7 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
559 map = { },
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
560 ignorecase = 1
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
561 ),
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
562 - EnumOption(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
563 + EnumVariable(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
564 'with_filesystem',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
565 'Enable file-system support (this is needed for "maildir" messaging support)',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
566 'yes',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
567 @@ -509,7 +509,7 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
568 + 'Currently available platform handlers: posix.',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
569 '"posix"'
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
570 ),
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
571 - EnumOption(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
572 + EnumVariable(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
573 'with_sasl',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
574 'Enable SASL support (requires GNU SASL library)',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
575 'yes',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
576 @@ -517,7 +517,7 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
577 map = { },
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
578 ignorecase = 1
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
579 ),
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
580 - EnumOption(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
581 + EnumVariable(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
582 'with_tls',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
583 'Enable TLS support (requires GNU TLS library)',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
584 'yes',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
585 @@ -530,7 +530,7 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
586 'Specifies the path to sendmail.',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
587 defaultSendmailPath
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
588 ),
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
589 - EnumOption(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
590 + EnumVariable(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
591 'byte_order',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
592 'Byte order (Big Endian or Little Endian)',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
593 sys.byteorder,
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
594 @@ -538,7 +538,7 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
595 map = { },
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
596 ignorecase = 1
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
597 ),
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
598 - EnumOption(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
599 + EnumVariable(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
600 'pf_8bit_type',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
601 'The C-language 8-bit type for your platform',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
602 'char',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
603 @@ -546,7 +546,7 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
604 map = { },
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
605 ignorecase = 1
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
606 ),
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
607 - EnumOption(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
608 + EnumVariable(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
609 'pf_16bit_type',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
610 'The C-language 16-bit type for your platform',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
611 'short',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
612 @@ -554,7 +554,7 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
613 map = { },
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
614 ignorecase = 1
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
615 ),
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
616 - EnumOption(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
617 + EnumVariable(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
618 'pf_32bit_type',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
619 'The C-language 32-bit type for your platform',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
620 'int',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
621 @@ -562,7 +562,7 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
622 map = { },
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
623 ignorecase = 1
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
624 ),
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
625 - EnumOption(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
626 + EnumVariable(
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
627 'build_tests',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
628 'Build unit tests (run with "scons run-tests")',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
629 'no',
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
630 @@ -1364,7 +1364,7 @@
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
631 $CXX -c $CFLAGS $CPPFLAGS mytest.$ac_ext >&5
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
632 sh libtool --mode=link $CXX -o mytest mytest.o libtest.la >&5 2>/dev/null
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
633
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
634 -if test -x mytest; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
635 +if test -x mytest -a "$cross_compiling" != yes; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
636 myresult=`./mytest`
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
637 if test "X$myresult" = "XPASS"; then
8ea29766f021 upgrade package vmime to 0.9.1-svn-r533
Mark Brand <mabrand@mabrand.nl>
parents:
diff changeset
638 AC_MSG_RESULT(yes)