X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=2c6f427863da17751798b63b06dadead46cdacf7;hb=1fd5e5ed974338edef45216c3e3a3f678b180676;hp=36682055eca6087169d4df1a59b8bf815b84f80b;hpb=1d00ad9765ae80f0bde9c0d4b1338545e44ead11;p=lyx.git

diff --git a/configure.in b/configure.in
index 36682055ec..2c6f427863 100644
--- 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
@@ -24,8 +28,7 @@ test "x$prefix" = xNONE && prefix=$ac_default_prefix
 test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
 
 ### Set the execute permissions of the various scripts correctly
-for file in config/install-sh config/mkinstalldirs config/hack-gcc \
-            lib/configure ; do
+for file in config/install-sh config/mkinstalldirs lib/configure ; do
   chmod 755 ${srcdir}/${file}
 done
 
@@ -60,36 +63,31 @@ 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
-LYX_CXX_STL_STACK
+dnl we do not use stl stack, or at least not on gcc 2.7, which was the 
+dnl cause for this test. 
+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
 AC_CHECK_LIB(m, sin)
 AC_CHECK_LIB(c, fopen)
 
-# A hack to work around gcc compiler errors
-AC_ARG_WITH(gcc-hack,[  --with-gcc-hack         add a wrapper around gcc])
-if test "x$with_gcc_hack" = xyes ; then
-  CXX_COMMAND='${top_srcdir}/config/hack-gcc ${CXX}'
-  lyx_flags="$lyx_flags gcc-hack"
-else
-  CXX_COMMAND='${CXX}'
-fi
-AC_SUBST(CXX_COMMAND)
-
 ### Add extra directories to check for libraries.
 LYX_WITH_DIR([extra-lib],[extra library directory],extra_lib, NONE)
 LYX_LOOP_DIR($lyx_cv_extra_lib,LYX_ADD_LIB_DIR(lyx_ldflags,$dir))
@@ -141,7 +139,6 @@ LYX_ERROR(dnl
    the development tools.])
 fi
 
-
 ### Setup GNU gettext
 dnl GNU gettext is written in C
 AC_LANG_C
@@ -164,6 +161,10 @@ AC_HEADER_DIRENT
 AC_HEADER_MAJOR
 AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h)
 
+# some annoying header files
+#LYX_PATH_HEADER(stl_string_fwd.h)
+LYX_STL_STRING_FWD
+
 # some standard structures
 AC_HEADER_STAT
 AC_HEADER_TIME
@@ -181,7 +182,7 @@ AC_TYPE_UID_T
 
 # some functions we'd like to have
 AC_ARG_WITH(broken-headers,
-    [  --with-broken-headers      define some functions on SunOS4 and SCO],
+    [  --with-broken-headers   define some functions on SunOS4 and SCO],
     [lyx_broken_headers=$withval])
 if test "x$lyx_broken_headers" = "xyes"; then
   lyx_flags="$lyx_flags broken-headers"
@@ -193,17 +194,30 @@ 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_WITH(debug,[  --with-debug            output debug information by default],
-  [AC_DEFINE(DEBUG_AS_DEFAULT,1,
-    [Define if you want debugging turned on as default.])
-   lyx_flags="$lyx_flags debug"])
+AC_ARG_ENABLE(assertions,
+  [  --enable-assertions     add runtime sanity checks in the program],,
+  [if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then
+	enable_assertions=yes;
+    else
+	enable_assertions=no;
+    fi;])
+if test "x$enable_assertions" = xyes ; then
+   lyx_flags="$lyx_flags assertions"
+   AC_DEFINE(ENABLE_ASSERTIONS,1,
+    [Define if you want assertions to be enabled in the code])
+fi
 
 ### Finish the work.
 AC_CONFIG_SUBDIRS(lib lib/reLyX)