Mercurial > emacs
comparison configure @ 90043:e24e2e78deda
Revision: miles@gnu.org--gnu-2004/emacs--unicode--0--patch-69
Merge from emacs--cvs-trunk--0
Patches applied:
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-643
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-649
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-650
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-651
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-655
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-656
Update from CVS: lisp/man.el (Man-xref-normal-file): Fix help-echo.
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-657
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-658
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-659
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-660
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-661
- miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-667
Update from CVS
* miles@gnu.org--gnu-2004/emacs--cvs-trunk--0--patch-668
Merge from gnus--rel--5.10
* miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-61
- miles@gnu.org--gnu-2004/gnus--rel--5.10--patch-68
Update from CVS
author | Miles Bader <miles@gnu.org> |
---|---|
date | Thu, 04 Nov 2004 08:55:40 +0000 |
parents | f3ec05478165 2cc8d9bbb72b |
children | cb7f41387eb3 |
comparison
equal
deleted
inserted
replaced
90042:003d95404d71 | 90043:e24e2e78deda |
---|---|
9795 #define HAVE_GTK 1 | 9795 #define HAVE_GTK 1 |
9796 _ACEOF | 9796 _ACEOF |
9797 | 9797 |
9798 USE_X_TOOLKIT=none | 9798 USE_X_TOOLKIT=none |
9799 | 9799 |
9800 with_toolkit_scroll_bars=yes | 9800 if test "$with_toolkit_scroll_bars" != no; then |
9801 with_toolkit_scroll_bars=yes | |
9802 fi | |
9801 | 9803 |
9802 HAVE_GTK_MULTIDISPLAY=no | 9804 HAVE_GTK_MULTIDISPLAY=no |
9803 | 9805 |
9804 for ac_func in gdk_display_open | 9806 for ac_func in gdk_display_open |
9805 do | 9807 do |
9904 | 9906 |
9905 if test "${HAVE_GTK_MULTIDISPLAY}" = "yes"; then | 9907 if test "${HAVE_GTK_MULTIDISPLAY}" = "yes"; then |
9906 | 9908 |
9907 cat >>confdefs.h <<\_ACEOF | 9909 cat >>confdefs.h <<\_ACEOF |
9908 #define HAVE_GTK_MULTIDISPLAY 1 | 9910 #define HAVE_GTK_MULTIDISPLAY 1 |
9911 _ACEOF | |
9912 | |
9913 fi | |
9914 HAVE_GTK_FILE_SELECTION=no | |
9915 | |
9916 for ac_func in gtk_file_selection_new | |
9917 do | |
9918 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | |
9919 echo "$as_me:$LINENO: checking for $ac_func" >&5 | |
9920 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | |
9921 if eval "test \"\${$as_ac_var+set}\" = set"; then | |
9922 echo $ECHO_N "(cached) $ECHO_C" >&6 | |
9923 else | |
9924 cat >conftest.$ac_ext <<_ACEOF | |
9925 /* confdefs.h. */ | |
9926 _ACEOF | |
9927 cat confdefs.h >>conftest.$ac_ext | |
9928 cat >>conftest.$ac_ext <<_ACEOF | |
9929 /* end confdefs.h. */ | |
9930 /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | |
9931 For example, HP-UX 11i <limits.h> declares gettimeofday. */ | |
9932 #define $ac_func innocuous_$ac_func | |
9933 | |
9934 /* System header to define __stub macros and hopefully few prototypes, | |
9935 which can conflict with char $ac_func (); below. | |
9936 Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | |
9937 <limits.h> exists even on freestanding compilers. */ | |
9938 | |
9939 #ifdef __STDC__ | |
9940 # include <limits.h> | |
9941 #else | |
9942 # include <assert.h> | |
9943 #endif | |
9944 | |
9945 #undef $ac_func | |
9946 | |
9947 /* Override any gcc2 internal prototype to avoid an error. */ | |
9948 #ifdef __cplusplus | |
9949 extern "C" | |
9950 { | |
9951 #endif | |
9952 /* We use char because int might match the return type of a gcc2 | |
9953 builtin and then its argument prototype would still apply. */ | |
9954 char $ac_func (); | |
9955 /* The GNU C library defines this for functions which it implements | |
9956 to always fail with ENOSYS. Some functions are actually named | |
9957 something starting with __ and the normal name is an alias. */ | |
9958 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | |
9959 choke me | |
9960 #else | |
9961 char (*f) () = $ac_func; | |
9962 #endif | |
9963 #ifdef __cplusplus | |
9964 } | |
9965 #endif | |
9966 | |
9967 int | |
9968 main () | |
9969 { | |
9970 return f != $ac_func; | |
9971 ; | |
9972 return 0; | |
9973 } | |
9974 _ACEOF | |
9975 rm -f conftest.$ac_objext conftest$ac_exeext | |
9976 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
9977 (eval $ac_link) 2>conftest.er1 | |
9978 ac_status=$? | |
9979 grep -v '^ *+' conftest.er1 >conftest.err | |
9980 rm -f conftest.er1 | |
9981 cat conftest.err >&5 | |
9982 echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
9983 (exit $ac_status); } && | |
9984 { ac_try='test -z "$ac_c_werror_flag" | |
9985 || test ! -s conftest.err' | |
9986 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
9987 (eval $ac_try) 2>&5 | |
9988 ac_status=$? | |
9989 echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
9990 (exit $ac_status); }; } && | |
9991 { ac_try='test -s conftest$ac_exeext' | |
9992 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
9993 (eval $ac_try) 2>&5 | |
9994 ac_status=$? | |
9995 echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
9996 (exit $ac_status); }; }; then | |
9997 eval "$as_ac_var=yes" | |
9998 else | |
9999 echo "$as_me: failed program was:" >&5 | |
10000 sed 's/^/| /' conftest.$ac_ext >&5 | |
10001 | |
10002 eval "$as_ac_var=no" | |
10003 fi | |
10004 rm -f conftest.err conftest.$ac_objext \ | |
10005 conftest$ac_exeext conftest.$ac_ext | |
10006 fi | |
10007 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | |
10008 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | |
10009 if test `eval echo '${'$as_ac_var'}'` = yes; then | |
10010 cat >>confdefs.h <<_ACEOF | |
10011 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | |
10012 _ACEOF | |
10013 HAVE_GTK_FILE_SELECTION=yes | |
10014 fi | |
10015 done | |
10016 | |
10017 | |
10018 HAVE_GTK_FILE_CHOOSER=no | |
10019 | |
10020 for ac_func in gtk_file_chooser_dialog_new | |
10021 do | |
10022 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh` | |
10023 echo "$as_me:$LINENO: checking for $ac_func" >&5 | |
10024 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6 | |
10025 if eval "test \"\${$as_ac_var+set}\" = set"; then | |
10026 echo $ECHO_N "(cached) $ECHO_C" >&6 | |
10027 else | |
10028 cat >conftest.$ac_ext <<_ACEOF | |
10029 /* confdefs.h. */ | |
10030 _ACEOF | |
10031 cat confdefs.h >>conftest.$ac_ext | |
10032 cat >>conftest.$ac_ext <<_ACEOF | |
10033 /* end confdefs.h. */ | |
10034 /* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func. | |
10035 For example, HP-UX 11i <limits.h> declares gettimeofday. */ | |
10036 #define $ac_func innocuous_$ac_func | |
10037 | |
10038 /* System header to define __stub macros and hopefully few prototypes, | |
10039 which can conflict with char $ac_func (); below. | |
10040 Prefer <limits.h> to <assert.h> if __STDC__ is defined, since | |
10041 <limits.h> exists even on freestanding compilers. */ | |
10042 | |
10043 #ifdef __STDC__ | |
10044 # include <limits.h> | |
10045 #else | |
10046 # include <assert.h> | |
10047 #endif | |
10048 | |
10049 #undef $ac_func | |
10050 | |
10051 /* Override any gcc2 internal prototype to avoid an error. */ | |
10052 #ifdef __cplusplus | |
10053 extern "C" | |
10054 { | |
10055 #endif | |
10056 /* We use char because int might match the return type of a gcc2 | |
10057 builtin and then its argument prototype would still apply. */ | |
10058 char $ac_func (); | |
10059 /* The GNU C library defines this for functions which it implements | |
10060 to always fail with ENOSYS. Some functions are actually named | |
10061 something starting with __ and the normal name is an alias. */ | |
10062 #if defined (__stub_$ac_func) || defined (__stub___$ac_func) | |
10063 choke me | |
10064 #else | |
10065 char (*f) () = $ac_func; | |
10066 #endif | |
10067 #ifdef __cplusplus | |
10068 } | |
10069 #endif | |
10070 | |
10071 int | |
10072 main () | |
10073 { | |
10074 return f != $ac_func; | |
10075 ; | |
10076 return 0; | |
10077 } | |
10078 _ACEOF | |
10079 rm -f conftest.$ac_objext conftest$ac_exeext | |
10080 if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5 | |
10081 (eval $ac_link) 2>conftest.er1 | |
10082 ac_status=$? | |
10083 grep -v '^ *+' conftest.er1 >conftest.err | |
10084 rm -f conftest.er1 | |
10085 cat conftest.err >&5 | |
10086 echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
10087 (exit $ac_status); } && | |
10088 { ac_try='test -z "$ac_c_werror_flag" | |
10089 || test ! -s conftest.err' | |
10090 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
10091 (eval $ac_try) 2>&5 | |
10092 ac_status=$? | |
10093 echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
10094 (exit $ac_status); }; } && | |
10095 { ac_try='test -s conftest$ac_exeext' | |
10096 { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 | |
10097 (eval $ac_try) 2>&5 | |
10098 ac_status=$? | |
10099 echo "$as_me:$LINENO: \$? = $ac_status" >&5 | |
10100 (exit $ac_status); }; }; then | |
10101 eval "$as_ac_var=yes" | |
10102 else | |
10103 echo "$as_me: failed program was:" >&5 | |
10104 sed 's/^/| /' conftest.$ac_ext >&5 | |
10105 | |
10106 eval "$as_ac_var=no" | |
10107 fi | |
10108 rm -f conftest.err conftest.$ac_objext \ | |
10109 conftest$ac_exeext conftest.$ac_ext | |
10110 fi | |
10111 echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_var'}'`" >&5 | |
10112 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6 | |
10113 if test `eval echo '${'$as_ac_var'}'` = yes; then | |
10114 cat >>confdefs.h <<_ACEOF | |
10115 #define `echo "HAVE_$ac_func" | $as_tr_cpp` 1 | |
10116 _ACEOF | |
10117 HAVE_GTK_FILE_CHOOSER=yes | |
10118 fi | |
10119 done | |
10120 | |
10121 | |
10122 if test "$HAVE_GTK_FILE_SELECTION" = yes \ | |
10123 && test "$HAVE_GTK_FILE_CHOOSER" = yes; then | |
10124 | |
10125 cat >>confdefs.h <<\_ACEOF | |
10126 #define HAVE_GTK_FILE_BOTH 1 | |
9909 _ACEOF | 10127 _ACEOF |
9910 | 10128 |
9911 fi | 10129 fi |
9912 fi | 10130 fi |
9913 | 10131 |