remove some remains from the old patch

m0003r · Sep 25, 2014 · ef6e938 · ef6e938
1 parent d11734b
commit ef6e938
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/acinclude.m4 b/acinclude.m4
@@ -2736,7 +2736,7 @@ AC_DEFUN([PHP_CHECK_CONFIGURE_OPTIONS],[
       enable-libtool-lock | with-pic | with-tags | enable-shared | enable-static | enable-fast-install | with-gnu-ld[)];;
 
       # Allow certain TSRM options
-      with-tsrm-pth | with-tsrm-st | with-tsrm-pthreads | --with-tsrm-native-tls [)];;
+      with-tsrm-pth | with-tsrm-st | with-tsrm-pthreads [)];;
 
       # Allow certain Zend options
       with-zend-vm | enable-maintainer-zts | enable-inline-optimization[)];;

diff --git a/configure.in b/configure.in
@@ -1156,7 +1156,6 @@ PHP_CONFIGURE_PART(Configuring TSRM)
 TSRM_BASIC_CHECKS
 if test "$PHP_THREAD_SAFETY" = "yes"; then
   TSRM_THREADS_CHECKS
-  TSRM___THREAD_CHECKS
 fi
 
 EXTRA_LDFLAGS="$EXTRA_LDFLAGS $LDFLAGS"