Index: cups/config-scripts/cups-sharedlibs.m4
===================================================================
--- cups.orig/config-scripts/cups-sharedlibs.m4
+++ cups/config-scripts/cups-sharedlibs.m4
@@ -24,16 +24,6 @@ LIBCUPSSTATIC="lib$cupsbase.a"
 
 if test x$enable_shared != xno; then
 	case "$uname" in
-		SunOS*)
-			LIBCUPS="lib$cupsbase.so.2"
-			LIBCUPSCGI="libcupscgi.so.1"
-			LIBCUPSIMAGE="libcupsimage.so.2"
-			LIBCUPSMIME="libcupsmime.so.1"
-			LIBCUPSPPDC="libcupsppdc.so.1"
-			DSO="\$(CC)"
-			DSOXX="\$(CXX)"
-			DSOFLAGS="$DSOFLAGS -Wl,-h\`basename \$@\` -G \$(OPTIM)"
-			;;
 		UNIX_S*)
 			LIBCUPS="lib$cupsbase.so.2"
 			LIBCUPSCGI="libcupscgi.so.1"
@@ -78,7 +68,7 @@ if test x$enable_shared != xno; then
 			DSOXX="\$(CXX)"
 			DSOFLAGS="$DSOFLAGS -set_version,sgi2.6,-soname,\`basename \$@\` -shared \$(OPTIM)"
 			;;
-		OSF1* | Linux | GNU | *BSD*)
+		OSF1* | Linux | GNU | *BSD* | *SunOS*)
 			LIBCUPS="lib$cupsbase.so.2"
 			LIBCUPSCGI="libcupscgi.so.1"
 			LIBCUPSIMAGE="libcupsimage.so.2"
@@ -199,14 +189,6 @@ if test "$DSO" != ":"; then
                 	LDFLAGS="$LDFLAGS -Wl,+s,+b,$libdir"
                 	EXPORT_LDFLAGS="-Wl,+s,+b,$libdir"
 			;;
-                SunOS*)
-                	# Solaris...
-			if test $exec_prefix != /usr; then
-				DSOFLAGS="-R$libdir $DSOFLAGS"
-				LDFLAGS="$LDFLAGS -R$libdir"
-				EXPORT_LDFLAGS="-R$libdir"
-			fi
-			;;
                 *BSD*)
                         # *BSD...
 			if test $exec_prefix != /usr; then
@@ -215,7 +197,7 @@ if test "$DSO" != ":"; then
 				EXPORT_LDFLAGS="-Wl,-R$libdir"
 			fi
 			;;
-                Linux | GNU)
+                Linux | GNU | SunOS*)
                         # Linux, and HURD...
 			if test $exec_prefix != /usr; then
 				DSOFLAGS="-Wl,-rpath,$libdir $DSOFLAGS"