Add a --disable-oldname-compat option to configure to turn off the cr…

…eation of the libjson.so library, and only include libjson-c.so

Makefile.am

@@ -3,13 +3,16 @@ include Makefile.am.inc
 EXTRA_DIST = README.html README-WIN32.html config.h.win32 doc json-c.vcproj
 SUBDIRS = . tests
 
-lib_LTLIBRARIES = libjson-c.la libjson.la
+lib_LTLIBRARIES = libjson-c.la 
+if ENABLE_OLDNAME_COMPAT
+lib_LTLIBRARIES+=libjson.la
+endif
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = json-c.pc
 
-libjsonincludedir = $(includedir)/json-c
-libjsoninclude_HEADERS = \
+libjson_cincludedir = $(includedir)/json-c
+libjson_cinclude_HEADERS = \
 	arraylist.h \
 	bits.h \
 	debug.h \
@@ -30,10 +33,14 @@ libjsoninclude_HEADERS = \
 #	json_config.h
 
 libjson_c_la_LDFLAGS = -version-info 1:0:1 -no-undefined
+
+if ENABLE_OLDNAME_COMPAT
 libjson_la_LDFLAGS = -version-info 1:0:1 -no-undefined -ljson-c
 
 # Temporary libjson library.  This will be removed after one release.
 libjson_la_LIBADD = -ljson-c
+endif
+
 
 libjson_c_la_SOURCES = \
 	arraylist.c \

configure.in

@@ -7,6 +7,14 @@ AM_INIT_AUTOMAKE(AC_PACKAGE_NAME, AC_PACKAGE_VERSION)
 
 AC_PROG_MAKE_SET
 
+AC_ARG_ENABLE(oldname-compat,
+ AS_HELP_STRING([--disable-oldname-compat],
+   [Don't include the old libjson.so library and include/json directory.]),
+[],
+[enable_oldname_compat=yes]
+)
+AM_CONDITIONAL(ENABLE_OLDNAME_COMPAT, [test "x${enable_oldname_compat}" != "xno"])
+
 # Checks for programs.
 
 # Checks for libraries.