diff options
| author | Joakim Verona | 2011-07-12 00:17:06 +0200 |
|---|---|---|
| committer | Joakim Verona | 2011-07-12 00:17:06 +0200 |
| commit | 57b7a4c05659911dd596be0791c40b8eb8158611 (patch) | |
| tree | 0af222d64ad143f960063946303a64b2d54b9065 | |
| parent | e098c552ccd4be2c05898bb69df97ce35efa90b7 (diff) | |
| download | emacs-57b7a4c05659911dd596be0791c40b8eb8158611.tar.gz emacs-57b7a4c05659911dd596be0791c40b8eb8158611.zip | |
preliminary configure support
| -rw-r--r-- | configure.in | 49 |
1 files changed, 49 insertions, 0 deletions
diff --git a/configure.in b/configure.in index e7930e3987b..b6b11ff4946 100644 --- a/configure.in +++ b/configure.in | |||
| @@ -175,6 +175,8 @@ OPTION_DEFAULT_ON([gconf],[don't compile with GConf support]) | |||
| 175 | OPTION_DEFAULT_ON([selinux],[don't compile with SELinux support]) | 175 | OPTION_DEFAULT_ON([selinux],[don't compile with SELinux support]) |
| 176 | OPTION_DEFAULT_ON([gnutls],[don't use -lgnutls for SSL/TLS support]) | 176 | OPTION_DEFAULT_ON([gnutls],[don't use -lgnutls for SSL/TLS support]) |
| 177 | 177 | ||
| 178 | OPTION_DEFAULT_OFF([xwidgets],[enable use of some gtk widgets it Emacs buffers]) | ||
| 179 | |||
| 178 | ## For the times when you want to build Emacs but don't have | 180 | ## For the times when you want to build Emacs but don't have |
| 179 | ## a suitable makeinfo, and can live without the manuals. | 181 | ## a suitable makeinfo, and can live without the manuals. |
| 180 | dnl http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01844.html | 182 | dnl http://lists.gnu.org/archive/html/emacs-devel/2008-04/msg01844.html |
| @@ -1129,6 +1131,48 @@ AC_DEFUN([PKG_CHECK_MODULES], [ | |||
| 1129 | fi | 1131 | fi |
| 1130 | ]) | 1132 | ]) |
| 1131 | 1133 | ||
| 1134 | HAVE_XWIDGETS=no | ||
| 1135 | HAVE_WEBKIT=no | ||
| 1136 | HAVE_GOOCANVAS=no | ||
| 1137 | HAVE_CLUTTER=no | ||
| 1138 | if test "${with_xwidgets}" != "no"; then | ||
| 1139 | echo "xwidgets enabled, checking webkit, and others" | ||
| 1140 | HAVE_XWIDGETS=yes | ||
| 1141 | AC_DEFINE(HAVE_XWIDGETS, 1, [Define to 1 if you have xwidgets support.]) | ||
| 1142 | #xwidgets | ||
| 1143 | #TODO | ||
| 1144 | # - enable only if gtk/gtk3 enabled | ||
| 1145 | # - webkit, goocanvas, clutter | ||
| 1146 | # - only webkit_osr is good so remove plain webkit laterish | ||
| 1147 | |||
| 1148 | #webkit version for gtk3. | ||
| 1149 | WEBKIT_REQUIRED=1.4.0 | ||
| 1150 | WEBKIT_MODULES="webkitgtk-3.0 >= $WEBKIT_REQUIRED" | ||
| 1151 | |||
| 1152 | PKG_CHECK_MODULES(WEBKIT, $WEBKIT_MODULES, HAVE_WEBKIT=yes, HAVE_WEBKIT=no) | ||
| 1153 | if test $HAVE_WEBKIT = yes; then | ||
| 1154 | AC_DEFINE(HAVE_WEBKIT, 1, [Define to 1 if you have webkit support.]) | ||
| 1155 | AC_DEFINE(HAVE_WEBKIT_OSR, 1, [Define to 1 if you have webkit_osr support.]) | ||
| 1156 | fi | ||
| 1157 | |||
| 1158 | CLUTTER_REQUIRED=1.0.0 | ||
| 1159 | CLUTTER_MODULES="clutter-gtk-1.0 >= $CLUTTER_REQUIRED" | ||
| 1160 | |||
| 1161 | PKG_CHECK_MODULES(CLUTTER, $CLUTTER_MODULES, HAVE_CLUTTER=yes, HAVE_CLUTTER=no) | ||
| 1162 | if test $HAVE_CLUTTER = yes; then | ||
| 1163 | AC_DEFINE(HAVE_CLUTTER, 1, [Define to 1 if you have clutter support.]) | ||
| 1164 | fi | ||
| 1165 | |||
| 1166 | #TODO | ||
| 1167 | GOOCANVAS_REQUIRED=1.4.0 | ||
| 1168 | GOOCANVAS_MODULES="goocanvasgtk-3.0 >= $GOOCANVAS_REQUIRED" | ||
| 1169 | |||
| 1170 | PKG_CHECK_MODULES(GOOCANVAS, $GOOCANVAS_MODULES, HAVE_GOOCANVAS=yes, HAVE_GOOCANVAS=no) | ||
| 1171 | if test $HAVE_GOOCANVAS = yes; then | ||
| 1172 | AC_DEFINE(HAVE_GOOCANVAS, 1, [Define to 1 if you have goocanvas support.]) | ||
| 1173 | fi | ||
| 1174 | |||
| 1175 | fi | ||
| 1132 | 1176 | ||
| 1133 | if test "${with_sound}" != "no"; then | 1177 | if test "${with_sound}" != "no"; then |
| 1134 | # Sound support for GNU/Linux and the free BSDs. | 1178 | # Sound support for GNU/Linux and the free BSDs. |
| @@ -3658,6 +3702,11 @@ echo " Does Emacs use -lotf? ${HAVE_LIBOTF}" | |||
| 3658 | echo " Does Emacs use -lxft? ${HAVE_XFT}" | 3702 | echo " Does Emacs use -lxft? ${HAVE_XFT}" |
| 3659 | 3703 | ||
| 3660 | echo " Does Emacs use toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" | 3704 | echo " Does Emacs use toolkit scroll bars? ${USE_TOOLKIT_SCROLL_BARS}" |
| 3705 | |||
| 3706 | echo " Does Emacs support Xwidgets? ${HAVE_XWIDGETS}" | ||
| 3707 | echo " Does xwidgets support webkit? ${HAVE_WEBKIT}" | ||
| 3708 | echo " Does xwidgets support clutter? ${HAVE_CLUTTER}" | ||
| 3709 | echo " Does xwidgets support goocanvas? ${HAVE_GOOCANVAS}" | ||
| 3661 | echo | 3710 | echo |
| 3662 | 3711 | ||
| 3663 | if test $USE_XASSERTS = yes; then | 3712 | if test $USE_XASSERTS = yes; then |