Remove the automatic build of pcredemo.

git-svn-id: svn://vcs.exim.org/pcre/code/trunk@312 2f5784b3-3f2a-0410-8824-cb99058d5e15

6 files changed, 40 insertions, 30 deletions

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ee419ec..57dc39b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -24,6 +24,7 @@
 #            be built with suffix of "-0.dll". (The libraries will be named
 #            libpcre-0.dll, libpcreposix-0.dll and libpcrecpp-0.dll - same names
 #            built by default with Configure and Make.
+# 2008-01-23 PH removed the automatic build of pcredemo.
 
 PROJECT(PCRE C CXX)
 
@@ -361,12 +362,14 @@ TARGET_LINK_LIBRARIES(pcretest pcreposix ${PCRETEST_LIBS})
 ADD_EXECUTABLE(pcregrep pcregrep.c)
 TARGET_LINK_LIBRARIES(pcregrep pcreposix ${PCREGREP_LIBS})
 
-ADD_EXECUTABLE(pcredemo pcredemo.c)
-TARGET_LINK_LIBRARIES(pcredemo pcreposix)
-IF(NOT BUILD_SHARED_LIBS)
-    # make sure to not use declspec(dllimport) in static mode on windows
-	SET_TARGET_PROPERTIES(pcredemo PROPERTIES COMPILE_FLAGS "-DPCRE_STATIC")
-ENDIF(NOT BUILD_SHARED_LIBS)
+# Removed by PH (2008-01-23) because pcredemo shouldn't really be built
+# automatically, and it gave trouble in some environments anyway.
+# ADD_EXECUTABLE(pcredemo pcredemo.c)
+# TARGET_LINK_LIBRARIES(pcredemo pcreposix)
+# IF(NOT BUILD_SHARED_LIBS)
+#     # make sure to not use declspec(dllimport) in static mode on windows
+#	  SET_TARGET_PROPERTIES(pcredemo PROPERTIES COMPILE_FLAGS "-DPCRE_STATIC")
+# ENDIF(NOT BUILD_SHARED_LIBS)
 
 IF(PCRE_BUILD_PCRECPP)
 	ADD_EXECUTABLE(pcrecpp_unittest pcrecpp_unittest.cc)
diff --git a/ChangeLog b/ChangeLog
index 91bc56b..547ec15 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -16,7 +16,7 @@ Version 7.6 21-Jan-08
 
     - Fixed PH's badly added libz and libbz2 support.
     - Fixed a problem with static linking.
-    - Added pcredemo.
+    - Added pcredemo. [But later removed - see 7 below.]
     - Fixed dftables problem and added an option.
     - Added a number of HAVE_XXX tests, including HAVE_WINDOWS_H and
         HAVE_LONG_LONG.
@@ -34,6 +34,12 @@ Version 7.6 21-Jan-08
     
 6.  Applied Sheri's patch to CMakeLists.txt to add NON_STANDARD_LIB_PREFIX and
     NON_STANDARD_LIB_SUFFIX and correct the comment about stack recursion. 
+    
+7.  Remove the automatic building of pcredemo from the ./configure system and
+    from CMakeLists.txt. The whole idea of pcredemo.c is that it is an example 
+    of a program that users should build themselves after PCRE is installed, so 
+    building it automatically is not really right. What is more, it gave 
+    trouble in some build environments.
 
 
 Version 7.5 10-Jan-08
diff --git a/Makefile.am b/Makefile.am
index bf7b799..ec4b479 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -292,10 +292,15 @@ CLEANFILES += \
 	testtry \
         testNinput
 
-# PCRE demonstration program
-noinst_PROGRAMS += pcredemo
-pcredemo_SOURCES = pcredemo.c
-pcredemo_LDADD = libpcre.la
+
+# PCRE demonstration program. No longer built automatcally. The point is that
+# the users should build it themselves. So just distribute the source.
+# noinst_PROGRAMS += pcredemo
+# pcredemo_SOURCES = pcredemo.c
+# pcredemo_LDADD = libpcre.la
+
+EXTRA_DIST += pcredemo.c
+
 
 ## Utility rules, documentation, etc.
 
diff --git a/README b/README
index ad6ca4d..f9eb458 100644
--- a/README
+++ b/README
@@ -303,12 +303,12 @@ script that can be run to recreate the configuration, and config.log, which
 contains compiler output from tests that "configure" runs.
 
 Once "configure" has run, you can run "make". It builds two libraries, called
-libpcre and libpcreposix, a test program called pcretest, a demonstration
-program called pcredemo, and the pcregrep command. If a C++ compiler was found
-on your system, "make" also builds the C++ wrapper library, which is called
-libpcrecpp, and some test programs called pcrecpp_unittest,
-pcre_scanner_unittest, and pcre_stringpiece_unittest. Building the C++ wrapper
-can be disabled by adding --disable-cpp to the "configure" command.
+libpcre and libpcreposix, a test program called pcretest, and the pcregrep
+command. If a C++ compiler was found on your system, "make" also builds the C++
+wrapper library, which is called libpcrecpp, and some test programs called
+pcrecpp_unittest, pcre_scanner_unittest, and pcre_stringpiece_unittest.
+Building the C++ wrapper can be disabled by adding --disable-cpp to the
+"configure" command.
 
 The command "make check" runs all the appropriate tests. Details of the PCRE
 tests are given below in a separate section of this document.
@@ -360,9 +360,6 @@ system. The following are installed (file names are all relative to the
     pcretest.txt   the pcretest man page
     pcregrep.txt   the pcregrep man page
 
-Note that the pcredemo program that is built by "configure" is *not* installed
-anywhere. It is a demonstration for programmers wanting to use PCRE.
-
 If you want to remove PCRE from your system, you can run "make uninstall".
 This removes all the files that "make install" installed. However, it does not
 remove any directories, because these are often shared with other programs.
@@ -743,4 +740,4 @@ The distribution should contain the following files:
 Philip Hazel
 Email local part: ph10
 Email domain: cam.ac.uk
-Last updated: 18 December 2007
+Last updated: 23 January 2008
diff --git a/doc/pcreapi.3 b/doc/pcreapi.3
index f5175c4..2320286 100644
--- a/doc/pcreapi.3
+++ b/doc/pcreapi.3
@@ -140,7 +140,7 @@ distribution. The
 .\" HREF
 \fBpcresample\fP
 .\"
-documentation describes how to run it.
+documentation describes how to compile and run it.
 .P
 A second matching function, \fBpcre_dfa_exec()\fP, which is not
 Perl-compatible, is also provided. This uses a different algorithm for the
@@ -1960,6 +1960,6 @@ Cambridge CB2 3QH, England.
 .rs
 .sp
 .nf
-Last updated: 26 December 2007
-Copyright (c) 1997-2007 University of Cambridge.
+Last updated: 23 January 2008
+Copyright (c) 1997-2008 University of Cambridge.
 .fi
diff --git a/doc/pcresample.3 b/doc/pcresample.3
index 6fbe788..d27690a 100644
--- a/doc/pcresample.3
+++ b/doc/pcresample.3
@@ -18,10 +18,9 @@ check for further matches of the same regular expression in the same subject
 string. The logic is a little bit tricky because of the possibility of matching
 an empty string. Comments in the code explain what is going on.
 .P
-The demonstration program is automatically built if you use "./configure;make"
-to build PCRE. Otherwise, if PCRE is installed in the standard include and
-library directories for your system, you should be able to compile the
-demonstration program using this command:
+If PCRE is installed in the standard include and library directories for your
+system, you should be able to compile the demonstration program using this
+command:
 .sp
   gcc -o pcredemo pcredemo.c -lpcre
 .sp
@@ -76,6 +75,6 @@ Cambridge CB2 3QH, England.
 .rs
 .sp
 .nf
-Last updated: 13 June 2007
-Copyright (c) 1997-2007 University of Cambridge.
+Last updated: 23 January 2008
+Copyright (c) 1997-2008 University of Cambridge.
 .fi