Mercurial > dwindows

comparison configure.in @ 662:d7badd5606ca

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Removed the Carbon source file, and changes to configure to build the Cocoa version. Mac GTK version should still work. Carbon was unfinished, Cocoa version is more complete.
author bsmith@81767d24-ef19-dc11-ae90-00e081727c95
date Fri, 25 Feb 2011 15:25:54 +0000
parents 903a8f7bcb7c
children 39d848c20c05
comparison
equal deleted inserted replaced
661:eee90a788876 662:d7badd5606ca
8 TARGET="dwindows" 8 TARGET="dwindows"
9 TARGET2="dwcompat" 9 TARGET2="dwcompat"
10 AC_SUBST(TARGET) 10 AC_SUBST(TARGET)
11 AC_SUBST(TARGET2) 11 AC_SUBST(TARGET2)
12 12
13 DW_SRC=gtk 13 DW_DIR=gtk
14 DW_SRC=dw.c
14 DW_DEFINE=__UNIX__ 15 DW_DEFINE=__UNIX__
15 SHAREDFLAG=-shared 16 SHAREDFLAG=-shared
16 SOSUFFIX=so 17 SOSUFFIX=so
17 AC_SUBST(DW_MAJOR_VERSION) 18 AC_SUBST(DW_MAJOR_VERSION)
18 AC_SUBST(DW_MINOR_VERSION) 19 AC_SUBST(DW_MINOR_VERSION)
136 ;; 137 ;;
137 esac 138 esac
138 SHAREDFLAG="-dynamiclib -flat_namespace -undefined suppress" 139 SHAREDFLAG="-dynamiclib -flat_namespace -undefined suppress"
139 SOSUFFIX=dylib 140 SOSUFFIX=dylib
140 if test $with_gtk = yes; then 141 if test $with_gtk = yes; then
141 DW_SRC=gtk 142 DW_DIR=gtk
143 DW_SRC=dw.c
142 LIBS="$LIBS -framework Gtk -framework Glib -framework Cairo" 144 LIBS="$LIBS -framework Gtk -framework Glib -framework Cairo"
143 GTK_CFLAGS="-I/Library/Frameworks/Gtk.framework/Headers -I/Library/Frameworks/Glib.framework/Headers -I/Library/Frameworks/Cairo.framework/Headers" 145 GTK_CFLAGS="-I/Library/Frameworks/Gtk.framework/Headers -I/Library/Frameworks/Glib.framework/Headers -I/Library/Frameworks/Cairo.framework/Headers"
144 else 146 else
145 DW_SRC=mac 147 DW_DIR=mac
148 DW_SRC=dw.m
146 DW_DEFINE=__MAC__ 149 DW_DEFINE=__MAC__
147 LIBS="$LIBS -framework Carbon" 150 LIBS="$LIBS -framework Cocoa -framework WebKit"
148 fi 151 fi
149 else 152 else
150 AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config) 153 AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config)
151 if test x"$PKG_CFG" != x; then 154 if test x"$PKG_CFG" != x; then
152 GTK_LIBS=`$PKG_CFG --silence-errors --libs gtk+-2.0 gthread-2.0` 155 GTK_LIBS=`$PKG_CFG --silence-errors --libs gtk+-2.0 gthread-2.0`
251 AC_SUBST(SHAREDFLAG) 254 AC_SUBST(SHAREDFLAG)
252 AC_SUBST(SOSUFFIX) 255 AC_SUBST(SOSUFFIX)
253 AC_SUBST(SONAME) 256 AC_SUBST(SONAME)
254 257
255 AC_SUBST(DW_SRC) 258 AC_SUBST(DW_SRC)
259 AC_SUBST(DW_DIR)
256 AC_SUBST(DW_DEFINE) 260 AC_SUBST(DW_DEFINE)
257 AC_SUBST(BROWSER_OBJECT) 261 AC_SUBST(BROWSER_OBJECT)
258 AC_SUBST(COMPAT_OBJECT) 262 AC_SUBST(COMPAT_OBJECT)
259 AC_SUBST(INSTALL_COMPAT) 263 AC_SUBST(INSTALL_COMPAT)
260 264