uses references instead of returning vectors

[lyx.git] / configure.in

diff --git a/configure.in b/configure.in
index 7e5caf4f8e58c9a5da40aaf5fdf776ebde51644c..5a141386579fdb1dfa763dbfdd93c599b71a7b65 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -54,9 +54,6 @@ AC_PROG_CC
 ### check for special systems
 AC_ISC_POSIX
 AC_AIX
-LYX_HPUX
-LYX_SUNOS4
-LYX_SCO
 
 ### Check for program extensions (.exe or nothing)
 AC_EXEEXT
@@ -171,11 +168,16 @@ case "$lyx_use_frontend" in
        FRONTEND="xforms"
        FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo"
        FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
-       FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
-       FRONTEND_INFO=`cat <<EOF
-    libXpm version:               ${XPM_VERSION}\n\
-    libforms version:             ${XFORMS_VERSION}\n
-`
+       case "$host" in
+         *cygwin)
+           FRONTEND_LIBS="@XFORMS_LIB@ @XFORMS_IMAGE_LIB@ @XPM_LIB@"
+           ;;
+         *)
+           FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
+           ;;
+       esac
+       FRONTEND_INFO="    libXpm version:               ${XPM_VERSION}\n\
+    libforms version:             ${XFORMS_VERSION}\n"
        ;;
   gnome)
     PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
@@ -190,27 +192,16 @@ case "$lyx_use_frontend" in
   qt2)
     QT2_DO_IT_ALL
     FRONTEND="qt2"
-    FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo qt2/xforms/*.lo"
+    FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
     FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)"
-    FRONTEND_INCLUDES="-I\${srcdir}/qt2 -I\${top_srcdir}/src/frontends/xforms \$(QT2_INCLUDES)"
-    FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ \$(QT2_LIBS)";;
+    FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)"
+    FRONTEND_LIBS="\$(QT2_LIBS)";;
   *)
     LYX_ERROR(Unknown frontend $lyx_use_frontend);;
 esac
 
 ### Check for xforms and xpm (only if X has been found).
 if test "$have_x" = no ; then
-# We surely need these two libraries and want to check carefully the
-# version numbers...
-#LYX_PATH_XPM
-#LYX_PATH_XFORMS
-#FRONTEND_INFO=`cat <<EOF
-#    libXpm version:               ${XPM_VERSION}\n\
-#    libforms version:             ${XFORMS_VERSION}\n
-#`
-#
-#AC_SUBST(LYX_LIBS)
-#else
 LYX_ERROR(dnl
 [Cannot find X window libraries and/or headers. Check your installation.
    If you use a Linux system, check that you have installed
@@ -247,9 +238,6 @@ AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h)
 # some standard structures
 AC_HEADER_STAT
 AC_HEADER_TIME
-AC_STRUCT_ST_BLKSIZE
-AC_STRUCT_ST_BLOCKS
-AC_STRUCT_ST_RDEV
 
 # some standard types
 AC_TYPE_MODE_T
@@ -259,15 +247,6 @@ AC_TYPE_SIGNAL
 AC_TYPE_SIZE_T
 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],
-    [lyx_broken_headers=$withval])
-if test "x$lyx_broken_headers" = "xyes"; then
-  lyx_flags="$lyx_flags broken-headers"
-  AC_DEFINE(BROKEN_HEADERS, 1,
-    [Define on SunOS 4 and SCO, were some functions are missing from the headers])
-fi
 AC_CHECK_FUNCS(snprintf vsnprintf)
 LYX_CHECK_DECL(snprintf, stdio.h)
 LYX_CHECK_DECL(vsnprintf, stdio.h)
@@ -279,8 +258,6 @@ dnl We aim to remove this eventually, since we should test as much as
 dnl possible with the compiler which will use the functions (JMarc)
 AC_LANG_C
 AC_CHECK_FUNCS(memmove memset strchr putenv setenv mkfifo mkstemp mktemp)
-# SunOS 4.1.3 does not have strerror and atexit
-AC_REPLACE_FUNCS(strerror atexit)
 AC_LANG_CPLUSPLUS
 
 dnl Until this is fixed in autoconf we provide our own version
@@ -295,9 +272,8 @@ LYX_CHECK_DECL_HDRS(mkstemp,[unistd.h stdlib.h])
 ### Some information on what just happened
 real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
 real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
-VERSION_INFO=`cat <<EOF
-Configuration\n\
-  Host type:                      ${host_alias}\n\
+VERSION_INFO="Configuration\n\
+  Host type:                      ${host}\n\
   Special build flags:           ${lyx_flags}\n\
   C   Compiler:                   ${CC}\n\
   C   Compiler flags:             ${CFLAGS}\n\
@@ -307,8 +283,8 @@ Configuration\n\
   Frontend:                       ${lyx_use_frontend}\n\
 ${FRONTEND_INFO}\
   LyX binary dir:                 ${real_bindir}\n\
-  LyX files dir:                  ${real_datadir}\n
-`
+  LyX files dir:                  ${real_datadir}\n"
+
 
 AC_SUBST(VERSION_INFO)
 
@@ -338,7 +314,6 @@ AC_OUTPUT([Makefile \
        src/frontends/xforms/Makefile \
        src/frontends/xforms/forms/Makefile \
        src/frontends/qt2/Makefile \
-       src/frontends/qt2/xforms/Makefile \
        src/frontends/qt2/moc/Makefile \
        src/frontends/qt2/ui/Makefile \
        src/frontends/qt2/ui/moc/Makefile \