remove special checks for std::string assume it is always there and good.

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@7774 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/ChangeLog b/ChangeLog
index 1db61a7d4f04bb3df06710f4974ddd695c00eb54..74efd80856f02555d7a70dd383cada0b9a9e9179 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2003-09-16  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * configure.ac: remove LYX_CXX_STL_STRING and
+       LYX_CXX_GOOD_STD_STRING checks. Add a simplified version of the
+       AC_ARG_WITH(included-string) 
+
 2003-09-11  Jean-Marc Lasgouttes  <lasgouttes@lyx.org>
 
        * README.MacOSX: update

diff --git a/config/ChangeLog b/config/ChangeLog
index c182e0409b37e1f7cabeaa5b8bd57549c4e1a42b..8a469ea1a302e61f830a6a192a3e31339ae477a0 100644 (file)
--- a/config/ChangeLog
+++ b/config/ChangeLog
@@ -1,3 +1,8 @@
+2003-09-16  Lars Gullik Bjønnes  <larsbj@gullik.net>
+
+       * lyxinclude.m4 (LYX_CXX_STL_STRING): remove
+       (LYX_CXX_GOOD_STD_STRING): remove
+
 2003-08-02  Kayvan Sylvan  <kayvan@sylvan.com>
 
        * Makefile.am (EXTRA_DIST): remove files that are not there anymore
@@ -11,7 +16,7 @@
        * lyxinclude.m4 (LYX_USE_FRONTENDS): renamed from
        LYX_USE_FRONTEND. Can now accept a list of frontends; the
        variables defines there are now FRONTENDS, FRONTENDS_SUBDIRS and
-       FRONTENDS_PROGS. 
+       FRONTENDS_PROGS.
 
 2003-07-29  Lars Gullik Bjønnes  <larsbj@gullik.net>
 

diff --git a/config/lyxinclude.m4 b/config/lyxinclude.m4
index 21671420f71fc4c586a8fe05fd4e403e57be403c..08dc0f96842b6d84914a7cb0befd9080a34dc451 100644 (file)
--- a/config/lyxinclude.m4
+++ b/config/lyxinclude.m4
@@ -46,6 +46,7 @@ AC_ARG_WITH(version-suffix,
 AC_MSG_RESULT([$lyxname])
 ])
 
+
 dnl Usage: LYX_ERROR(message)  Displays the warning "message" and sets the
 dnl flag lyx_error to yes.
 AC_DEFUN(LYX_ERROR,[
@@ -346,51 +347,6 @@ if test $lyx_cv_modern_streams = yes ; then
 fi])
 
 
-dnl Usage: LYX_CXX_STL_STRING : checks whether the C++ compiler
-dnl   has a std::string that is usable for LyX. LyX does not require this
-dnl   std::string to be standard.
-AC_DEFUN(LYX_CXX_STL_STRING,[
-    AC_REQUIRE([AC_PROG_CXX])
-    AC_MSG_CHECKING(whether the included std::string should be used)
-    AC_ARG_WITH(included-string,
-       [  --with-included-string  use LyX string class instead of STL string],
-       [lyx_cv_with_included_string=$withval
-       AC_MSG_RESULT([$with_included_string])],
-       [AC_CACHE_CHECK([],lyx_cv_with_included_string,
-       [AC_TRY_COMPILE([
-           #include <string>
-           using std::string;
-       ],[
-           // LyX has reduced its requirements on the basic_string
-           // implementation so that the basic_string supplied
-           // with gcc is usable. In particular this means that
-           // lyx does not use std::string::clear and not the
-           // strncmp version of std::string::compare. This is mainly
-           // done so that LyX can use precompiled C++ libraries that
-           // already uses the systems basic_string, e.g. gtk--
-           string a("hello there");
-           a.erase();
-           a = "hey";
-           //char s[] = "y";
-           //int t = a.compare(a.length() - 1, 1, s);
-           a.erase();
-       ],[
-           lyx_cv_with_included_string=no
-       ],[
-           lyx_cv_with_included_string=yes
-       ])
-       ])
-    ])
-    if test x$lyx_cv_with_included_string = xyes ; then
-       AC_DEFINE(USE_INCLUDED_STRING, 1,
-           [Define to use the lyxstring class bundled with LyX.])
-           lyx_flags="$lyx_flags included-string"
-    fi
-    AM_CONDITIONAL(USE_LYXSTRING, test x$lyx_cv_with_included_string = xyes)
-dnl    AC_MSG_RESULT([$with_included_string])
-])
-
-
 dnl Usage: LYX_USE_INCLUDED_BOOST : select if the included boost should
 dnl        be used.
 AC_DEFUN(LYX_USE_INCLUDED_BOOST,[
@@ -402,42 +358,6 @@ AC_DEFUN(LYX_USE_INCLUDED_BOOST,[
        AM_CONDITIONAL(USE_INCLUDED_BOOST, test x$lyx_cv_with_included_boost = xyes)
 ])
 
-dnl Usage: LYX_CXX_GOOD_STD_STRING : checks whether the C++ compiler
-dnl   has a std::string that is close to the standard. So close that
-dnl   methods not found in "unstandard" std::strings are present here.
-AC_DEFUN(LYX_CXX_GOOD_STD_STRING,[
-    AC_REQUIRE([AC_PROG_CXX])
-    AC_CACHE_CHECK([whether the systems std::string is really good],
-    [lyx_cv_std_string_good],
-    [AC_TRY_COMPILE([
-           #include <string>
-           using std::string;
-       ],[
-           // From a std::string that is supposed to be close to the
-           // standard we require at least three things:
-           // - clear() and erase()
-           // - the strncmp of compare()
-           // - push_back()
-           string a("hello there");
-           a.erase();
-           a = "hey";
-           char s[] = "y";
-           int t = a.compare(a.length() - 1, 1, s);
-           a.push_back('g');
-           a.clear();
-       ],[
-           lyx_cv_std_string_good=yes
-       ],[
-           lyx_cv_std_string_good=no
-
-       ])
-    ])
-    if test x$lyx_cv_std_string_good = xyes ; then
-       AC_DEFINE(STD_STRING_IS_GOOD, 1,
-           [Define if the systems std::string is really good.])
-    fi
-])
-
 
 dnl NOT USED CURRENTLY*************************************
 dnl LYX_CXX_PARTIAL
@@ -486,6 +406,7 @@ if test $lyx_cv_cxx_cheaders = no ; then
   LYX_ADD_INC_DIR(lyx_cppflags,\$(top_srcdir)/src/cheaders)
 fi])
 
+
 dnl Usage: LYX_CXX_GLOBAL_CSTD: checks whether C library functions
 dnl   are already in the global namespace
 AC_DEFUN(LYX_CXX_GLOBAL_CSTD,[
@@ -503,6 +424,7 @@ AC_DEFUN(LYX_CXX_GLOBAL_CSTD,[
     fi
 ])
 
+
 dnl Usage: LYX_WITH_DIR(dir-name,desc,dir-var-name,default-value,
 dnl                       [default-yes-value])
 dnl  Adds a --with-'dir-name' option (described by 'desc') and puts the

diff --git a/configure.ac b/configure.ac
index 0602771db3212ca9bd4852ce5243ace728b7c724..b4fefe0a7c6f0fd8f8c4e893c64bce140c17e173 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -66,8 +66,6 @@ dnl we do not need that currently (and probably all our supported
 dnl compiler allow that)
 dnl LYX_CXX_PARTIAL
 LYX_CXX_EXPLICIT
-LYX_CXX_STL_STRING
-LYX_CXX_GOOD_STD_STRING
 LYX_CXX_CHEADERS
 LYX_CXX_GLOBAL_CSTD
 LYX_STD_COUNT
@@ -76,6 +74,19 @@ dnl LYX_CXX_RTTI
 AC_CHECK_HEADERS(ostream istream sstream locale limits ios)
 LYX_CXX_STL_MODERN_STREAMS
 
+###
+AC_ARG_WITH(included-string,
+    AC_HELP_STRING([--with-included-string],[use std::string through namespace lyx]),
+       [lyx_cv_with_included_string=$withval
+       AC_MSG_RESULT([$with_included_string])],
+       [AC_CACHE_CHECK([],lyx_cv_with_included_string,[lyx_cv_with_included_string=no])])
+if test x$lyx_cv_with_included_string = xyes ; then
+    AC_DEFINE(USE_INCLUDED_STRING, 1,
+       [Define to use std::string through namespace lyx.])
+    lyx_flags="$lyx_flags included-string"
+fi
+
+
 ### and now some special lyx flags.
 AC_ARG_ENABLE(assertions,
   AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),,