dwindows: configure comparison

comparison configure @ 639:06be879f5137

Support for building with GTK+ on Mac OSX

author	mhessling@81767d24-ef19-dc11-ae90-00e081727c95
date	Sun, 12 Apr 2009 01:12:04 +0000
parents	f6f887d2c5aa
children	9ab89d89e6b4

comparison

equal deleted inserted replaced

-:3ce487327afd
+:06be879f5137
 ECHO_T
 LIBS
 build_alias
 host_alias
 target_alias
+TARGET
+TARGET2
 DW_MAJOR_VERSION
 DW_MINOR_VERSION
 DW_SUB_VERSION
 CC
 CFLAGS
 ac_ct_CXX
 MAKE
 INSTALL_PROGRAM
 INSTALL_SCRIPT
 INSTALL_DATA
+SYSCONF_LINK_TARGET_SHARED
+SYSCONF_LINK_TARGET_SHARED2
 CPP
 GREP
 EGREP
 PKG_CFG
 GLIB_CONFIG
 SHAREDFLAG
 SOSUFFIX
 DW_SRC
 DW_DEFINE
 BROWSER_OBJECT
+COMPAT_OBJECT
+INSTALL_COMPAT
 LIBOBJS
 LTLIBOBJS'
 ac_subst_files=''
 ac_precious_vars='build_alias
 host_alias
 --disable-imlibtest     Do not try to compile and run a test IMLIB program
 Optional Packages:
 --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
 --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
+--with-compat           specify this to build the optional dwcompat library
+--with-gtk              specify this to build dwindows with GTK+ (only relevant for OSX)
 --with-glib-prefix=PFX  Prefix where GLIB is installed (optional)
 --with-glib-exec-prefix=PFX Exec prefix where GLIB is installed (optional)
 --with-gtk-prefix=PFX   Prefix where GTK is installed (optional)
 --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)
 --with-imlib-prefix=PFX Prefix where IMLIB is installed (optional)
 DW_MAJOR_VERSION=1
 DW_MINOR_VERSION=1
 DW_SUB_VERSION=0
+TARGET="dw"
+TARGET2="dwcompat"
 DW_SRC=gtk
 DW_DEFINE=__UNIX__
 SHAREDFLAG=-shared
 SOSUFFIX=so
 test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
 test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
+with_compat=no
+# Check whether --with-compat was given.
+if test "${with_compat+set}" = set; then
+withval=$with_compat; with_compat=$withval
+else
+with_compat=no
+fi
+if test $with_compat = yes; then
+COMPAT_OBJECT="compat.o"
+INSTALL_COMPAT="installcompat"
+SYSCONF_LINK_TARGET_SHARED2="lib$TARGET2.$SOSUFFIX.$DW_MAJOR_VERSION.$DW_MINOR_VERSION"
+else
+COMPAT_OBJECT=""
+INSTALL_COMPAT=""
+SYSCONF_LINK_TARGET_SHARED2=""
+fi
+SYSCONF_LINK_TARGET_SHARED="lib$TARGET.$SOSUFFIX.$DW_MAJOR_VERSION.$DW_MINOR_VERSION"
+# Check whether --with-gtk was given.
+if test "${with_gtk+set}" = set; then
+withval=$with_gtk; with_gtk=$withval
+else
+with_gtk=no
+fi
 ac_ext=c
 ac_cpp='$CPP $CPPFLAGS'
 ;;
 esac
 if test $OPSYSTEM = "Darwin"; then
-DW_SRC=mac
+ARCH="-arch ppc -arch ppc64 -arch x86_64 -arch i386"
-DW_DEFINE=__MAC__
+SHAREDFLAG="-dynamiclib -flat_namespace -undefined suppress $ARCH"
-SHAREDFLAG=-dynamiclib
 SOSUFFIX=dylib
-LIBS="$LIBS -framework Carbon"
+if test $with_gtk = yes; then
+DW_SRC=gtk
+LIBS="$LIBS -framework Gtk -framework Glib -framework Cairo"
+GTK_CFLAGS="-I/Library/Frameworks/Gtk.framework/Headers -I/Library/Frameworks/Glib.framework/Headers -I/Library/Frameworks/Cairo.framework/Headers $ARCH"
+else
+DW_SRC=mac
+DW_DEFINE=__MAC__
+LIBS="$LIBS -framework Carbon"
+fi
 else
 # Extract the first word of "pkg-config", so it can be a program name with args.
 set dummy pkg-config; ac_word=$2
 { echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
 ac_config_files="$ac_config_files Makefile dw-config"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
 ECHO_T!$ECHO_T$ac_delim
 LIBS!$LIBS$ac_delim
 build_alias!$build_alias$ac_delim
 host_alias!$host_alias$ac_delim
 target_alias!$target_alias$ac_delim
+TARGET!$TARGET$ac_delim
+TARGET2!$TARGET2$ac_delim
 DW_MAJOR_VERSION!$DW_MAJOR_VERSION$ac_delim
 DW_MINOR_VERSION!$DW_MINOR_VERSION$ac_delim
 DW_SUB_VERSION!$DW_SUB_VERSION$ac_delim
 CC!$CC$ac_delim
 CFLAGS!$CFLAGS$ac_delim
 ac_ct_CXX!$ac_ct_CXX$ac_delim
 MAKE!$MAKE$ac_delim
 INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
 INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
 INSTALL_DATA!$INSTALL_DATA$ac_delim
+SYSCONF_LINK_TARGET_SHARED!$SYSCONF_LINK_TARGET_SHARED$ac_delim
+SYSCONF_LINK_TARGET_SHARED2!$SYSCONF_LINK_TARGET_SHARED2$ac_delim
 CPP!$CPP$ac_delim
 GREP!$GREP$ac_delim
 EGREP!$EGREP$ac_delim
 PKG_CFG!$PKG_CFG$ac_delim
 GLIB_CONFIG!$GLIB_CONFIG$ac_delim
 SHAREDFLAG!$SHAREDFLAG$ac_delim
 SOSUFFIX!$SOSUFFIX$ac_delim
 DW_SRC!$DW_SRC$ac_delim
 DW_DEFINE!$DW_DEFINE$ac_delim
 BROWSER_OBJECT!$BROWSER_OBJECT$ac_delim
+COMPAT_OBJECT!$COMPAT_OBJECT$ac_delim
+INSTALL_COMPAT!$INSTALL_COMPAT$ac_delim
 LIBOBJS!$LIBOBJS$ac_delim
 LTLIBOBJS!$LTLIBOBJS$ac_delim
 _ACEOF
-if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 80; then
+if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 86; then
 break
 elif $ac_last_try; then
 { { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
 echo "$as_me: error: could not make $CONFIG_STATUS" >&2;}
 { (exit 1); exit 1; }; }

Mercurial > dwindows

comparison configure @ 639:06be879f5137