iNew configure flag --with-lyxname. Misc small compilation fixes.

[lyx.git] / configure.in

diff --git a/configure.in b/configure.in
index 80ff6a10d818a160868aa27ca0ceddf30650d03f..2c6f427863da17751798b63b06dadead46cdacf7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,11 @@ LYX_GET_VERSION(${srcdir}/src/version.h)
 AC_CANONICAL_SYSTEM
 AC_VALIDATE_CACHE_SYSTEM_TYPE
 
-AM_INIT_AUTOMAKE(lyx, $VERSION)
+AC_ARG_WITH(lyxname,
+  [  --with-lyxname          the name under which lyx will be installed],
+  [lyxname=$withval],[lyxname=lyx])
+
+AM_INIT_AUTOMAKE($lyxname, $VERSION)
 
 # The list of languages known to LyX
 # This is needed by GNU gettext
@@ -59,8 +63,7 @@ AC_DISABLE_SHARED
 AC_LIBTOOL_WIN32_DLL
 AM_PROG_LIBTOOL
 
-### check the size of pointers and ints
-# the defaults are given for cross compilation.
+### Some checks on what the C++ compiler can(not) do
 LYX_CXX_MUTABLE
 LYX_CXX_PARTIAL
 LYX_CXX_EXPLICIT
@@ -70,11 +73,15 @@ dnl LYX_CXX_STL_STACK
 LYX_CXX_STL_STRING
 LYX_CXX_NAMESPACES
 LYX_CXX_CHEADERS
+LYX_STD_COUNT
 dnl we disable rtti for now
 dnl LYX_CXX_RTTI
-AC_CHECK_HEADERS(ostream istream)
+AC_CHECK_HEADERS(ostream istream sstream)
 LYX_CXX_STL_MODERN_STREAMS
 
+### We need a regex implementation, so we provide our own if none is found.
+LYX_REGEX
+
 ### Library Files
 dnl by testing these we check if it is ok to have
 dnl -lc and -lm as args to the compiler
@@ -187,12 +194,17 @@ AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo)
 dnl Until this is fixed in autoconf we provide our own version
 LYX_FUNC_SELECT_ARGTYPES
 
+dnl check whether we have to work around solaris broken putenv()
+LYX_FUNC_PUTENV_ARGTYPE
+
 # SunOS 4.1.3 does not have strerror and atexit
 AC_REPLACE_FUNCS(strerror atexit)
 
 ### and now some special lyx flags.
 AC_ARG_WITH(two-colors,[  --with-two-colors       use two color pixmaps],
-  [AC_DEFINE(TWO_COLOR_ICONS)
+  [AC_DEFINE(TWO_COLOR_ICONS,1,
+     [You might want to define TWO_COLOR_ICONS if you want to spare
+ your colormap.  This will use monochrome icons instead of colored ones.])
    lyx_flags="$lyx_flags two-colors"])
 AC_ARG_ENABLE(assertions,
   [  --enable-assertions     add runtime sanity checks in the program],,