Mercurial > dwindows
comparison configure.in @ 2003:dee122916f3c
GTK: Switch GTK3 to be the default. GTK2 requires --with-gtk2
Remove obsolete libgtkhtml-2 and gtkmozembed support.
#define USE_WEBKIT2 when including webkit2 on GTK3.
author | bsmith@81767d24-ef19-dc11-ae90-00e081727c95 |
---|---|
date | Tue, 05 Nov 2019 11:58:07 +0000 |
parents | 5d32be499016 |
children | a17cc1958369 |
comparison
equal
deleted
inserted
replaced
2002:a2931caa3422 | 2003:dee122916f3c |
---|---|
6 AC_SUBST(TARGET) | 6 AC_SUBST(TARGET) |
7 AC_SUBST(TARGET2) | 7 AC_SUBST(TARGET2) |
8 | 8 |
9 AC_DEFUN([AC_DATAROOTDIR_CHECKED]) | 9 AC_DEFUN([AC_DATAROOTDIR_CHECKED]) |
10 | 10 |
11 DW_DIR=gtk | 11 DW_DIR=gtk3 |
12 DW_SRC=dw.c | 12 DW_SRC=dw.c |
13 DW_DEFINE=__UNIX__ | 13 DW_DEFINE=__UNIX__ |
14 SHAREDFLAG=-shared | 14 SHAREDFLAG=-shared |
15 SOSUFFIX=so | 15 SOSUFFIX=so |
16 LIBSUFFIX=a | 16 LIBSUFFIX=a |
46 [ --with-dwcompat specify this to build the optional dwcompat library], | 46 [ --with-dwcompat specify this to build the optional dwcompat library], |
47 [with_dwcompat=$withval], | 47 [with_dwcompat=$withval], |
48 [with_dwcompat=no], | 48 [with_dwcompat=no], |
49 ) | 49 ) |
50 | 50 |
51 dnl ---------------------- check for '--with-gtk3' switch ----------------- | 51 dnl ---------------------- check for '--with-gtk2' switch ----------------- |
52 AC_ARG_WITH(gtk3, | 52 AC_ARG_WITH(gtk2, |
53 [ --with-gtk3 specify this to build with GTK+ 3.x if available], | 53 [ --with-gtk2 specify this to build with GTK+ 2.x if available], |
54 [with_gtk3=$withval], | 54 [with_gtk2=$withval], |
55 [with_gtk3=no], | 55 [with_gtk2=no], |
56 ) | 56 ) |
57 | 57 |
58 dnl ---------------------- check for '--with-deprecated' switch ----------------- | 58 dnl ---------------------- check for '--with-deprecated' switch ----------------- |
59 AC_ARG_WITH(deprecated, | 59 AC_ARG_WITH(deprecated, |
60 [ --with-deprecated specify this to build with deprecated functions], | 60 [ --with-deprecated specify this to build with deprecated functions], |
61 [with_deprecated=$withval], | 61 [with_deprecated=$withval], |
62 [with_deprecated=no], | 62 [with_deprecated=no], |
63 ) | 63 ) |
64 | 64 |
65 dnl ---------------------- default targets to build ----------------- | 65 dnl ---------------------- default targets to build ----------------- |
72 INSTALL_COMPAT="" | 72 INSTALL_COMPAT="" |
73 SYSCONF_LINK_TARGET_SHARED2="" | 73 SYSCONF_LINK_TARGET_SHARED2="" |
74 fi | 74 fi |
75 SYSCONF_LINK_TARGET_SHARED="lib$TARGET.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" | 75 SYSCONF_LINK_TARGET_SHARED="lib$TARGET.$SOSUFFIX.\$(DW_MAJOR_VERSION).\$(DW_MINOR_VERSION)" |
76 SYSCONF_LINK_TARGET_STATIC="lib$TARGET.a" | 76 SYSCONF_LINK_TARGET_STATIC="lib$TARGET.a" |
77 | |
78 dnl ---------------------- check for '--with-gtk+' switch ----------------- | |
79 AC_ARG_WITH(gtk, | |
80 [ --with-gtk specify this to build dwindows with GTK+ (only relevant for OSX)], | |
81 [with_gtk=$withval], | |
82 [with_gtk=no], | |
83 ) | |
84 | |
85 dnl ---------------------- check for '--with-gtkframework' switch ----------------- | |
86 AC_ARG_WITH(gtkframework, | |
87 [ --with-gtkframework specify this to build dwindows with GTK+ Framework (only relevant for OSX)], | |
88 [with_gtkframework=$withval], | |
89 [with_gtkframework=no], | |
90 ) | |
91 | |
92 dnl ---------------------- check for '--with-gtkhtml' switch ----------------- | |
93 AC_ARG_WITH(gtkhtml, | |
94 [ --with-gtkhtml specify this to build dwindows with libgtkhtml-2], | |
95 [with_gtkhtml=$withval], | |
96 [with_gtkhtml=no], | |
97 ) | |
98 | |
99 dnl ---------------------- check for '--with-gtkmozembed' switch ----------------- | |
100 AC_ARG_WITH(gtkmozembed, | |
101 [ --with-gtkmozembed specify this to build dwindows with Mozilla gtkmozembed], | |
102 [with_gtkmozembed=$withval], | |
103 [with_gtkmozembed=no], | |
104 ) | |
105 | 77 |
106 dnl ---------------------- check for '--with-arch' switch ----------------- | 78 dnl ---------------------- check for '--with-arch' switch ----------------- |
107 AC_ARG_WITH(arch, | 79 AC_ARG_WITH(arch, |
108 [ --with-arch specify architecture: one of all, 32bit, 64bit, intel, ppc, ppc64, x86_64, i386], | 80 [ --with-arch specify architecture: one of all, 32bit, 64bit, intel, ppc, ppc64, x86_64, i386], |
109 [with_arch=$withval], | 81 [with_arch=$withval], |
188 ARCH="-arch ppc64 -arch x86_64" | 160 ARCH="-arch ppc64 -arch x86_64" |
189 ;; | 161 ;; |
190 intel) | 162 intel) |
191 ARCH="-arch i386 -arch x86_64" | 163 ARCH="-arch i386 -arch x86_64" |
192 ;; | 164 ;; |
165 powerpc) | |
166 ARCH="-arch ppc -arch ppc64" | |
167 ;; | |
193 *) | 168 *) |
194 ARCH="-arch $with_arch" | 169 ARCH="-arch $with_arch" |
195 ;; | 170 ;; |
196 esac | 171 esac |
197 SHAREDFLAG="-dynamiclib -flat_namespace -undefined suppress -headerpad_max_install_names" | 172 SHAREDFLAG="-dynamiclib -flat_namespace -undefined suppress -headerpad_max_install_names" |
198 SOSUFFIX=dylib | 173 SOSUFFIX=dylib |
199 if test $with_gtkframework = yes; then | 174 DW_DIR=mac |
200 DW_DIR=gtk | 175 DW_SRC=dw.m |
201 LIBS="$LIBS -framework Gtk -framework Glib -framework Cairo" | 176 DW_DEFINE=__MAC__ |
202 GTK_CFLAGS="-I/Library/Frameworks/Gtk.framework/Headers -I/Library/Frameworks/Glib.framework/Headers -I/Library/Frameworks/Cairo.framework/Headers" | 177 LIBS="$LIBS -framework Cocoa -framework WebKit" |
203 build_gtk="no" | 178 build_gtk="no" |
204 elif test $with_gtk = yes; then | |
205 build_gtk="yes" | |
206 else | |
207 DW_DIR=mac | |
208 DW_SRC=dw.m | |
209 DW_DEFINE=__MAC__ | |
210 LIBS="$LIBS -framework Cocoa -framework WebKit" | |
211 build_gtk="no" | |
212 fi | |
213 ;; | 179 ;; |
214 *) | 180 *) |
215 ;; | 181 ;; |
216 esac | 182 esac |
217 | 183 |
218 if test $build_gtk = "yes"; then | 184 if test $build_gtk = "yes"; then |
219 AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config) | 185 AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config) |
220 if test x"$PKG_CFG" != x; then | 186 if test x"$PKG_CFG" != x; then |
221 GTK_LIBS="" | 187 GTK_LIBS="" |
222 if test $with_gtk3 = "yes"; then | 188 if test $with_gtk2 = "yes"; then |
189 GTK_PACKAGES="gtk+-2.0 gthread-2.0" | |
190 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` | |
191 fi | |
192 WEBKIT_PKG="webkitgtk-3.0" | |
193 if test x"$GTK_LIBS" = x; then | |
223 GTK_PACKAGES="gtk+-3.0" | 194 GTK_PACKAGES="gtk+-3.0" |
224 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` | 195 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` |
196 else | |
197 DW_DIR=gtk | |
198 WEBKIT_PKG="webkit-1.1" | |
225 fi | 199 fi |
226 WEBKIT_PKG="webkit-1.1" | 200 # test for webkit2gtk or webkitgtk packages |
227 if test x"$GTK_LIBS" = x; then | 201 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` |
228 GTK_PACKAGES="gtk+-2.0 gthread-2.0" | 202 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` |
229 GTK_LIBS=`$PKG_CFG --silence-errors --libs $GTK_PACKAGES` | 203 if test x"$WEBKIT_CFLAGS" = x; then |
204 # no webkit-1.1 or webkitgtk-3.0, look for webkit-1.0 | |
205 WEBKIT_PKG="webkit-1.0" | |
206 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` | |
207 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` | |
208 if test x"$WEBKIT_CFLAGS" = x; then | |
209 WEBKIT_PKG="WebKitGtk" | |
210 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` | |
211 WEBKIT_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` | |
212 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` | |
213 else | |
214 AC_DEFINE(USE_WEBKIT10) | |
215 WEBKIT_LIB=$WEBKIT_PKG | |
216 WEBKIT_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` | |
217 RESULT=`echo $WEBKIT_LIBS | grep lwebkitgtk-1.0` | |
218 if test x"$RESULT" != x; then | |
219 WEBKIT_LIB=webkitgtk-1.0 | |
220 fi | |
221 fi | |
230 else | 222 else |
231 DW_DIR=gtk3 | 223 if test $with_gtk2 = "yes"; then |
232 WEBKIT_PKG="webkitgtk-3.0" | 224 AC_DEFINE(USE_WEBKIT11) |
225 else | |
226 AC_DEFINE(USE_WEBKIT2) | |
227 fi | |
228 WEBKIT_LIB=$WEBKIT_PKG | |
233 fi | 229 fi |
234 if test $with_gtkmozembed = yes; then | 230 AC_DEFINE_UNQUOTED(WEBKIT_LIB, "$WEBKIT_LIB") |
235 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs firefox-gtkmozembed` | |
236 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags firefox-gtkmozembed` | |
237 RPATH=`$PKG_CFG --silence-errors --libs-only-L firefox-gtkmozembed | cut -b 3-` | |
238 if test x"$MOZEMBED_LIBS" = x; then | |
239 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs mozilla-gtkmozembed` | |
240 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags mozilla-gtkmozembed` | |
241 RPATH=`$PKG_CFG --silence-errors --libs-only-L mozilla-gtkmozembed | cut -b 3-` | |
242 fi | |
243 elif test $with_gtkhtml = yes; then | |
244 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs libgtkhtml-2.0` | |
245 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags libgtkhtml-2.0` | |
246 RPATH=`$PKG_CFG --silence-errors --libs-only-L libgtkhtml-2.0 | cut -b 3-` | |
247 else | |
248 # test for webkit-1.1 or webkitgtk-3.0 packages | |
249 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` | |
250 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` | |
251 if test x"$MOZEMBED_CFLAGS" = x; then | |
252 # no webkit-1.1 or webkitgtk-3.0, look for webkit-1.0 | |
253 WEBKIT_PKG="webkit-1.0" | |
254 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` | |
255 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` | |
256 if test x"$MOZEMBED_CFLAGS" = x; then | |
257 WEBKIT_PKG="WebKitGtk" | |
258 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` | |
259 MOZEMBED_CFLAGS=`$PKG_CFG --silence-errors --cflags $WEBKIT_PKG` | |
260 RPATH=`$PKG_CFG --silence-errors --libs-only-L $WEBKIT_PKG | cut -b 3-` | |
261 else | |
262 AC_DEFINE(USE_WEBKIT10) | |
263 WEBKIT_LIB=$WEBKIT_PKG | |
264 MOZEMBED_LIBS=`$PKG_CFG --silence-errors --libs $WEBKIT_PKG` | |
265 RESULT=`echo $MOZEMBED_LIBS | grep lwebkitgtk-1.0` | |
266 if test x"$RESULT" != x; then | |
267 WEBKIT_LIB=webkitgtk-1.0 | |
268 fi | |
269 fi | |
270 else | |
271 AC_DEFINE(USE_WEBKIT11) | |
272 WEBKIT_LIB=$WEBKIT_PKG | |
273 fi | |
274 AC_DEFINE_UNQUOTED(WEBKIT_LIB, "$WEBKIT_LIB") | |
275 fi | |
276 if test x"$RPATH" != x; then | 231 if test x"$RPATH" != x; then |
277 RPATH="-Wl,-R$RPATH" | 232 RPATH="-Wl,-R$RPATH" |
278 fi | 233 fi |
279 fi | 234 fi |
280 | 235 |
307 ) | 262 ) |
308 ) | 263 ) |
309 ) | 264 ) |
310 fi | 265 fi |
311 | 266 |
312 CFLAGS="$CFLAGS $GTK_CFLAGS $GDK_IMLIB_FLAGS $MOZEMBED_CFLAGS" | 267 CFLAGS="$CFLAGS $GTK_CFLAGS $GDK_IMLIB_FLAGS $WEBKIT_CFLAGS" |
313 | 268 |
314 if test $with_deprecated = yes; then | 269 if test $with_deprecated = yes; then |
315 CFLAGS="$CFLAGS -DDW_INCLUDE_DEPRECATED" | 270 CFLAGS="$CFLAGS -DDW_INCLUDE_DEPRECATED" |
316 fi | 271 fi |
317 BROWSER_OBJECT="" | 272 if test x"$WEBKIT_CFLAGS" != x; then |
318 if test x"$MOZEMBED_CFLAGS" != x; then | |
319 SAVE_LIBS="$LIBS" | 273 SAVE_LIBS="$LIBS" |
320 LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $MOZEMBED_LIBS" | 274 LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $WEBKIT_LIBS" |
321 BROWSER_OBJECT="browser.o" | 275 AC_CHECK_LIB($WEBKIT_LIB,webkit_web_view_new,AC_DEFINE(USE_WEBKIT),) |
322 if test $with_gtkmozembed = yes; then | |
323 AC_CHECK_LIB(gtkembedmoz,gtk_moz_embed_new,AC_DEFINE(USE_GTKMOZEMBED),BROWSER_OBJECT="") | |
324 elif test $with_gtkhtml = yes; then | |
325 AC_CHECK_LIB(gtkhtml-2,html_document_new,AC_DEFINE(USE_LIBGTKHTML2),BROWSER_OBJECT="") | |
326 else | |
327 AC_CHECK_LIB($WEBKIT_LIB,webkit_web_view_new,AC_DEFINE(USE_WEBKIT),BROWSER_OBJECT="") | |
328 BROWSER_OBJECT="" | |
329 fi | |
330 LIBS="$SAVE_LIBS" | 276 LIBS="$SAVE_LIBS" |
331 fi | 277 fi |
332 | 278 |
333 LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $MOZEMBED_LIBS $PLATLIBS" | 279 LIBS="$RPATH $LIBS $GTK_LIBS $PTHREAD_LIBS $GDK_IMLIB_LIBS $WEBKIT_LIBS $PLATLIBS" |
334 | 280 |
335 AC_CHECK_FUNCS(ubuntu_overlay_scrollbar_set_enabled, AC_DEFINE(HAVE_OVERLAY_SCROLLBARS,1,Define if we have Ubuntu overlay scrollbars)) | 281 AC_CHECK_FUNCS(ubuntu_overlay_scrollbar_set_enabled, AC_DEFINE(HAVE_OVERLAY_SCROLLBARS,1,Define if we have Ubuntu overlay scrollbars)) |
336 AC_CHECK_FUNCS(ubuntu_gtk_set_use_overlay_scrollbar, AC_DEFINE(HAVE_OVERLAY_SCROLLBARS2,1,Define if we have Ubuntu overlay scrollbars)) | 282 AC_CHECK_FUNCS(ubuntu_gtk_set_use_overlay_scrollbar, AC_DEFINE(HAVE_OVERLAY_SCROLLBARS2,1,Define if we have Ubuntu overlay scrollbars)) |
337 | 283 |
338 RM="rm -f" | 284 RM="rm -f" |