# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1052812740 0
# Node ID a8015e02b590b5fcaa717469af4c09d2560001b2
# Parent  a3a299455c6702c8248dba5b96c0177b7fc3b776
Initial configure support for MacOS X.

diff -r a3a299455c67 -r a8015e02b590 Makefile.in
--- a/Makefile.in	Tue May 13 05:51:01 2003 +0000
+++ b/Makefile.in	Tue May 13 07:59:00 2003 +0000
@@ -1,13 +1,14 @@
 srcdir=@srcdir@
 CC	=	@CC@
-CCFLAGS	=	@CFLAGS@ -g -O2 -fPIC -Wall -D__UNIX__ -DBUILD_DLL -DDW_RESOURCES
+CCFLAGS	=	@CFLAGS@ -g -O2 -fPIC -Wall -D@DW_DEFINE@ -DBUILD_DLL -DDW_RESOURCES
 LFLAGS	=	@LIBS@
 INSTALL =	@INSTALL@
+DW_SRC  =	@DW_SRC@
 INCPATH	=	-I.. -I. -I$(srcdir)
 DESTDIR	=	./lib/
 MLFLAGS	=	-L$(DESTDIR) 
 TARGET	=	dw
-SRCS	=	$(srcdir)/gtk/dw.c
+SRCS	=	$(srcdir)/$(DW_SRC)/dw.c
 OBJECTS	=	dw.o
 SRCS2	=	$(srcdir)compat.c
 OBJECTS2=	compat.o
@@ -94,7 +95,7 @@
 	rm -f *.o
 	rm -f *~
 	rm -f *.a
-	rm -f gtk/*.o
+	rm -f $(DW_SRC)/*.o
 
 $(DESTDIR):
 	mkdir $(DESTDIR)
@@ -105,8 +106,8 @@
 $(SYSCONF_LINK_TARGET): $(OBJECTS) $(DESTDIR)
 	$(SYSCONF_LINK_LIB)
 
-dw.o: $(srcdir)/gtk/dw.c
-	$(CC) -c $(INCPATH) $(CCFLAGS) -o $@ $(srcdir)/gtk/dw.c
+dw.o: $(srcdir)/$(DW_SRC)/dw.c
+	$(CC) -c $(INCPATH) $(CCFLAGS) -o $@ $(srcdir)/$(DW_SRC)/dw.c
 
 compat.o: $(srcdir)/compat.c
 	$(CC) -c $(INCPATH) $(CCFLAGS) -o $@ $(srcdir)/compat.c
diff -r a3a299455c67 -r a8015e02b590 configure
--- a/configure	Tue May 13 05:51:01 2003 +0000
+++ b/configure	Tue May 13 07:59:00 2003 +0000
@@ -1200,6 +1200,8 @@
 DW_MINOR_VERSION=0
 DW_SUB_VERSION=0
 
+DW_SRC=gtk
+DW_DEFINE=__UNIX__
 
 
 
@@ -3580,7 +3582,13 @@
 fi
 
 
-# Extract the first word of "pkg-config", so it can be a program name with args.
+OPSYSTEM=`uname -s`
+
+if test $OPSYSTEM = "Darwin"; then
+	DW_SRC=mac
+        DW_DEFINE=__MAC__
+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
@@ -3615,11 +3623,11 @@
 echo "${ECHO_T}no" >&6
 fi
 
-if test x"$PKG_CFG" != x; then
-  GTK_LIBS=`$PKG_CFG --silence-errors --libs gtk+-2.0 gthread-2.0`
-fi
-
-if test x"$GTK_LIBS" = x; then
+	if test x"$PKG_CFG" != x; then
+	  GTK_LIBS=`$PKG_CFG --silence-errors --libs gtk+-2.0 gthread-2.0`
+	fi
+
+	if test x"$GTK_LIBS" = x; then
 
 # Check whether --with-glib-prefix or --without-glib-prefix was given.
 if test "${with_glib_prefix+set}" = set; then
@@ -4482,9 +4490,10 @@
 
   rm -f conf.gdkimlibtest
 
-else
-  GTK_CFLAGS=`$PKG_CFG --cflags gtk+-2.0 gthread-2.0`
-  GTK_LIBS=`$PKG_CFG --libs gtk+-2.0 gthread-2.0`
+	else
+	  GTK_CFLAGS=`$PKG_CFG --cflags gtk+-2.0 gthread-2.0`
+	  GTK_LIBS=`$PKG_CFG --libs gtk+-2.0 gthread-2.0`
+	fi
 fi
 
 if test "${ac_cv_header_pthread_h+set}" = set; then
@@ -4803,6 +4812,9 @@
 
 
 
+
+
+
 ac_config_files="$ac_config_files Makefile dw-config"
 
 cat >confcache <<\_ACEOF
@@ -5391,6 +5403,8 @@
 s,@CP@,$CP,;t t
 s,@MV@,$MV,;t t
 s,@MKDIR@,$MKDIR,;t t
+s,@DW_SRC@,$DW_SRC,;t t
+s,@DW_DEFINE@,$DW_DEFINE,;t t
 CEOF
 
 _ACEOF
diff -r a3a299455c67 -r a8015e02b590 configure.in
--- a/configure.in	Tue May 13 05:51:01 2003 +0000
+++ b/configure.in	Tue May 13 07:59:00 2003 +0000
@@ -5,6 +5,8 @@
 DW_MINOR_VERSION=0
 DW_SUB_VERSION=0
 
+DW_SRC=gtk
+DW_DEFINE=__UNIX__
 AC_SUBST(DW_MAJOR_VERSION)
 AC_SUBST(DW_MINOR_VERSION)
 AC_SUBST(DW_SUB_VERSION)
@@ -49,18 +51,25 @@
 AC_CHECK_LIB(dgc, inet_addr, LIBS="$LIBS -ldgc",)
 AC_CHECK_LIB(resolv, gethostbyname, LIBS="$LIBS -lresolv",)
 
-AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config)
-if test x"$PKG_CFG" != x; then
-  GTK_LIBS=`$PKG_CFG --silence-errors --libs gtk+-2.0 gthread-2.0`
-fi
+OPSYSTEM=`uname -s`
 
-if test x"$GTK_LIBS" = x; then
-  AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GLIB: Is glib-config in path?)))
-  AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?)), gthread)
-  AM_PATH_GDK_IMLIB(1.9.4, AC_DEFINE(USE_IMLIB), AC_MSG_ERROR(IMLIB not found or too old. Dynamic Windows cannot build without it.))
+if test $OPSYSTEM = "Darwin"; then
+	DW_SRC=mac
+        DW_DEFINE=__MAC__
 else
-  GTK_CFLAGS=`$PKG_CFG --cflags gtk+-2.0 gthread-2.0`
-  GTK_LIBS=`$PKG_CFG --libs gtk+-2.0 gthread-2.0`
+	AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config)
+	if test x"$PKG_CFG" != x; then
+	  GTK_LIBS=`$PKG_CFG --silence-errors --libs gtk+-2.0 gthread-2.0`
+	fi
+
+	if test x"$GTK_LIBS" = x; then
+	  AM_PATH_GLIB(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GLIB: Is glib-config in path?)))
+	  AM_PATH_GTK(1.2.0,,AC_MSG_ERROR(AC_MSG_ERROR(Cannot find GTK: Is gtk-config in path?)), gthread)
+	  AM_PATH_GDK_IMLIB(1.9.4, AC_DEFINE(USE_IMLIB), AC_MSG_ERROR(IMLIB not found or too old. Dynamic Windows cannot build without it.))
+	else
+	  GTK_CFLAGS=`$PKG_CFG --cflags gtk+-2.0 gthread-2.0`
+	  GTK_LIBS=`$PKG_CFG --libs gtk+-2.0 gthread-2.0`
+	fi
 fi
 
 AC_CHECK_HEADER(pthread.h,,AC_MSG_ERROR([pthread header not found. Dynamic Windows cannot build without it.]))
@@ -90,6 +99,9 @@
 AC_SUBST(MV)
 AC_SUBST(MKDIR)
 
+AC_SUBST(DW_SRC)
+AC_SUBST(DW_DEFINE)
+
 AC_CONFIG_FILES([
 Makefile
 dw-config ])