* Add m4macros/Makefile so Makefile.in gets parsed

* Remove nodist_* and change it to noinst_* for universalchardet
  (cut-and-paste-o)

Originally committed to SVN as r1909.

configure.in

@@ -529,6 +529,7 @@ universalchardet/Makefile
 auto3/Makefile
 automation/Makefile
 po/Makefile.in
+m4macros/Makefile
 ])
 
 

universalchardet/Makefile.am

@@ -2,7 +2,7 @@ noinst_LIBRARIES = libuniversalchardet.a
 
 AM_CPPFLAGS = -D_X86_
 
-nodist_libuniversalchardet_a_SOURCES = \
+libuniversalchardet_a_SOURCES = \
 	CharDistribution.cpp \
 	JpCntx.cpp \
 	LangBulgarianModel.cpp \
@@ -29,7 +29,7 @@ nodist_libuniversalchardet_a_SOURCES = \
 	nsUTF8Prober.cpp \
 	nsUniversalDetector.cpp
 
-nodist_libuniversalchardet_a_SOURCES += \
+libuniversalchardet_a_SOURCES += \
 	CharDistribution.h \
 	JpCntx.h \
 	nsBig5Prober.h \