# HG changeset patch
# User bsmith@81767d24-ef19-dc11-ae90-00e081727c95
# Date 1054074666 0
# Node ID 062ed9ddf3afccf238778658424708aa2d9a09e6
# Parent  f225f16bebbd9be4a91d05accf8b82454d14ed42
Shared library updates for MacOS X.  Suffix should be dylib, and linker
flag should be -dynamiclib not -dynamic.

diff -r f225f16bebbd -r 062ed9ddf3af Makefile.in
--- a/Makefile.in	Tue May 27 21:43:49 2003 +0000
+++ b/Makefile.in	Tue May 27 22:31:06 2003 +0000
@@ -15,6 +15,7 @@
 TARGET2 =	dwcompat
 VER_MAJ	=	1
 VER_MIN	=	0
+SOSUFFIX=	@SOSUFFIX@
 PREFIX	=	@prefix@
 SRCDIR=dwindows-$(VER_MAJ).$(VER_MIN)
 
@@ -33,25 +34,25 @@
 #   - Usually needs to incorporate $(VER_MAJ) and $(VER_MIN)
 #
 SYSCONF_LINK_SHLIB	= gcc
-SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).so.$(VER_MAJ).$(VER_MIN)
+SYSCONF_LINK_TARGET_SHARED	= lib$(TARGET).$(SOSUFFIX).$(VER_MAJ).$(VER_MIN)
 SYSCONF_LINK_LIB_SHARED	=  $(SYSCONF_LINK_SHLIB) $(SYSCONF_LFLAGS_SHOBJ) \
 				     -o $(SYSCONF_LINK_TARGET_SHARED) \
 				     $(OBJECTS) $(LFLAGS); \
 				 mv $(SYSCONF_LINK_TARGET_SHARED) $(DESTDIR); \
 				 cd $(DESTDIR); \
-				 rm -f lib$(TARGET).so lib$(TARGET).so.$(VER_MAJ); \
-				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so; \
-				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).so.$(VER_MAJ)
+				 rm -f lib$(TARGET).$(SOSUFFIX) lib$(TARGET).$(SOSUFFIX).$(VER_MAJ); \
+				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).$(SOSUFFIX); \
+				 ln -s $(SYSCONF_LINK_TARGET_SHARED) lib$(TARGET).$(SOSUFFIX).$(VER_MAJ)
                                  
-SYSCONF_LINK_TARGET_SHARED2	= lib$(TARGET2).so.$(VER_MAJ).$(VER_MIN)
+SYSCONF_LINK_TARGET_SHARED2	= lib$(TARGET2).$(SOSUFFIX).$(VER_MAJ).$(VER_MIN)
 SYSCONF_LINK_LIB_SHARED2 =  $(SYSCONF_LINK_SHLIB) $(SYSCONF_LFLAGS_SHOBJ) \
 				     -o $(SYSCONF_LINK_TARGET_SHARED2) \
 				     $(OBJECTS2) $(LFLAGS); \
 				 mv $(SYSCONF_LINK_TARGET_SHARED2) $(DESTDIR); \
 				 cd $(DESTDIR); \
-				 rm -f lib$(TARGET2).so lib$(TARGET2).so.$(VER_MAJ); \
-				 ln -s $(SYSCONF_LINK_TARGET_SHARED2) lib$(TARGET2).so; \
-				 ln -s $(SYSCONF_LINK_TARGET_SHARED2) lib$(TARGET2).so.$(VER_MAJ)
+				 rm -f lib$(TARGET2).$(SOSUFFIX) lib$(TARGET2).$(SOSUFFIX).$(VER_MAJ); \
+				 ln -s $(SYSCONF_LINK_TARGET_SHARED2) lib$(TARGET2).$(SOSUFFIX); \
+				 ln -s $(SYSCONF_LINK_TARGET_SHARED2) lib$(TARGET2).$(SOSUFFIX).$(VER_MAJ)
 
 
 # Linking static libraries
diff -r f225f16bebbd -r 062ed9ddf3af configure.in
--- a/configure.in	Tue May 27 21:43:49 2003 +0000
+++ b/configure.in	Tue May 27 22:31:06 2003 +0000
@@ -8,6 +8,7 @@
 DW_SRC=gtk
 DW_DEFINE=__UNIX__
 SHAREDFLAG=-shared
+SOSUFFIX=so
 AC_SUBST(DW_MAJOR_VERSION)
 AC_SUBST(DW_MINOR_VERSION)
 AC_SUBST(DW_SUB_VERSION)
@@ -57,7 +58,8 @@
 if test $OPSYSTEM = "Darwin"; then
 	DW_SRC=mac
         DW_DEFINE=__MAC__
-	SHAREDFLAG=-dynamic
+	SHAREDFLAG=-dynamiclib
+	SOSUFFIX=dylib
 	LIBS="$LIBS -framework Carbon"
 else
 	AC_CHECK_PROG(PKG_CFG, pkg-config, pkg-config)
@@ -102,6 +104,7 @@
 AC_SUBST(MV)
 AC_SUBST(MKDIR)
 AC_SUBST(SHAREDFLAG)
+AC_SUBST(SOSUFFIX)
 
 AC_SUBST(DW_SRC)
 AC_SUBST(DW_DEFINE)