--- imap-2006b/src/osdep/unix/Makefile.orig	Thu Aug 31 03:31:57 2006
+++ imap-2006b/src/osdep/unix/Makefile	Thu Oct 12 01:21:08 2006
@@ -933,7 +933,7 @@
 	@false
 
 os_sol.h:
-	sh -c '(strings /lib/libc.a | grep getpassphrase > /dev/null) && $(LN) os_soln.h os_sol.h || $(LN) os_solo.h os_sol.h'
+	$(LN) os_soln.h os_sol.h
 
 
 # Once-only environment setup
@@ -951,6 +951,9 @@
 	 -DRSHPATH=\"$(RSHPATH)\" -DLOCKPGM=\"$(LOCKPGM)\" > OSCFLAGS
 	echo $(BASELDFLAGS) $(EXTRALDFLAGS) > LDFLAGS
 	echo "$(ARRC) $(ARCHIVE) $(BINARIES);$(RANLIB) $(ARCHIVE)" > ARCHIVE
+	echo "`$(CAT) CCTYPE` `$(CAT) CFLAGS` `$(CAT) OSCFLAGS` -G \
+	 -h libc-client.so.1 -o libc-client.so.1.0.0 $(BINARIES)" \
+	 >> ARCHIVE
 	echo $(OS) > OSTYPE
 	./drivers $(EXTRADRIVERS) $(DEFAULTDRIVERS) dummy
 	./mkauths $(EXTRAAUTHENTICATORS) $(DEFAULTAUTHENTICATORS)