Remove support for libpcre, we use GRegex in GLib.

svn path=/trunk/; revision=38683

1 files changed, 0 insertions, 106 deletions

diff --git a/acinclude.m4 b/acinclude.m4
index 5898b14f1a..9309a523c1 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -765,112 +765,6 @@ AC_DEFUN([AC_WIRESHARK_ZLIB_CHECK],
 ])
 
 #
-# AC_WIRESHARK_LIBPCRE_CHECK
-#
-AC_DEFUN([AC_WIRESHARK_LIBPCRE_CHECK],
-[
-	if test "x$pcre_dir" != "x"
-	then
-	  #
-	  # The user specified a directory in which libpcre resides,
-	  # so add the "include" subdirectory of that directory to
-	  # the include file search path and the "lib" subdirectory
-	  # of that directory to the library search path.
-	  #
-	  # XXX - if there's also a libpcre in a directory that's
-	  # already in CFLAGS, CPPFLAGS, or LDFLAGS, this won't
-	  # make us find the version in the specified directory,
-	  # as the compiler and/or linker will search that other
-	  # directory before it searches the specified directory.
-	  #
-	  wireshark_save_CFLAGS="$CFLAGS"
-	  CFLAGS="$CFLAGS -I$pcre_dir/include"
-	  wireshark_save_CPPFLAGS="$CPPFLAGS"
-	  CPPFLAGS="$CPPFLAGS -I$pcre_dir/include"
-	  wireshark_save_LIBS="$LIBS"
-	  LIBS="$LIBS -lpcre"
-	  wireshark_save_LDFLAGS="$LDFLAGS"
-	  LDFLAGS="$LDFLAGS -L$pcre_dir/lib"
-	fi
-
-	#
-	# Make sure we have "pcre.h".  If we don't, it means we probably
-	# don't have libpcre, so don't use it.
-	#
-	AC_CHECK_HEADER(pcre.h,,
-	  [
-	    if test "x$pcre_dir" != "x"
-	    then
-	      #
-	      # The user used "--with-pcre=" to specify a directory
-	      # containing libpcre, but we didn't find the header file
-	      # there; that either means they didn't specify the
-	      # right directory or are confused about whether libpcre
-	      # is, in fact, installed.  Report the error and give up.
-	      #
-	      AC_MSG_ERROR([libpcre header not found in directory specified in --with-pcre])
-	    else
-	      if test "x$want_pcre" = "xyes"
-	      then
-		#
-		# The user tried to force us to use the library, but we
-		# couldn't find the header file; report an error.
-		#
-		AC_MSG_ERROR(Header file pcre.h not found.)
-	      else
-		#
-		# We couldn't find the header file; don't use the
-		# library, as it's probably not present.
-		#
-		want_pcre=no
-	      fi
-	    fi
-	  ])
-
-	if test "x$want_pcre" != "xno"
-	then
-		#
-		# Well, we at least have the pcre header file.
-		#
-		# We're only using standard functions from libpcre,
-		# so we don't need to perform extra checks.
-		#
-		AC_CHECK_LIB(pcre, pcre_compile,
-		[
-			if test "x$pcre_dir" != "x"
-			then
-				#
-				# Put the "-I" and "-L" flags for pcre at
-				# the beginning of CFLAGS, CPPFLAGS,
-				# LDFLAGS, and LIBS.
-				#
-				PCRE_LIBS="-L$pcre_dir/lib -lpcre $wireshark_save_LIBS"
-			else
-				PCRE_LIBS="-lpcre"
-			fi
-			AC_DEFINE(HAVE_LIBPCRE, 1, [Define to use libpcre library])
-		],[
-			if test "x$pcre_dir" != "x"
-			then
-				#
-				# Restore the versions of CFLAGS, CPPFLAGS,
-				# LDFLAGS, and LIBS before we added the
-				# "--with-pcre=" directory, as we didn't
-				# actually find pcre there.
-				#
-				CFLAGS="$wireshark_save_CFLAGS"
-				CPPFLAGS="$wireshark_save_CPPFLAGS"
-				LDFLAGS="$wireshark_save_LDFLAGS"
-				LIBS="$wireshark_save_LIBS"
-				PCRE_LIBS=""
-			fi
-			want_pcre=no
-		])
-		AC_SUBST(PCRE_LIBS)
-	fi
-])
-
-#
 # AC_WIRESHARK_LIBLUA_CHECK
 #
 AC_DEFUN([AC_WIRESHARK_LIBLUA_CHECK],[