Headers cleanup from Angus

[lyx.git] / configure.in

diff --git a/configure.in b/configure.in
index 6b97c2f2f39d5940683f80480ecb256f6e5c07bb..e9bdc94887886aa41b19a3987e6e8dc96f3a585d 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,11 +11,15 @@ 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
-ALL_LINGUAS="ca cs da de es fi fr hu it nl no pl pt ru sl sv tr wa"
+ALL_LINGUAS="ca cs da de es eu fi fr he hu it nl no pl pt ro ru sl sv tr wa"
 
 AC_PREFIX_PROGRAM(lyx)
 
@@ -38,6 +42,12 @@ if test "x$KPSEWHICH" = xkpsewhich ; then
     [Define this if you have the kpsewhich program working on your system.])
 fi
 
+# Work around a problem in automake 1.4: when invoking install-strip,
+# INSTALL_PROGRAM is changed to 'install -s', and since
+# INSTALL_SCRIPT==INSTALL_PROGRAM, we get errors with fileutils-4.0
+# which returns an error condition when stripping fails.
+INSTALL_SCRIPT='${INSTALL}'
+
 ### we will also need a C compiler to compile GNU gettext
 AC_PROG_CC
 
@@ -110,17 +120,48 @@ if test x$lyx_use_liberty = xyes; then
   AC_CHECK_LIB(iberty,main)
 fi
 
+### Check which libsigc++ we're using
+LYX_WITH_SIGC
+
 ### Check for X libraries
 # Check for the pt library (for SCO, needed for X)
 AC_CHECK_LIB(pt,ptsname,X_EXTRA_LIBS="-lpt $X_EXTRA_LIBS")
 # The real thing.
 AC_PATH_XTRA
 LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+# Since solaris X headers use int as implicit return type and modern
+# gcc's do not like that, let's use -isystem instead of -I.
+# We should test for gcc version and see whether it supports -isystem,
+# but since at least gcc 2.6.x supports it and it is still too old for
+# us, it seems we are safe.
+if test -n "$GXX" ; then
+  X_CFLAGS=`echo ${X_CFLAGS} | sed -e 's/-I/-isystem /'`
+fi
 CPPFLAGS="$CPPFLAGS $X_CFLAGS"
 
 ## Check whether X is new enough to handle the input method stuff
 AC_CHECK_FUNCS(XOpenIM)
 
+### check which frontend we want to use
+LYX_USE_FRONTEND
+dnl The code below is not in a macro, because this would cause big
+dnl problems with the AC_REQUIRE contained in KDE_DO_IT_ALL.  
+case "$lyx_use_frontend" in 
+  kde) 
+    KDE_DO_IT_ALL
+    FRONTEND="kde"
+    FRONTEND_GUILIB="\${top_builddir}/src/frontends/kde/libkde.la"
+    FRONTEND_LDFLAGS="\$(QT_LDFLAGS) \$(KDE_LDFLAGS)"
+    FRONTEND_INCLUDES="\$(QT_INCLUDES) \$(KDE_INCLUDES)"
+    FRONTEND_LIBS="\$(KDE_LIBS)"
+    AC_DEFINE(KDEGUI);;
+  xforms) 
+    FRONTEND="xforms"
+    FRONTEND_GUILIB="\${top_builddir}/src/frontends/xforms/libxforms.la";;
+  *)
+    LYX_ERROR(Unknown frontend $lyx_use_frontend);;
+esac
+
 ### Check for xforms and xpm (only if X has been found).
 if test "$have_x" = yes ; then
 # We surely need these two libraries and want to check carefully the
@@ -155,7 +196,7 @@ AC_LANG_CPLUSPLUS
 # some standard header files
 AC_HEADER_DIRENT
 AC_HEADER_MAJOR
-AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h)
+AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h)
 
 # some annoying header files
 #LYX_PATH_HEADER(stl_string_fwd.h)
@@ -197,11 +238,6 @@ LYX_FUNC_PUTENV_ARGTYPE
 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,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],,
   [if test $lyx_devel_version = yes -o $lyx_prerelease = yes ; then
@@ -216,7 +252,7 @@ if test "x$enable_assertions" = xyes ; then
 fi
 
 ### Finish the work.
-AC_CONFIG_SUBDIRS(lib lib/reLyX)
+AC_CONFIG_SUBDIRS(sigc++ lib lib/reLyX)
 AC_OUTPUT([Makefile \
        development/lyx.spec \
        lib/Makefile \
@@ -226,6 +262,10 @@ AC_OUTPUT([Makefile \
        src/mathed/Makefile \
        src/insets/Makefile \
        src/support/Makefile \
+       src/xtl/Makefile \
+       src/frontends/Makefile \
+       src/frontends/xforms/Makefile \
+       src/frontends/kde/Makefile \
 ],  [sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
 
 
@@ -245,4 +285,3 @@ EOF
 
 # Display a final warning if there has been a LYX_ERROR
 LYX_CHECK_ERRORS
-