Merge abarkov@build.mysql.com:/home/bk/mysql-4.1

into bar.mysql.r18.ru:/usr/home/bar/mysql-4.1

libmysql/Makefile.am

@@ -28,6 +28,7 @@ libmysqlclient_la_SOURCES = $(target_sources)
 libmysqlclient_la_LIBADD = $(target_libadd)
 libmysqlclient_la_LDFLAGS = $(target_ldflags)
 EXTRA_DIST = Makefile.shared
+noinst_HEADERS = client_settings.h
 
 # This is called from the toplevel makefile
 link_sources: