--- configure.in.orig	2006-10-16 16:36:59.000000000 -0500
+++ configure.in	2011-01-06 07:23:02.000000000 -0600
@@ -18,21 +18,32 @@
 		LD_SHARED_FLAGS='-shared -soname libg2.so.0'
 		LD_SHARED_OPT=''
 		LD_SHARED_EXT='so.0.$(G2_VERSION)'
+		LD_SHARED_EXT_SHORT='so'
 		AC_DEFINE(LINUX);;
+ *-darwin*)
+		LD_SHARED='$(CC)'
+		LD_SHARED_FLAGS='-dynamiclib -install_name $(LIBDIR)/libg2.dylib'
+		LD_SHARED_OPT='$(LDFLAGS) -lc'
+		LD_SHARED_EXT='0.$(G2_VERSION).dylib'
+		LD_SHARED_EXT_SHORT='dylib'
+		AC_DEFINE(DARWIN);;
     *-aix*)
 		LD_SHARED='ld'
 		LD_SHARED_FLAGS='-bM:SRE -bnoentry -bexpall'
 		LD_SHARED_OPT='$(LDFLAGS) -lc'
 		LD_SHARED_EXT='so'
+		LD_SHARED_EXT_SHORT='so'
 		AC_DEFINE(AIX);;
     *-osf*)
 		LD_SHARED='ld'
 		LD_SHARED_FLAGS='-shared'
 		LD_SHARED_OPT='$(LDFLAGS) -lc'
 		LD_SHARED_EXT='so'
+		LD_SHARED_EXT_SHORT='so'
 		AC_DEFINE(OSF);;
          *)
 		LD_SHARED_EXT='so'
+		LD_SHARED_EXT_SHORT='so'
 		AC_DEFINE(UNIX);;
 esac
 
@@ -40,6 +51,7 @@
 AC_SUBST(LD_SHARED_FLAGS)
 AC_SUBST(LD_SHARED_OPT)
 AC_SUBST(LD_SHARED_EXT)
+AC_SUBST(LD_SHARED_EXT_SHORT)
 
 #
 # check C compiler, preprocesor, etc.
@@ -59,8 +71,8 @@
 # and add /usr/local to include and lib path and add -lm (for testing)
 #
 AC_PATH_XTRA
-CFLAGS="$CFLAGS $X_CFLAGS -I/usr/local/include"
-LIBS="$X_LIBS -L/usr/local/lib"
+CFLAGS="$CFLAGS $X_CFLAGS"
+LIBS="$X_LIBS"
 
 
 DO_PS='#'