fix compilation; remove cruft in configure script (I may have removed too much, but we will readd them if needed)

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

ChangeLog

@@ -1,3 +1,17 @@
+2002-07-17  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* acconfig.h: do not include broken_headers.h; remove descriptions
+	of HAVE_LIBSM and XPM_H_LOCATION
+
+	* INSTALL: remove documentation for --with-broken-headers and
+	--with-liberty 
+
+	* configure.in: do not invoke LYX_SCO, LYX_HPUX, LYX_SUNOS4,
+	AC_STRUCT_ST_BLKSIZE, AC_STRUCT_ST_BLOCKS, AC_STRUCT_ST_RDEV;
+	remove --with-broken-headers option; do not test for strerror and
+	atexit 
+	(VERSION_INFO): add EOF at the end
+
 2002-07-14  John Levon  <moz@compsoc.man.ac.uk>
 
 	* configure.in: remove xforms from qt

INSTALL

@@ -212,8 +212,8 @@ give a value to the CXX variable.
 If you encounter problems, please read the section 'Problems' at the end of 
 this file. 
 
-In particular, the following options could be useful in some
+In particular, the following options could be useful in some desperate
-desperate cases:
+cases:
 
   o --enable-warnings that make the compiler output more warnings during
     the compilation of LyX.  Opposite is --disable-warnings.  By default,
@@ -224,18 +224,11 @@ desperate cases:
     is --disable-assertions.  By default, this flag is on for
     development versions only. 
 
-  o --with-broken-headers that provides prototypes to replace functions
-    not correctly defined in SunOS4 and SCO header files.  Its only effect is
-    to suppress a few warnings.  It is autodetected by default.
-
   o --without-latex-config that disables the automatic detection of your
     latex configuration.  This detection is automatically disabled if
     latex cannot be found.  If you find that you have to use this
     flag, please report it as a bug. 
 
-  o --without-liberty suppresses the detection of the -liberty library
-    (see the section `Problems').
-
 
 Compiling and installing LyX
 ----------------------------
@@ -343,17 +336,6 @@ notify us.
   o On solaris 2.6, you may have to compile with --with-included-string
     if compiling with gcc 2.95.2.
 
-  o According to David Sundqvist <David_Sundqvist@vd.volvo.se>, some
-    changes are needed to compile with aCC on HP-UX 10.20. These are the
-    relevant changes in the makefile (with comments tagged on):  
-
-    CXX = /opt/aCC/bin/aCC 
-    CXXFLAGS = -O +inst_none # The aCC compiler tries to run instantiations
-                             # which currently break.
-
-    LIBS = -lforms -lXpm  -lSM -lICE -lc -lm -lX11 -lCsup # must link with Csup
-    LDFLAGS = -L/opt/aCC/lib # perhaps not needed.
-
   o LyX can be compiled on Tru64 Unix with either GNU's gcc or the default
     Compaq cxx compiler.
 

acconfig.h

@@ -18,12 +18,6 @@
 
 @TOP@
 
-/* define this to the location of xpm.h to be used with #include,
-  e.g. <xpm.h> */
-#undef XPM_H_LOCATION
-
-#undef HAVE_LIBSM
-
 /* Define as 1 if the MKSTEMP function is declared */
 #undef HAVE_DECL_MKSTEMP
 
@@ -50,17 +44,6 @@
 #define memmove(a, b, c)  bcopy(b, a, c)
 #endif
 
-#ifndef HAVE_STRERROR
-#if defined (__cplusplus)
-extern "C"
-#endif
-char * strerror(int n);
-#endif
-
-#ifdef BROKEN_HEADERS
-#include "broken_headers.h"
-#endif
-
 #ifdef HAVE_MKSTEMP
 #ifndef HAVE_DECL_MKSTEMP
 #if defined (__cplusplus)

config/ChangeLog

@@ -1,3 +1,10 @@
+2002-07-17  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* lyxinclude.m4 (LYX_SCO):
+	(LYX_HPUX):
+	(LYX_SUNOS4): remove macros
+	(LYX_PATH_XPM): add description of XPM_H_LOCATION here
+
 2002-07-10  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
 
 	* lyxinclude.m4 (LYX_PROG_CXX): add -Wno-non-template-friend for

config/lyxinclude.m4

@@ -512,7 +512,8 @@ AC_CHECK_HEADER(X11/xpm.h,[
   lyx_cv_xpm_h_location="<X11/xpm.h>"],[
 AC_CHECK_HEADER(xpm.h,[],[
 LYX_LIB_ERROR(xpm.h,Xpm)])])
-AC_DEFINE_UNQUOTED(XPM_H_LOCATION,$lyx_cv_xpm_h_location)
+AC_DEFINE_UNQUOTED(XPM_H_LOCATION,$lyx_cv_xpm_h_location,
+  [define this to the location of xpm.h to be used with #include, e.g. <xpm.h>])
 
 ### Test for the header version
 if test $ac_cv_header_xpm_h = yes; then
@@ -550,53 +551,6 @@ changequote([,])
 fi])
 
 
-dnl Usage: LYX_HPUX  Checks for HP-UX and update CXXFLAGS accordingly
-AC_DEFUN(LYX_HPUX,
-[#It seems that HPUX requires using -fpcc-struct-return with gcc.
-AC_CACHE_CHECK(for HP-UX,ac_cv_hpux,[
-os=`uname -s | tr '[A-Z]' '[a-z]'`
-ac_cv_hpux=no
-test "$os" = hp-ux && ac_cv_hpux=yes])
-if test "$ac_cv_hpux" = yes; then
- test "x$GXX" = xyes && CXXFLAGS="$CXXFLAGS -fpcc-struct-return"
-fi])
-
-
-dnl Usage: LYX_SUNOS4 Checks for SunOS 4.x and sets the flag lyx_broken_headers
-dnl   if necessary
-AC_DEFUN(LYX_SUNOS4,
-[#The headers are not correct under SunOS4
-AC_CACHE_CHECK(for SunOS 4.x,ac_cv_sunos4,[
-changequote(, ) dnl
-os=`uname -a | sed -e 's/^\([^ ]*\) [^ ]* \([0-9]\)\..*/\1\2/'`
-changequote([, ]) dnl
-ac_cv_sunos4=no
-test "$os" = SunOS4 && ac_cv_sunos4=yes])
-if test "$ac_cv_sunos4" = yes; then
- test "x$GXX" = xyes && lyx_broken_headers=yes
-fi])
-
-
-dnl Usage: LYX_SCO Checks for SCO and sets the flag lyx_broken_headers
-dnl   if necessary
-AC_DEFUN(LYX_SCO,
-[AC_CACHE_CHECK(for SCO 3.2v4,ac_cv_sco,[
-ac_cv_sco=no
-if test `uname -s` != "SCO_SV"; then
-  lyx_machine_rel=`uname -m`:`uname -r`
-  if test $lyx_machine_rel = i386:3.2 || test $lyx_machine_rel = i486:3.2;
-  then
-    if test -f /usr/options/cb.name; then
-      ac_cv_sco=no
-    elif /bin/uname -X 2>/dev/null >/dev/null ; then
-      ac_cv_sco=yes
-    fi
-  fi
-fi])
-if test "$ac_cv_sco" = yes; then
- test "x$GXX" = xyes && lyx_broken_headers=yes
-fi])
-
 dnl Usage: LYX_FUNC_PUTENV_ARGTYPE
 dnl Checks whether putenv() takes 'char const *' or 'char *' as
 dnl argument. This is needed because Solaris 7 (wrongly?) uses 'char *',

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
@@ -207,17 +204,6 @@ 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
@@ -254,9 +240,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
@@ -266,15 +249,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)
@@ -286,8 +260,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
@@ -315,7 +287,7 @@ Configuration\n\
 ${FRONTEND_INFO}\
   LyX binary dir:                 ${real_bindir}\n\
   LyX files dir:                  ${real_datadir}\n
-`
+EOF`
 
 AC_SUBST(VERSION_INFO)
 

po/POTFILES.in

@@ -53,7 +53,6 @@ src/frontends/qt2/QLog.C
 src/frontends/qt2/QLyXKeySym.C
 src/frontends/qt2/QMinipage.C
 src/frontends/qt2/QParagraph.C
-src/frontends/qt2/QParagraphDialog.C
 src/frontends/qt2/QPreamble.C
 src/frontends/qt2/QPreambleDialog.C
 src/frontends/qt2/QPrint.C

src/graphics/ChangeLog

@@ -1,3 +1,7 @@
+2002-07-17  Jean-Marc Lasgouttes  <lasgouttes@freesurf.fr>
+
+	* Makefile.am: remove FileMonitor.[Ch]
+
 2002-06-17  Herbert Voss  <voss@lyx.org>
 
 	* GraphicsCachItem.C (findTargetFormat): remove the speciell case

src/graphics/Makefile.am

@@ -11,8 +11,6 @@ GRAPHICSIMAGEXPM = GraphicsImageXPM.C GraphicsImageXPM.h
 endif
 
 libgraphics_la_SOURCES = \
-	FileMonitor.h \
-	FileMonitor.C \
 	GraphicsCache.h \
 	GraphicsCache.C \
 	GraphicsCacheItem.h \