diff options
author | 2003-07-19 23:23:43 +0000 | |
---|---|---|
committer | 2003-07-19 23:23:43 +0000 | |
commit | 00ca7238520b70876ea724c9e335dacbecdcc6c0 (patch) | |
tree | af643b105da24b735526feb5233b380f5beba666 /gnome-base/gnome-libs/files/no-libdb-check.diff | |
parent | added extra optional dependency information per #23669 (diff) | |
download | gentoo-2-00ca7238520b70876ea724c9e335dacbecdcc6c0.tar.gz gentoo-2-00ca7238520b70876ea724c9e335dacbecdcc6c0.tar.bz2 gentoo-2-00ca7238520b70876ea724c9e335dacbecdcc6c0.zip |
Marking gnome2 stable on amd64, added db4 fix for gnome-libs-1.4.2
Diffstat (limited to 'gnome-base/gnome-libs/files/no-libdb-check.diff')
-rw-r--r-- | gnome-base/gnome-libs/files/no-libdb-check.diff | 392 |
1 files changed, 392 insertions, 0 deletions
diff --git a/gnome-base/gnome-libs/files/no-libdb-check.diff b/gnome-base/gnome-libs/files/no-libdb-check.diff new file mode 100644 index 000000000000..9f442361248b --- /dev/null +++ b/gnome-base/gnome-libs/files/no-libdb-check.diff @@ -0,0 +1,392 @@ +--- gnome-libs-1.4.2/configure.orig 2003-07-17 17:26:38.000000000 -0400 ++++ gnome-libs-1.4.2/configure 2003-07-17 17:27:01.000000000 -0400 +@@ -11326,389 +11326,7 @@ + prefer_db1=no + fi + +-DB_LIB= +-echo $ac_n "checking for dbopen""... $ac_c" 1>&6 +-echo "configure:11332: checking for dbopen" >&5 +-if eval "test \"`echo '$''{'ac_cv_func_dbopen'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- cat > conftest.$ac_ext <<EOF +-#line 11337 "configure" +-#include "confdefs.h" +-/* System header to define __stub macros and hopefully few prototypes, +- which can conflict with char dbopen(); below. */ +-#include <assert.h> +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dbopen(); +- +-int main() { +- +-/* The GNU C library defines this for functions which it implements +- to always fail with ENOSYS. Some functions are actually named +- something starting with __ and the normal name is an alias. */ +-#if defined (__stub_dbopen) || defined (__stub___dbopen) +-choke me +-#else +-dbopen(); +-#endif +- +-; return 0; } +-EOF +-if { (eval echo configure:11360: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_func_dbopen=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_func_dbopen=no" +-fi +-rm -f conftest* +-fi +- +-if eval "test \"`echo '$ac_cv_func_'dbopen`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- : +-else +- echo "$ac_t""no" 1>&6 +-if test "$prefer_db1" = "yes"; then +- echo $ac_n "checking for dbopen in -ldb1""... $ac_c" 1>&6 +-echo "configure:11379: checking for dbopen in -ldb1" >&5 +-ac_lib_var=`echo db1'_'dbopen | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-ldb1 $LIBS" +-cat > conftest.$ac_ext <<EOF +-#line 11387 "configure" +-#include "confdefs.h" +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dbopen(); +- +-int main() { +-dbopen() +-; return 0; } +-EOF +-if { (eval echo configure:11398: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- DB_LIB="-ldb1" +-else +- echo "$ac_t""no" 1>&6 +-echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6 +-echo "configure:11417: checking for dbopen in -ldb" >&5 +-ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" + LIBS="-ldb $LIBS" +-cat > conftest.$ac_ext <<EOF +-#line 11425 "configure" +-#include "confdefs.h" +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dbopen(); +- +-int main() { +-dbopen() +-; return 0; } +-EOF +-if { (eval echo configure:11436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- DB_LIB="-ldb" +-else +- echo "$ac_t""no" 1>&6 +-echo $ac_n "checking for __db185_open in -ldb-3""... $ac_c" 1>&6 +-echo "configure:11455: checking for __db185_open in -ldb-3" >&5 +-ac_lib_var=`echo db-3'_'__db185_open | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-ldb-3 $LIBS" +-cat > conftest.$ac_ext <<EOF +-#line 11463 "configure" +-#include "confdefs.h" +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char __db185_open(); +- +-int main() { +-__db185_open() +-; return 0; } +-EOF +-if { (eval echo configure:11474: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- DB_LIB="-ldb-3" +-else +- echo "$ac_t""no" 1>&6 +-echo $ac_n "checking for __db185_open in -ldb-4""... $ac_c" 1>&6 +-echo "configure:11493: checking for __db185_open in -ldb-4" >&5 +-ac_lib_var=`echo db-4'_'__db185_open | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-ldb-4 $LIBS" +-cat > conftest.$ac_ext <<EOF +-#line 11501 "configure" +-#include "confdefs.h" +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char __db185_open(); +- +-int main() { +-__db185_open() +-; return 0; } +-EOF +-if { (eval echo configure:11512: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- DB_LIB="-ldb-4" +-else +- echo "$ac_t""no" 1>&6 +-{ echo "configure: error: Your db library is missing db 1.85 compatibility mode" 1>&2; exit 1; } +- +-fi +- +- +-fi +- +- +-fi +- +- +-fi +- +-else +- echo $ac_n "checking for dbopen in -ldb""... $ac_c" 1>&6 +-echo "configure:11545: checking for dbopen in -ldb" >&5 +-ac_lib_var=`echo db'_'dbopen | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-ldb $LIBS" +-cat > conftest.$ac_ext <<EOF +-#line 11553 "configure" +-#include "confdefs.h" +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dbopen(); +- +-int main() { +-dbopen() +-; return 0; } +-EOF +-if { (eval echo configure:11564: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- DB_LIB="-ldb" +-else +- echo "$ac_t""no" 1>&6 +-echo $ac_n "checking for dbopen in -ldb1""... $ac_c" 1>&6 +-echo "configure:11583: checking for dbopen in -ldb1" >&5 +-ac_lib_var=`echo db1'_'dbopen | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-ldb1 $LIBS" +-cat > conftest.$ac_ext <<EOF +-#line 11591 "configure" +-#include "confdefs.h" +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char dbopen(); +- +-int main() { +-dbopen() +-; return 0; } +-EOF +-if { (eval echo configure:11602: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- DB_LIB="-ldb1" +-else +- echo "$ac_t""no" 1>&6 +-echo $ac_n "checking for __db185_open in -ldb-3""... $ac_c" 1>&6 +-echo "configure:11621: checking for __db185_open in -ldb-3" >&5 +-ac_lib_var=`echo db-3'_'__db185_open | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-ldb-3 $LIBS" +-cat > conftest.$ac_ext <<EOF +-#line 11629 "configure" +-#include "confdefs.h" +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char __db185_open(); +- +-int main() { +-__db185_open() +-; return 0; } +-EOF +-if { (eval echo configure:11640: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- DB_LIB="-ldb-3" +-else +- echo "$ac_t""no" 1>&6 +-echo $ac_n "checking for __db185_open in -ldb-4""... $ac_c" 1>&6 +-echo "configure:11659: checking for __db185_open in -ldb-4" >&5 +-ac_lib_var=`echo db-4'_'__db185_open | sed 'y%./+-%__p_%'` +-if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then +- echo $ac_n "(cached) $ac_c" 1>&6 +-else +- ac_save_LIBS="$LIBS" +-LIBS="-ldb-4 $LIBS" +-cat > conftest.$ac_ext <<EOF +-#line 11667 "configure" +-#include "confdefs.h" +-/* Override any gcc2 internal prototype to avoid an error. */ +-/* We use char because int might match the return type of a gcc2 +- builtin and then its argument prototype would still apply. */ +-char __db185_open(); +- +-int main() { +-__db185_open() +-; return 0; } +-EOF +-if { (eval echo configure:11678: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=yes" +-else +- echo "configure: failed program was:" >&5 +- cat conftest.$ac_ext >&5 +- rm -rf conftest* +- eval "ac_cv_lib_$ac_lib_var=no" +-fi +-rm -f conftest* +-LIBS="$ac_save_LIBS" +- +-fi +-if eval "test \"`echo '$ac_cv_lib_'$ac_lib_var`\" = yes"; then +- echo "$ac_t""yes" 1>&6 +- DB_LIB="-ldb-4" +-else +- echo "$ac_t""no" 1>&6 +-{ echo "configure: error: Your db library is missing db 1.85 compatibility mode" 1>&2; exit 1; } +- +-fi +- +- +-fi +- +- +-fi +- +- +-fi +- +-fi +- +-fi +- + + if test "$prefer_db1" = "yes"; then + for ac_hdr in db_185.h db1/db.h |