9 files changed, 7 insertions, 26 deletions

diff --git a/Makefile.am b/Makefile.am
index 45aa9cc..d3011ec 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,10 +2,6 @@ SUBDIRS = crypto ssl tls include apps tests man
 ACLOCAL_AMFLAGS = -I m4
 
 pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libcrypto.pc libssl.pc openssl.pc
-
-if ENABLE_LIBTLS
-pkgconfig_DATA += libtls.pc
-endif
+pkgconfig_DATA = libcrypto.pc libssl.pc libtls.pc openssl.pc
 
 EXTRA_DIST = README README.windows VERSION config scripts
diff --git a/configure.ac b/configure.ac
index 30c7dd6..0bbf998 100644
--- a/configure.ac
+++ b/configure.ac
@@ -310,11 +310,6 @@ AM_CONDITIONAL([HOST_ASM_ELF_X86_64],
 AM_CONDITIONAL([HOST_ASM_MACOSX_X86_64],
     [test "x$HOST_ABI" = "xmacosx" -a "$host_cpu" = "x86_64" -a "x$enable_asm" != "xno"])
 
-AC_ARG_ENABLE([libtls],
-        AS_HELP_STRING([--enable-libtls], [Enable building the libtls library]))
-AM_CONDITIONAL([ENABLE_LIBTLS], [test "x$enable_libtls" = xyes])
-AM_COND_IF([ENABLE_LIBTLS], [AC_CONFIG_FILES([libtls.pc])])
-
 LT_INIT
 
 AC_CONFIG_FILES([
@@ -329,6 +324,7 @@ AC_CONFIG_FILES([
         man/Makefile
         libcrypto.pc
         libssl.pc
+        libtls.pc
         openssl.pc
 ])
 
diff --git a/dist-win.sh b/dist-win.sh
index 42569ac..cfb6414 100755
--- a/dist-win.sh
+++ b/dist-win.sh
@@ -22,7 +22,7 @@ for ARCH in X86 X64; do
 
         echo Building for $HOST
 
-        CC=$HOST-gcc ./configure --host=$HOST --enable-libtls
+        CC=$HOST-gcc ./configure --host=$HOST
         make clean
         PATH=$PATH:/usr/$HOST/sys-root/mingw/bin \
            make -j 4 check
diff --git a/dist.sh b/dist.sh
index 27bd40a..ff740b7 100755
--- a/dist.sh
+++ b/dist.sh
@@ -3,5 +3,5 @@ set -e
 
 rm -f man/*.1 man/*.3
 ./autogen.sh
-./configure --enable-libtls
+./configure
 make distcheck
diff --git a/gen-coverage-report.sh b/gen-coverage-report.sh
index f99bd8e..1a199cf 100755
--- a/gen-coverage-report.sh
+++ b/gen-coverage-report.sh
@@ -20,7 +20,7 @@ find -name '*.gcda' -o -name '*.gcno' -delete
 rm -fr $DESTDIR
 
 echo "Configuring to build with code coverage support"
-./configure --enable-libtls CFLAGS='-O0 -fprofile-arcs -ftest-coverage'
+./configure CFLAGS='-O0 -fprofile-arcs -ftest-coverage'
 
 echo "Running all code paths"
 make clean
diff --git a/include/Makefile.am b/include/Makefile.am
index 31cc0ab..7e1ece2 100644
--- a/include/Makefile.am
+++ b/include/Makefile.am
@@ -28,6 +28,4 @@ noinst_HEADERS += sys/times.h
 noinst_HEADERS += sys/types.h
 noinst_HEADERS += sys/uio.h
 
-if ENABLE_LIBTLS
 include_HEADERS = tls.h
-endif
diff --git a/scripts/travis b/scripts/travis
index c52be79..091f37d 100755
--- a/scripts/travis
+++ b/scripts/travis
@@ -4,7 +4,7 @@ set -e
 ./autogen.sh
 
 if [ "x$ARCH" = "xnative" ]; then
-        ./configure --enable-libtls
+        ./configure
         if [ `uname` = "Darwin" ]; then
                 # OS X runs out of resources if we run 'make -j check'
                 make check
@@ -28,6 +28,6 @@ else
                 export PATH=$PATH:/opt/$ARCH/bin
         fi
 
-        ./configure --host=$CPU-w64-mingw32 --enable-libtls
+        ./configure --host=$CPU-w64-mingw32
         make -j
 fi
diff --git a/tls/Makefile.am b/tls/Makefile.am
index f0919a5..e82a694 100644
--- a/tls/Makefile.am
+++ b/tls/Makefile.am
@@ -1,6 +1,5 @@
 include $(top_srcdir)/Makefile.am.common
 
-if ENABLE_LIBTLS
 lib_LTLIBRARIES = libtls.la
 
 EXTRA_DIST = VERSION
@@ -20,5 +19,3 @@ noinst_HEADERS = tls_internal.h
 if !HAVE_STRSEP
 libtls_la_SOURCES += strsep.c
 endif
-
-endif
diff --git a/update.sh b/update.sh
index 7b03d03..c4d33e8 100755
--- a/update.sh
+++ b/update.sh
@@ -304,9 +304,7 @@ echo "copying manpages"
         $CP $openssl_app_src/openssl.1 .
         echo "dist_man_MANS += openssl.1" >> Makefile.am
         $CP $libtls_src/tls_init.3 .
-        echo "if ENABLE_LIBTLS" >> Makefile.am
         echo "dist_man_MANS += tls_init.3" >> Makefile.am
-        echo "endif" >> Makefile.am
 
         # convert remaining POD manpages
         for i in `ls -1 $libssl_src/src/doc/crypto/*.pod | sort`; do
@@ -328,23 +326,19 @@ echo "copying manpages"
                 echo "  ln -f \$(DESTDIR)\$(mandir)/man3/$1 \\" >> Makefile.am
                 echo "    \$(DESTDIR)\$(mandir)/man3/$2" >> Makefile.am
         done
-        echo "if ENABLE_LIBTLS" >> Makefile.am
         for i in $TLS_MLINKS; do
                 IFS=","; set $i; unset IFS
                 echo "  ln -f \$(DESTDIR)\$(mandir)/man3/$1 \\" >> Makefile.am
                 echo "    \$(DESTDIR)\$(mandir)/man3/$2" >> Makefile.am
         done
-        echo "endif" >> Makefile.am
         echo "" >> Makefile.am
         echo "uninstall-local:" >> Makefile.am
         for i in $SSL_MLINKS; do
                 IFS=","; set $i; unset IFS
                 echo "  -rm -f \$(DESTDIR)\$(mandir)/man3/$2" >> Makefile.am
         done
-        echo "if ENABLE_LIBTLS" >> Makefile.am
         for i in $TLS_MLINKS; do
                 IFS=","; set $i; unset IFS
                 echo "  rm -f \$(DESTDIR)\$(mandir)/man3/$2" >> Makefile.am
         done
-        echo "endif" >> Makefile.am
 )