diff options
author | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-01-01 22:28:40 +0000 |
---|---|---|
committer | Joe Marcus Clarke <marcus@FreeBSD.org> | 2009-01-01 22:28:40 +0000 |
commit | ccb05e765397831450ac96c84ee4a32f73dd5345 (patch) | |
tree | 61f2651dd85da82648fca420e875bc045b02ebfd /mail/balsa/files/patch-configure | |
parent | - Update to 1.14 (diff) |
Update to 2.3.27.
Notes
Notes:
svn path=/head/; revision=225095
Diffstat (limited to 'mail/balsa/files/patch-configure')
-rw-r--r-- | mail/balsa/files/patch-configure | 193 |
1 files changed, 163 insertions, 30 deletions
diff --git a/mail/balsa/files/patch-configure b/mail/balsa/files/patch-configure index 19c4b448d3d7..8d66051ff19c 100644 --- a/mail/balsa/files/patch-configure +++ b/mail/balsa/files/patch-configure @@ -1,6 +1,6 @@ ---- configure.orig Sun Jul 8 16:14:31 2007 -+++ configure Sun Jul 8 16:18:30 2007 -@@ -6896,7 +6896,7 @@ cat >>confdefs.h <<\_ACEOF +--- configure.orig 2009-01-01 17:16:25.000000000 -0500 ++++ configure 2009-01-01 17:18:27.000000000 -0500 +@@ -23250,7 +23250,7 @@ cat >>confdefs.h <<\_ACEOF #define HAVE_GTK_PRINT 1 _ACEOF @@ -9,8 +9,8 @@ else gnome_print_extras="libgnomeprint-2.2 >= 2.1.4 libgnomeprintui-2.2 >= 2.1.4" fi -@@ -7525,7 +7525,7 @@ if { as_var=$as_ac_Lib; eval "test \"\${ - echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -23889,7 +23889,7 @@ if { as_var=$as_ac_Lib; eval "test \"\${ + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lgtkhtml-$i $LIBS" @@ -18,8 +18,8 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -7797,7 +7797,7 @@ if test "${ac_cv_lib_ldap_ldap_search+se - echo $ECHO_N "(cached) $ECHO_C" >&6 +@@ -24383,7 +24383,7 @@ if test "${ac_cv_lib_ldap_ldap_search+se + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lldap -llber -lresolv $LIBS" @@ -27,34 +27,34 @@ cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -7858,7 +7858,7 @@ cat >>confdefs.h <<\_ACEOF +@@ -24448,7 +24448,7 @@ cat >>confdefs.h <<\_ACEOF #define ENABLE_LDAP 1 _ACEOF - LIBS="-lldap -llber -lresolv $LIBS" + LIBS="-lldap -llber $LIBS" else - { { echo "$as_me:$LINENO: error: *** You enabled LDAP but ldap library is not found." >&5 - echo "$as_me: error: *** You enabled LDAP but ldap library is not found." >&2;} -@@ -9473,13 +9473,13 @@ _ACEOF + { { $as_echo "$as_me:$LINENO: error: *** You enabled LDAP but ldap library is not found." >&5 + $as_echo "$as_me: error: *** You enabled LDAP but ldap library is not found." >&2;} +@@ -26363,13 +26363,13 @@ _ACEOF else --{ echo "$as_me:$LINENO: checking for new_pspell_manager in -lpspell" >&5 --echo $ECHO_N "checking for new_pspell_manager in -lpspell... $ECHO_C" >&6; } +-{ $as_echo "$as_me:$LINENO: checking for new_pspell_manager in -lpspell" >&5 +-$as_echo_n "checking for new_pspell_manager in -lpspell... " >&6; } -if test "${ac_cv_lib_pspell_new_pspell_manager+set}" = set; then -+{ echo "$as_me:$LINENO: checking for new_aspell_manager in -laspell" >&5 -+echo $ECHO_N "checking for new_aspell_manager in -laspell... $ECHO_C" >&6; } ++{ $as_echo "$as_me:$LINENO: checking for new_aspell_manager in -laspell" >&5 ++$as_echo_n "checking for new_aspell_manager in -laspell... " >&6; } +if test "${ac_cv_lib_aspell_new_aspell_manager+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 + $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lpspell -lstdc++ -lpspell-modules $LIBS" -+LIBS="-laspell -lstdc++ $LIBS" ++LIBS="-laspell -lstdc++ -laspell-modules $LIBS" cat >conftest.$ac_ext <<_ACEOF /* confdefs.h. */ _ACEOF -@@ -9493,11 +9493,11 @@ cat >>conftest.$ac_ext <<_ACEOF +@@ -26383,11 +26383,11 @@ cat >>conftest.$ac_ext <<_ACEOF #ifdef __cplusplus extern "C" #endif @@ -68,30 +68,31 @@ ; return 0; } -@@ -9520,26 +9520,26 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec - test ! -s conftest.err - } && test -s conftest$ac_exeext && - $as_test_x conftest$ac_exeext; then +@@ -26413,12 +26413,12 @@ $as_echo "$ac_try_echo") >&5 + test "$cross_compiling" = yes || + $as_test_x conftest$ac_exeext + }; then - ac_cv_lib_pspell_new_pspell_manager=yes + ac_cv_lib_aspell_new_aspell_manager=yes else - echo "$as_me: failed program was:" >&5 + $as_echo "$as_me: failed program was:" >&5 sed 's/^/| /' conftest.$ac_ext >&5 - ac_cv_lib_pspell_new_pspell_manager=no + ac_cv_lib_aspell_new_aspell_manager=no fi - rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \ + rm -rf conftest.dSYM +@@ -26426,19 +26426,19 @@ rm -f core conftest.err conftest.$ac_obj conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi --{ echo "$as_me:$LINENO: result: $ac_cv_lib_pspell_new_pspell_manager" >&5 --echo "${ECHO_T}$ac_cv_lib_pspell_new_pspell_manager" >&6; } --if test $ac_cv_lib_pspell_new_pspell_manager = yes; then -+{ echo "$as_me:$LINENO: result: $ac_cv_lib_aspell_new_aspell_manager" >&5 -+echo "${ECHO_T}$ac_cv_lib_aspell_new_aspell_manager" >&6; } -+if test $ac_cv_lib_aspell_new_aspell_manager = yes; then +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_pspell_new_pspell_manager" >&5 +-$as_echo "$ac_cv_lib_pspell_new_pspell_manager" >&6; } +-if test "x$ac_cv_lib_pspell_new_pspell_manager" = x""yes; then ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_lib_aspell_new_aspell_manager" >&5 ++$as_echo "$ac_cv_lib_aspell_new_aspell_manager" >&6; } ++if test "x$ac_cv_lib_aspell_new_aspell_manager" = x""yes; then cat >>confdefs.h <<_ACEOF #define HAVE_LIBPSPELL 1 _ACEOF @@ -101,3 +102,135 @@ else +- { { $as_echo "$as_me:$LINENO: error: *** Neither aspell >=0.50 (recommended) nor pspell (deprecated) library was found. Please check http://balsa.gnome.org for information on the required files. Alternatively, check config.log for clues." >&5 +-$as_echo "$as_me: error: *** Neither aspell >=0.50 (recommended) nor pspell (deprecated) library was found. Please check http://balsa.gnome.org for information on the required files. Alternatively, check config.log for clues." >&2;} ++ { { $as_echo "$as_me:$LINENO: error: *** Neither aspell >=0.50 (recommended) nor aspell (deprecated) library was found. Please check http://balsa.gnome.org for information on the required files. Alternatively, check config.log for clues." >&5 ++$as_echo "$as_me: error: *** Neither aspell >=0.50 (recommended) nor aspell (deprecated) library was found. Please check http://balsa.gnome.org for information on the required files. Alternatively, check config.log for clues." >&2;} + { (exit 1); exit 1; }; } + + fi +@@ -26446,18 +26446,18 @@ fi + + fi + +- if test "${ac_cv_header_pspell_pspell_h+set}" = set; then +- { $as_echo "$as_me:$LINENO: checking for pspell/pspell.h" >&5 +-$as_echo_n "checking for pspell/pspell.h... " >&6; } +-if test "${ac_cv_header_pspell_pspell_h+set}" = set; then ++ if test "${ac_cv_header_aspell_aspell_h+set}" = set; then ++ { $as_echo "$as_me:$LINENO: checking for aspell/aspell.h" >&5 ++$as_echo_n "checking for aspell/aspell.h... " >&6; } ++if test "${ac_cv_header_aspell_aspell_h+set}" = set; then + $as_echo_n "(cached) " >&6 + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pspell_pspell_h" >&5 +-$as_echo "$ac_cv_header_pspell_pspell_h" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_aspell_aspell_h" >&5 ++$as_echo "$ac_cv_header_aspell_aspell_h" >&6; } + else + # Is the header compilable? +-{ $as_echo "$as_me:$LINENO: checking pspell/pspell.h usability" >&5 +-$as_echo_n "checking pspell/pspell.h usability... " >&6; } ++{ $as_echo "$as_me:$LINENO: checking aspell/aspell.h usability" >&5 ++$as_echo_n "checking aspell/aspell.h usability... " >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF +@@ -26465,7 +26465,7 @@ cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ + $ac_includes_default +-#include <pspell/pspell.h> ++#include <aspell/aspell.h> + _ACEOF + rm -f conftest.$ac_objext + if { (ac_try="$ac_compile" +@@ -26498,15 +26498,15 @@ rm -f core conftest.err conftest.$ac_obj + $as_echo "$ac_header_compiler" >&6; } + + # Is the header present? +-{ $as_echo "$as_me:$LINENO: checking pspell/pspell.h presence" >&5 +-$as_echo_n "checking pspell/pspell.h presence... " >&6; } ++{ $as_echo "$as_me:$LINENO: checking aspell/aspell.h presence" >&5 ++$as_echo_n "checking aspell/aspell.h presence... " >&6; } + cat >conftest.$ac_ext <<_ACEOF + /* confdefs.h. */ + _ACEOF + cat confdefs.h >>conftest.$ac_ext + cat >>conftest.$ac_ext <<_ACEOF + /* end confdefs.h. */ +-#include <pspell/pspell.h> ++#include <aspell/aspell.h> + _ACEOF + if { (ac_try="$ac_cpp conftest.$ac_ext" + case "(($ac_try" in +@@ -26540,44 +26540,44 @@ $as_echo "$ac_header_preproc" >&6; } + # So? What about this header? + case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in + yes:no: ) +- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: accepted by the compiler, rejected by the preprocessor!" >&5 +-$as_echo "$as_me: WARNING: pspell/pspell.h: accepted by the compiler, rejected by the preprocessor!" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: proceeding with the compiler's result" >&5 +-$as_echo "$as_me: WARNING: pspell/pspell.h: proceeding with the compiler's result" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: accepted by the compiler, rejected by the preprocessor!" >&5 ++$as_echo "$as_me: WARNING: aspell/aspell.h: accepted by the compiler, rejected by the preprocessor!" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: proceeding with the compiler's result" >&5 ++$as_echo "$as_me: WARNING: aspell/aspell.h: proceeding with the compiler's result" >&2;} + ac_header_preproc=yes + ;; + no:yes:* ) +- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: present but cannot be compiled" >&5 +-$as_echo "$as_me: WARNING: pspell/pspell.h: present but cannot be compiled" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: check for missing prerequisite headers?" >&5 +-$as_echo "$as_me: WARNING: pspell/pspell.h: check for missing prerequisite headers?" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: see the Autoconf documentation" >&5 +-$as_echo "$as_me: WARNING: pspell/pspell.h: see the Autoconf documentation" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: section \"Present But Cannot Be Compiled\"" >&5 +-$as_echo "$as_me: WARNING: pspell/pspell.h: section \"Present But Cannot Be Compiled\"" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: proceeding with the preprocessor's result" >&5 +-$as_echo "$as_me: WARNING: pspell/pspell.h: proceeding with the preprocessor's result" >&2;} +- { $as_echo "$as_me:$LINENO: WARNING: pspell/pspell.h: in the future, the compiler will take precedence" >&5 +-$as_echo "$as_me: WARNING: pspell/pspell.h: in the future, the compiler will take precedence" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: present but cannot be compiled" >&5 ++$as_echo "$as_me: WARNING: aspell/aspell.h: present but cannot be compiled" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: check for missing prerequisite headers?" >&5 ++$as_echo "$as_me: WARNING: aspell/aspell.h: check for missing prerequisite headers?" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: see the Autoconf documentation" >&5 ++$as_echo "$as_me: WARNING: aspell/aspell.h: see the Autoconf documentation" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: section \"Present But Cannot Be Compiled\"" >&5 ++$as_echo "$as_me: WARNING: aspell/aspell.h: section \"Present But Cannot Be Compiled\"" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: proceeding with the preprocessor's result" >&5 ++$as_echo "$as_me: WARNING: aspell/aspell.h: proceeding with the preprocessor's result" >&2;} ++ { $as_echo "$as_me:$LINENO: WARNING: aspell/aspell.h: in the future, the compiler will take precedence" >&5 ++$as_echo "$as_me: WARNING: aspell/aspell.h: in the future, the compiler will take precedence" >&2;} + + ;; + esac +-{ $as_echo "$as_me:$LINENO: checking for pspell/pspell.h" >&5 +-$as_echo_n "checking for pspell/pspell.h... " >&6; } +-if test "${ac_cv_header_pspell_pspell_h+set}" = set; then ++{ $as_echo "$as_me:$LINENO: checking for aspell/aspell.h" >&5 ++$as_echo_n "checking for aspell/aspell.h... " >&6; } ++if test "${ac_cv_header_aspell_aspell_h+set}" = set; then + $as_echo_n "(cached) " >&6 + else +- ac_cv_header_pspell_pspell_h=$ac_header_preproc ++ ac_cv_header_aspell_aspell_h=$ac_header_preproc + fi +-{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_pspell_pspell_h" >&5 +-$as_echo "$ac_cv_header_pspell_pspell_h" >&6; } ++{ $as_echo "$as_me:$LINENO: result: $ac_cv_header_aspell_aspell_h" >&5 ++$as_echo "$ac_cv_header_aspell_aspell_h" >&6; } + + fi +-if test "x$ac_cv_header_pspell_pspell_h" = x""yes; then ++if test "x$ac_cv_header_aspell_aspell_h" = x""yes; then + : + else +- { { $as_echo "$as_me:$LINENO: error: ** aspell/pspell library found but not related header files. This probably means corresponding aspell-devel package is not installed " >&5 +-$as_echo "$as_me: error: ** aspell/pspell library found but not related header files. This probably means corresponding aspell-devel package is not installed " >&2;} ++ { { $as_echo "$as_me:$LINENO: error: ** aspell/aspell library found but not related header files. This probably means corresponding aspell-devel package is not installed " >&5 ++$as_echo "$as_me: error: ** aspell/aspell library found but not related header files. This probably means corresponding aspell-devel package is not installed " >&2;} + { (exit 1); exit 1; }; } + fi + |