Mercurial > emacs
comparison configure @ 92515:b104e440c950
Regenerate.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Wed, 05 Mar 2008 20:03:20 +0000 |
parents | 5e03935bac17 |
children | 8f8eec60028b |
comparison
equal
deleted
inserted
replaced
92514:66d896123af5 | 92515:b104e440c950 |
---|---|
12388 | 12388 |
12389 fi | 12389 fi |
12390 CFLAGS=$late_CFLAGS | 12390 CFLAGS=$late_CFLAGS |
12391 fi | 12391 fi |
12392 | 12392 |
12393 #### For font-backend | 12393 ### Start of font-backend section. |
12394 if test "${USE_FONT_BACKEND}" != "no"; then | 12394 if test "${HAVE_X11}" != "yes"; then |
12395 | 12395 USE_FONT_BACKEND=no |
12396 fi | |
12397 | |
12398 if test "${USE_FONT_BACKEND}" = "yes"; then | |
12396 | 12399 |
12397 cat >>confdefs.h <<\_ACEOF | 12400 cat >>confdefs.h <<\_ACEOF |
12398 #define USE_FONT_BACKEND 1 | 12401 #define USE_FONT_BACKEND 1 |
12399 _ACEOF | 12402 _ACEOF |
12400 | 12403 |
12401 | 12404 |
12402 ### Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'. | 12405 ## Use -lXft if available, unless `--with-freetype=no' nor `--with-xft=no'. |
12403 HAVE_XFT=maybe | 12406 HAVE_XFT=maybe |
12404 if test "${HAVE_X11}" = "yes"; then | |
12405 if test "x${with_freetype}" = "xno"; then | 12407 if test "x${with_freetype}" = "xno"; then |
12406 with_xft="no"; | 12408 with_xft="no"; |
12407 fi | 12409 fi |
12408 if test "x${with_xft}" != "xno"; then | 12410 if test "x${with_xft}" != "xno"; then |
12409 | |
12410 if test "X${with_pkg_config_prog}" != X; then | |
12411 PKG_CONFIG="${with_pkg_config_prog}" | |
12412 fi | |
12413 | 12411 |
12414 | 12412 |
12415 succeeded=no | 12413 succeeded=no |
12416 | 12414 |
12417 # Extract the first word of "pkg-config", so it can be a program name with args. | 12415 # Extract the first word of "pkg-config", so it can be a program name with args. |
12717 C_SWITCH_X_SITE="$C_SWITCH_X_SITE $XFT_CFLAGS" | 12715 C_SWITCH_X_SITE="$C_SWITCH_X_SITE $XFT_CFLAGS" |
12718 else | 12716 else |
12719 CPPFLAGS="$OLD_CPPFLAGS" | 12717 CPPFLAGS="$OLD_CPPFLAGS" |
12720 CFLAGS="$OLD_CFLAGS" | 12718 CFLAGS="$OLD_CFLAGS" |
12721 LIBS="$OLD_LIBS" | 12719 LIBS="$OLD_LIBS" |
12722 fi | 12720 fi # "${HAVE_XFT}" = "yes" |
12723 fi | 12721 fi # "$HAVE_XFT" != no |
12722 fi # "x${with_xft}" != "xno" | |
12723 | |
12724 if test "$HAVE_XFT" != "yes"; then | |
12725 HAVE_XFT=no | |
12724 fi | 12726 fi |
12725 fi | 12727 |
12726 if test "$HAVE_XFT" != "yes"; then | 12728 |
12727 HAVE_XFT=no | 12729 HAVE_FREETYPE=no |
12728 fi | 12730 ### Use -lfreetype if available, unless `--with-freetype=no'. |
12729 | 12731 if test "${HAVE_XFT}" = "yes"; then |
12730 | 12732 HAVE_FREETYPE=yes |
12731 HAVE_FREETYPE=no | 12733 elif test "x${with_freetype}" != "xno"; then |
12732 ### Use -lfreetype if available, unless `--with-freetype=no'. | |
12733 if test "${HAVE_XFT}" = "yes"; then | |
12734 HAVE_FREETYPE=yes | |
12735 elif test "x${with_freetype}" != "xno"; then | |
12736 if test "X${with_pkg_config_prog}" != X; then | |
12737 PKG_CONFIG="${with_pkg_config_prog}" | |
12738 fi | |
12739 | 12734 |
12740 | 12735 |
12741 succeeded=no | 12736 succeeded=no |
12742 | 12737 |
12743 # Extract the first word of "pkg-config", so it can be a program name with args. | 12738 # Extract the first word of "pkg-config", so it can be a program name with args. |
12829 HAVE_FREETYPE=yes | 12824 HAVE_FREETYPE=yes |
12830 else | 12825 else |
12831 HAVE_FREETYPE=no | 12826 HAVE_FREETYPE=no |
12832 fi | 12827 fi |
12833 | 12828 |
12834 if test "${HAVE_FREETYPE}" = "yes"; then | 12829 if test "${HAVE_FREETYPE}" = "yes"; then |
12835 | 12830 |
12836 succeeded=no | 12831 succeeded=no |
12837 | 12832 |
12838 # Extract the first word of "pkg-config", so it can be a program name with args. | 12833 # Extract the first word of "pkg-config", so it can be a program name with args. |
12839 set dummy pkg-config; ac_word=$2 | 12834 set dummy pkg-config; ac_word=$2 |
12924 HAVE_FC=yes | 12919 HAVE_FC=yes |
12925 else | 12920 else |
12926 HAVE_FC=no | 12921 HAVE_FC=no |
12927 fi | 12922 fi |
12928 | 12923 |
12929 if test "${HAVE_FC}" = "no"; then | 12924 if test "${HAVE_FC}" = "no"; then |
12930 HAVE_FREETYPE=no | 12925 HAVE_FREETYPE=no |
12926 fi | |
12931 fi | 12927 fi |
12932 fi | 12928 fi |
12933 fi | 12929 |
12934 | 12930 HAVE_LIBOTF=no |
12935 HAVE_LIBOTF=no | 12931 if test "${HAVE_FREETYPE}" = "yes"; then |
12936 if test "${HAVE_FREETYPE}" = "yes"; then | |
12937 | 12932 |
12938 cat >>confdefs.h <<\_ACEOF | 12933 cat >>confdefs.h <<\_ACEOF |
12939 #define HAVE_FREETYPE 1 | 12934 #define HAVE_FREETYPE 1 |
12940 _ACEOF | 12935 _ACEOF |
12941 | 12936 |
12942 if test "${with_libotf}" != "no"; then | 12937 if test "${with_libotf}" != "no"; then |
12943 if test "X${with_pkg_config_prog}" != X; then | |
12944 PKG_CONFIG="${with_pkg_config_prog}" | |
12945 fi | |
12946 | 12938 |
12947 succeeded=no | 12939 succeeded=no |
12948 | 12940 |
12949 # Extract the first word of "pkg-config", so it can be a program name with args. | 12941 # Extract the first word of "pkg-config", so it can be a program name with args. |
12950 set dummy pkg-config; ac_word=$2 | 12942 set dummy pkg-config; ac_word=$2 |
13035 HAVE_LIBOTF=yes | 13027 HAVE_LIBOTF=yes |
13036 else | 13028 else |
13037 HAVE_LIBOTF=no | 13029 HAVE_LIBOTF=no |
13038 fi | 13030 fi |
13039 | 13031 |
13040 if test "$HAVE_LIBOTF" = "yes"; then | 13032 if test "$HAVE_LIBOTF" = "yes"; then |
13041 | 13033 |
13042 cat >>confdefs.h <<\_ACEOF | 13034 cat >>confdefs.h <<\_ACEOF |
13043 #define HAVE_LIBOTF 1 | 13035 #define HAVE_LIBOTF 1 |
13044 _ACEOF | 13036 _ACEOF |
13045 | 13037 |
13038 fi | |
13046 fi | 13039 fi |
13047 fi | 13040 fi |
13048 fi | 13041 |
13049 | 13042 HAVE_M17N_FLT=no |
13050 HAVE_M17N_FLT=no | 13043 if test "${with_m17n_flt}" != "no"; then |
13051 if test "${with_m17n_flt}" != "no"; then | |
13052 if test "X${with_pkg_config_prog}" != X; then | |
13053 PKG_CONFIG="${with_pkg_config_prog}" | |
13054 fi | |
13055 | 13044 |
13056 succeeded=no | 13045 succeeded=no |
13057 | 13046 |
13058 # Extract the first word of "pkg-config", so it can be a program name with args. | 13047 # Extract the first word of "pkg-config", so it can be a program name with args. |
13059 set dummy pkg-config; ac_word=$2 | 13048 set dummy pkg-config; ac_word=$2 |
13144 HAVE_M17N_FLT=yes | 13133 HAVE_M17N_FLT=yes |
13145 else | 13134 else |
13146 HAVE_M17N_FLT=no | 13135 HAVE_M17N_FLT=no |
13147 fi | 13136 fi |
13148 | 13137 |
13149 if test "$HAVE_M17N_FLT" = "yes"; then | 13138 if test "$HAVE_M17N_FLT" = "yes"; then |
13150 | 13139 |
13151 cat >>confdefs.h <<\_ACEOF | 13140 cat >>confdefs.h <<\_ACEOF |
13152 #define HAVE_M17N_FLT 1 | 13141 #define HAVE_M17N_FLT 1 |
13153 _ACEOF | 13142 _ACEOF |
13154 | 13143 |
13144 fi | |
13155 fi | 13145 fi |
13156 fi | 13146 |
13157 | 13147 |
13158 | 13148 |
13159 | 13149 |
13160 | 13150 |
13161 | 13151 |
13162 | 13152 |
13163 | 13153 |
13164 | 13154 |
13165 | 13155 |
13166 | 13156 fi # "${USE_FONT_BACKEND}" = "yes" |
13167 fi | 13157 ### End of font-backend section. |
13168 #### End for font-backend | |
13169 | 13158 |
13170 ### Use -lXpm if available, unless `--with-xpm=no'. | 13159 ### Use -lXpm if available, unless `--with-xpm=no'. |
13171 HAVE_XPM=no | 13160 HAVE_XPM=no |
13172 if test "${HAVE_X11}" = "yes"; then | 13161 if test "${HAVE_X11}" = "yes"; then |
13173 if test "${with_xpm}" != "no"; then | 13162 if test "${with_xpm}" != "no"; then |