[libpcre] consolidate symbols

PTXCONF_LIBPCRE__ -> PTXCONF_LIBPCRE_

Signed-off-by: Marc Kleine-Budde <mkl@pengutronix.de>

3 files changed, 33 insertions, 13 deletions

diff --git a/rules/libpcre.in b/rules/libpcre.in
index 335128e6c..b6aab3c65 100644
--- a/rules/libpcre.in
+++ b/rules/libpcre.in
@@ -1,27 +1,32 @@
 ## SECTION=system_libraries
+
 menuconfig LIBPCRE
 	tristate
 	prompt "libpcre                       "
-	select GCCLIBS_CXX if LIBPCRE__LIBPCRECPP
-       select ZLIB if LIBPCRE__ENABLE_PCREGREP_LIBZ
+	select GCCLIBS_CXX	if LIBPCRE_LIBPCRECPP
+	select ZLIB		if LIBPCRE_ENABLE_PCREGREP_LIBZ
 	help
-	  Perl Compatible Regluar Expressions Library
+	  Perl 5 Compatible Regular Expression Library
+
+	  This is a library of functions to support regular
+	  expressions whose syntax and semantics are as close as
+	  possible to those of the Perl 5 language.
 
 if LIBPCRE
 
-config LIBPCRE__ENABLE_NEWLINE_IS_ANYCRLF
+config LIBPCRE_ENABLE_NEWLINE_IS_ANYCRLF
        bool "Enable NL is any CRLF"
 
-config LIBPCRE__ENABLE_PCREGREP_LIBZ
+config LIBPCRE_ENABLE_PCREGREP_LIBZ
        bool "Enable grep libz"
 
-config LIBPCRE__ENABLE_UTF8
+config LIBPCRE_ENABLE_UTF8
        bool "Enable UTF8"
 
-config LIBPCRE__LIBPCREPOSIX
+config LIBPCRE_LIBPCREPOSIX
        bool "install libpcreposix"
 
-config LIBPCRE__LIBPCRECPP
+config LIBPCRE_LIBPCRECPP
        bool "install libpcrecpp (c++ bindings for libpcre)"
 
 endif
diff --git a/rules/libpcre.make b/rules/libpcre.make
index f6bffc7c6..f79fdb441 100644
--- a/rules/libpcre.make
+++ b/rules/libpcre.make
@@ -43,14 +43,21 @@ LIBPCRE_ENV 	:= $(CROSS_ENV)
 # autoconf
 #
 LIBPCRE_AUTOCONF := $(CROSS_AUTOCONF_USR)
-ifdef PTXCONF_LIBPCRE__ENABLE_NEWLINE_IS_ANYCRLF
+
+ifdef PTXCONF_LIBPCRE_ENABLE_NEWLINE_IS_ANYCRLF
 LIBPCRE_AUTOCONF += --enable-newline-is-anycrlf
 endif
-ifdef PTXCONF_LIBPCRE__ENABLE_PCREGREP_LIBZ
+
+ifdef PTXCONF_LIBPCRE_ENABLE_PCREGREP_LIBZ
 LIBPCRE_AUTOCONF += --enable-pcregrep-libz
+else
+LIBPCRE_AUTOCONF += --disable-pcregrep-libz
 endif
-ifdef PTXCONF_LIBPCRE__ENABLE_UTF8
+
+ifdef PTXCONF_LIBPCRE_ENABLE_UTF8
 LIBPCRE_AUTOCONF += --enable-utf8
+else
+LIBPCRE_AUTOCONF += --disable-utf8
 endif
 
 # ----------------------------------------------------------------------------
@@ -73,13 +80,13 @@ $(STATEDIR)/libpcre.targetinstall:
 	@$(call install_link, libpcre, libpcre.so.0.0.1, /usr/lib/libpcre.so.0)
 	@$(call install_link, libpcre, libpcre.so.0.0.1, /usr/lib/libpcre.so)
 
-ifdef PTXCONF_LIBPCRE__LIBPCREPOSIX
+ifdef PTXCONF_LIBPCRE_LIBPCREPOSIX
 	@$(call install_copy, libpcre, 0, 0, 0644, -, /usr/lib/libpcreposix.so.0.0.0)
 	@$(call install_link, libpcre, libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so.0)
 	@$(call install_link, libpcre, libpcreposix.so.0.0.0, /usr/lib/libpcreposix.so)
 endif
 
-ifdef PTXCONF_LIBPCRE__LIBPCRECPP
+ifdef PTXCONF_LIBPCRE_LIBPCRECPP
 	@$(call install_copy, libpcre, 0, 0, 0644, -, /usr/lib/libpcrecpp.so.0.0.0)
 	@$(call install_link, libpcre, libpcrecpp.so.0.0.0, /usr/lib/libpcrecpp.so.0)
 	@$(call install_link, libpcre, libpcrecpp.so.0.0.0, /usr/lib/libpcrecpp.so)
diff --git a/scripts/migrate/migrate_ptx b/scripts/migrate/migrate_ptx
index e983410af..31db7f392 100755
--- a/scripts/migrate/migrate_ptx
+++ b/scripts/migrate/migrate_ptx
@@ -75,3 +75,11 @@ s/^\(\(# \)\?PTXCONF_BUSYBOX\)_APP_DHCPRELAY\(.*$\)/\1_DHCPRELAY\3/
 s/^\(\(# \)\?PTXCONF_BUSYBOX\)_APP_DUMPLEASES\(.*$\)/\1_DUMPLEASES\3/
 s/^\(\(# \)\?PTXCONF_BUSYBOX\)_APP_UDHCPC\(.*$\)/\1_UDHCPC\3/
 s/^\(\(# \)\?PTXCONF_BUSYBOX\)_APP_UDHCPD\(.*$\)/\1_UDHCPD\3/
+
+#
+# from   : ptxdist-2010.04.0
+# to     : ptxdist-2010.05.0
+# symbol : LIBPCRE__*			-> LIBPCRE_
+# reason : consolidation of config symbols
+#
+s/^\(\(# \)\?PTXCONF_LIBPCRE_\)_\(.*$\)/\1\3/