Update server support; remove libcurvecpr-glib.

This changeset backports changes to the libcurvecpr core library from
the add-glib-server branch. It further removes libcurvecpr-glib entirely
from the source tree; the GLib-based source code will be made available
in a separate repository (currently
https://github.com/impl/libcurvecpr-glib).

Author: impl

.gitignore

@@ -12,7 +12,6 @@
 /depcomp
 /install-sh
 /libcurvecpr/libcurvecpr.pc
-/libcurvecpr-glib/libcurvecpr-glib.pc
 /libtool
 /ltmain.sh
 /m4/libtool.m4

.travis.yml

@@ -12,13 +12,9 @@ before_install:
     - popd
     - popd
     - sudo ldconfig
-env:
-    - USE_LIBGLIB=no
-    - USE_LIBGLIB=yes
 before_script:
     - ./autogen.sh
-    - sh -c 'if [ "$USE_LIBGLIB" = "yes" ]; then ./configure --with-libglib CFLAGS="-Werror"; fi'
-    - sh -c 'if [ "$USE_LIBGLIB" = "no" ]; then ./configure --without-libglib CFLAGS="-Werror"; fi'
+    - ./configure CFLAGS="-Werror"
 script: make check
 compiler:
     - clang

Makefile.am

@@ -1,7 +1,3 @@
 ACLOCAL_AMFLAGS = -I m4
 
 SUBDIRS = libcurvecpr
-
-if USE_LIBGLIB
-    SUBDIRS += libcurvecpr-glib
-endif

configure.ac

@@ -29,17 +29,6 @@ PKG_CHECK_MODULES([CHECK], [check >= 0.9.8])
 AC_SEARCH_LIBS([clock_gettime], [rt posix4])
 AC_CHECK_LIB([sodium], [sodium_init], [], [AC_MSG_ERROR([missing libsodium])])
 
-AC_ARG_WITH([libglib],
-    [AS_HELP_STRING([--with-libglib], [build with glib support @<:@default=check@:>@])],
-    [], [with_libglib=check]
-)
-AS_CASE(["$with_glib"],
-    [yes], [PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.14.0], [HAVE_LIBGLIB=1])],
-    [no], [],
-    [PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.14.0], [HAVE_LIBGLIB=1], [HAVE_LIBGLIB=0])]
-)
-AM_CONDITIONAL([USE_LIBGLIB], [test "$with_libglib" != no -a "$HAVE_LIBGLIB" -eq 1])
-
 # Checks for header files.
 AC_HEADER_STDC
 AC_CHECK_HEADERS([errno.h stdint.h string.h time.h], [], [AC_MSG_ERROR([missing required header file(s)])])
@@ -85,11 +74,6 @@ AC_CONFIG_FILES([
     libcurvecpr/test/Makefile
     libcurvecpr/Makefile
     libcurvecpr/libcurvecpr.pc
-    libcurvecpr-glib/include/Makefile
-    libcurvecpr-glib/lib/Makefile
-    libcurvecpr-glib/test/Makefile
-    libcurvecpr-glib/Makefile
-    libcurvecpr-glib/libcurvecpr-glib.pc
     Makefile
 ])
 AC_OUTPUT