This patch does this.
Ok?
? src/frontends/xforms/lyx_forms.h
? src/frontends/xforms/lyx_xpm.h
Index: .cvsignore
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/.cvsignore,v
retrieving revision 1.8
diff -u -p -r1.8 .cvsignore
--- .cvsignore 8 Aug 2002 09:07:11 -0000 1.8
+++ .cvsignore 26 Jul 2003 23:28:33 -0000
@@ -1,7 +1,4 @@
-acconfig.h
autom4te-2.53.cache
-configure.ac
-configure.in
config.cache
config.log
config.status
Index: autogen.sh
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/autogen.sh,v
retrieving revision 1.47
diff -u -p -r1.47 autogen.sh
--- autogen.sh 14 Apr 2003 16:45:41 -0000 1.47
+++ autogen.sh 26 Jul 2003 23:28:33 -0000
@@ -11,25 +11,12 @@ autoversion=`$AUTOCONF --version | head
echo "Using $autoversion"
case $autoversion in
- *2.13)
- cp config/acconfig.h .
- cp config/configure.in .
- rm -f configure.ac
- cp config/relyx_configure.in lib/reLyX/configure.in
- rm -f lib/reLyX/configure.ac
- EXTRA_ACINCLUDE_FILES="lyxinclude213.m4"
- ;;
*2.5[23467])
- rm -f acconfig.h
- rm -f configure.in
- cp config/configure.ac .
- rm -f lib/reLyX/configure.in
- cp config/relyx_configure.ac lib/reLyX/configure.ac
EXTRA_ACINCLUDE_FILES="lyxinclude25x.m4"
;;
*)
echo "This autoconf version is not supported by LyX."
- echo "LyX only supports autoconf 2.13 and 2.5[23467]."
+ echo "LyX only supports autoconf 2.5[23467]."
exit
;;
esac
Index: configure.ac
===================================================================
RCS file: configure.ac
diff -N configure.ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ configure.ac 26 Jul 2003 23:28:33 -0000
@@ -0,0 +1,400 @@
+dnl Process with autoconf to generate configure script -*- sh -*-
+
+AC_INIT(lyx,1.4.0cvs,[EMAIL PROTECTED])
+AC_PREREQ(2.52)
+AC_CONFIG_SRCDIR(src/main.C)
+AM_CONFIG_HEADER([src/config.h])
+
+AC_CONFIG_AUX_DIR(config)
+
+PACKAGE=lyx${program_suffix}
+VERSION="1.4.0cvs"
+LYX_CHECK_VERSION
+
+AM_MAINTAINER_MODE
+AC_CANONICAL_TARGET
+
+LYX_VERSION_SUFFIX
+
+AM_INIT_AUTOMAKE($lyxname, $VERSION)
+
+# The list of languages known to LyX
+# This is needed by GNU gettext
+ALL_LINGUAS="bg ca cs da de es eu fi fr he hu it nl nn no pl pt ro ru sk sl sv tr wa"
+
+# fix the value of the prefixes.
+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 lib/configure ; do
+ chmod 755 ${srcdir}/${file}
+done
+
+### Check for programs
+AC_PROG_MAKE_SET
+AC_PROG_INSTALL
+#AC_PROG_RANLIB
+AC_CHECK_PROG(KPSEWHICH, kpsewhich, kpsewhich, :)
+if test "x$KPSEWHICH" = xkpsewhich ; then
+ AC_DEFINE(HAVE_KPSEWHICH, 1,
+ [Define this if you have the kpsewhich program working on your system.])
+fi
+AC_CHECK_PROGS(M4, gm4 gnum4 m4, m4)
+
+# 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
+
+### check for special systems
+AC_ISC_POSIX
+AC_AIX
+
+### check which frontend we want to use
+LYX_USE_FRONTEND
+
+### Check for a C++ compiler
+LYX_PROG_CXX
+### Some checks on what the C++ compiler can(not) do
+AC_LANG(C++)
+dnl we do not need that currently (and probably all our supported
+dnl compiler allow that)
+dnl LYX_CXX_PARTIAL
+LYX_CXX_EXPLICIT
+LYX_CXX_STL_STRING
+LYX_CXX_GOOD_STD_STRING
+LYX_CXX_CHEADERS
+LYX_CXX_GLOBAL_CSTD
+LYX_STD_COUNT
+dnl we disable rtti for now
+dnl LYX_CXX_RTTI
+AC_CHECK_HEADERS(ostream istream sstream locale limits ios)
+LYX_CXX_STL_MODERN_STREAMS
+
+### and now some special lyx flags.
+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
+
+### 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)
+
+### 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))
+test ! x"$lyx_ldflags" = x && LDFLAGS="$lyx_ldflags $LDFLAGS"
+
+### Add extra directories to check for include files.
+LYX_WITH_DIR([extra-inc],[extra include directory],extra_inc, NONE)
+LYX_LOOP_DIR($lyx_cv_extra_inc,LYX_ADD_INC_DIR(lyx_cppflags,$dir))
+test ! x"$lyx_cppflags" = x && CPPFLAGS="$lyx_cppflags $CPPFLAGS"
+
+### Add both includes and libraries
+LYX_WITH_DIR([extra-prefix],[extra lib+include directory],extra_prefix, NONE, ${prefix})
+LYX_LOOP_DIR($lyx_cv_extra_prefix,[
+LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
+ LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)])
+
+AC_ARG_WITH(aiksaurus,
+ [ --without-aiksaurus do not use the Aiksaurus library],
+ [lyx_use_aiksaurus=$withval])
+if test x$lyx_use_aiksaurus != xno; then
+AC_CHECK_LIB(Aiksaurus, main,
+ [AC_DEFINE(HAVE_LIBAIKSAURUS,1,[Define this if you have the AikSaurus library])
+ AIKSAURUS_LIBS="-lAiksaurus -lbz2"
+ ],,"-lbz2")
+AC_CHECK_HEADER(Aiksaurus.h,[
+ ac_cv_header_aiksaurus_h=yes
+ lyx_cv_aiksaurus_h_location="<Aiksaurus.h>"])
+AC_CHECK_HEADER(Aiksaurus/Aiksaurus.h,[
+ ac_cv_header_aiksaurus_h=yes
+ lyx_cv_aiksaurus_h_location="<Aiksaurus/Aiksaurus.h>"])
+AC_DEFINE_UNQUOTED(AIKSAURUS_H_LOCATION,$lyx_cv_aiksaurus_h_location,[Location of Aiksaurus.h])
+fi
+AC_SUBST(AIKSAURUS_LIBS)
+
+LYX_USE_INCLUDED_BOOST
+
+### Setup libtool
+AC_DISABLE_SHARED
+AC_LIBTOOL_WIN32_DLL
+#AM_PROG_LIBTOOL
+LYX_PROG_LIBTOOL
+
+### Check if we want spell libraries, prefer new aspell
+CHECK_WITH_ASPELL
+if test "$USING_ASPELL" != "yes"; then
+ CHECK_WITH_PSPELL
+fi
+
+### Check for some Cygwin-specific details.
+CHECK_WITH_CYGWIN
+
+### Check for X libraries
+AC_PATH_XTRA
+case $have_x in
+ yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
+ CPPFLAGS="$CPPFLAGS $X_CFLAGS";;
+ no) 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
+ the development tools.]);;
+ disable) ;;
+esac
+
+### check which frontend we want to use
+
+# XForms tests
+LYX_PATH_XPM
+LYX_PATH_XFORMS
+LYX_CHECK_XFORMS_IMAGE_LOADER
+# QT tests
+QT_DO_IT_ALL
+
+#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
+ xforms)
+ FRONTEND="xforms"
+ RPM_FRONTEND="xforms"
+ RPM_FRONTEND_DEPS='libforms >= 1.0'
+ FRONTEND_GUILIB="frontends/xforms/libxforms.la"
+ FRONTEND_INFO=" libXpm version: ${XPM_VERSION}\n\
+ libforms version: ${XFORMS_VERSION}\n"
+ ;;
+dnl gnome)
+dnl LYX_PATH_XPM
+dnl LYX_PATH_XFORMS
+dnl LYX_CHECK_XFORMS_IMAGE_LOADER
+dnl PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
+dnl AC_SUBST(GNOME_FRONTEND_CFLAGS)
+dnl AC_SUBST(GNOME_FRONTEND_LIBS)
+
+dnl FRONTEND="xforms gnome"
+dnl FRONTEND_GUILIB="gnome/*.lo"
+dnl FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
+dnl FRONTEND_INCLUDES="${GNOME_FRONTEND_CFLAGS}"
+dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
+dnl ;;
+ qt)
+ RPM_FRONTEND="qt"
+ RPM_FRONTEND_DEPS='qt >= 2.2.1'
+ FRONTEND="qt2"
+ FRONTEND_GUILIB="frontends/qt2/libqt2.la"
+ FRONTEND_INCLUDES="\$(QT_INCLUDES)"
+ FRONTEND_INFO=" Qt version: ${QT_VERSION}\n"
+ ;;
+ *)
+ LYX_ERROR(Unknown frontend $lyx_use_frontend);;
+esac
+
+### Setup GNU gettext
+dnl GNU gettext is written in C
+AC_LANG_PUSH(C)
+# Some tests that may be useful for gettext
+AC_C_CONST
+AC_C_INLINE
+# Do the real setup now
+AM_GNU_GETTEXT
+# a hack for those who try to change LyX, but do not have gettext installed
+case "${XGETTEXT}" in
+ *:) XGETTEXT='cp ${srcdir}/lyx.pot ./${PACKAGE}.po ; :'
+esac
+
+AC_SUBST(LINGUAS)
+
+AC_LANG_POP(C)
+
+# some standard header files
+AC_HEADER_DIRENT
+AC_HEADER_MAJOR
+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
+
+# some standard types
+AC_TYPE_MODE_T
+AC_TYPE_OFF_T
+AC_TYPE_PID_T
+AC_TYPE_SIGNAL
+AC_TYPE_SIZE_T
+AC_TYPE_UID_T
+
+AC_CHECK_FUNCS(snprintf vsnprintf strerror)
+LYX_CHECK_DECL(snprintf, stdio.h)
+LYX_CHECK_DECL(vsnprintf, stdio.h)
+LYX_CHECK_DECL(istreambuf_iterator, iterator)
+LYX_CHECK_DECL(mkstemp,[unistd.h stdlib.h])
+
+dnl This is a slight hack: the tests generated by autoconf 2.52 do not
+dnl work correctly because of some conflict with stdlib.h with g++ 2.96
+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_PUSH(C)
+AC_CHECK_FUNCS(memmove memset strchr mkfifo mkstemp mktemp)
+AC_LANG_POP(C)
+
+AC_FUNC_SELECT_ARGTYPES
+
+### Some information on what just happened
+real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
+real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
+VERSION_INFO="Configuration\n\
+ Host type: ${host}\n\
+ Special build flags: ${lyx_flags}\n\
+ C Compiler: ${CC}\n\
+ C Compiler flags: ${CFLAGS}\n\
+ C++ Compiler: ${CXX} ${CXX_VERSION}\n\
+ C++ Compiler flags: ${CXXFLAGS}\n\
+ Linker flags: ${LDFLAGS}\n\
+ Frontend: ${lyx_use_frontend}\n\
+${FRONTEND_INFO}\
+ LyX binary dir: ${real_bindir}\n\
+ LyX files dir: ${real_datadir}\n"
+
+
+AC_SUBST(VERSION_INFO)
+AC_SUBST(RPM_FRONTEND)
+AC_SUBST(RPM_FRONTEND_DEPS)
+
+## Some config.h stuff
+
+AH_TOP([
+/* -*- C++ -*- */
+/* This is the compilation configuration file for LyX. It was generated by
+ autoconfs configure. You might want to change some of the defaults if
+ something goes wrong during the compilation
+
+ * This file is part of
+ * ======================================================
+ *
+ * LyX, the High Level Word Processor
+ *
+ * Copyright 1995 Matthias Ettrich
+ * Copyright 1995-2001 The LyX Team.
+ *
+ *======================================================*/
+
+#ifndef _CONFIG_H
+#define _CONFIG_H
+])
+
+AH_BOTTOM([
+/************************************************************
+ ** You should not need to change anything beyond this point */
+
+#ifndef HAVE_STRCHR
+# define strchr(a,b) index(a,b)
+#endif
+
+#ifndef HAVE_MEMMOVE
+# 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)
+extern "C"
+#endif
+int mkstemp(char*);
+#endif
+#endif
+
+#ifdef __EMX__
+#include "support/os2_defines.h"
+#endif
+
+#if defined(__CYGWIN__) || defined(__CYGWIN32__)
+#include "support/nt_defines.h"
+#endif
+
+#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
+#define USE_BOOST_FORMAT 1
+#else
+#define USE_BOOST_FORMAT 0
+#endif
+
+#define BOOST_DISABLE_THREADS 1
+#define BOOST_NO_EXCEPTIONS 1
+#define BOOST_NO_WREGEX 1
+#define BOOST_NO_WSTRING 1
+
+#endif
+])
+
+### Finish the work.
+AC_CONFIG_SUBDIRS(lib lib/reLyX)
+AC_CONFIG_FILES([Makefile \
+ boost/Makefile \
+ boost/libs/Makefile \
+ boost/libs/regex/Makefile \
+ boost/libs/regex/src/Makefile \
+ boost/libs/signals/Makefile \
+ boost/libs/signals/src/Makefile \
+ config/Makefile \
+ development/Makefile \
+ development/lyx.spec \
+ lib/Makefile \
+ intl/Makefile \
+ po/Makefile.in \
+ sourcedoc/Doxyfile \
+ sourcedoc/Makefile \
+ src/Makefile \
+ src/version.C \
+ src/tex2lyx/Makefile \
+ src/mathed/Makefile \
+ src/graphics/Makefile \
+ src/insets/Makefile \
+ src/support/Makefile \
+ src/frontends/Makefile \
+ src/frontends/controllers/Makefile \
+ src/frontends/xforms/Makefile \
+ src/frontends/xforms/lyx_forms.h \
+ src/frontends/xforms/lyx_xpm.h \
+ src/frontends/xforms/forms/Makefile \
+ src/frontends/qt2/Makefile \
+ src/frontends/qt2/moc/Makefile \
+ src/frontends/qt2/ui/Makefile \
+ src/frontends/qt2/ui/moc/Makefile \
+ src/frontends/gnome/Makefile \
+])
+
+AC_OUTPUT
+# show version information
+echo
+printf "$VERSION_INFO"
+echo
+
+# Display a final warning if there has been a LYX_ERROR
+LYX_CHECK_ERRORS
Index: config/configure.ac
===================================================================
RCS file: config/configure.ac
diff -N config/configure.ac
--- config/configure.ac 25 Jul 2003 21:34:43 -0000 1.45
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,400 +0,0 @@
-dnl Process with autoconf to generate configure script -*- sh -*-
-
-AC_INIT(lyx,1.4.0cvs,[EMAIL PROTECTED])
-AC_PREREQ(2.52)
-AC_CONFIG_SRCDIR(src/main.C)
-AM_CONFIG_HEADER([src/config.h])
-
-AC_CONFIG_AUX_DIR(config)
-
-PACKAGE=lyx${program_suffix}
-VERSION="1.4.0cvs"
-LYX_CHECK_VERSION
-
-AM_MAINTAINER_MODE
-AC_CANONICAL_TARGET
-
-LYX_VERSION_SUFFIX
-
-AM_INIT_AUTOMAKE($lyxname, $VERSION)
-
-# The list of languages known to LyX
-# This is needed by GNU gettext
-ALL_LINGUAS="bg ca cs da de es eu fi fr he hu it nl nn no pl pt ro ru sk sl sv tr wa"
-
-# fix the value of the prefixes.
-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 lib/configure ; do
- chmod 755 ${srcdir}/${file}
-done
-
-### Check for programs
-AC_PROG_MAKE_SET
-AC_PROG_INSTALL
-#AC_PROG_RANLIB
-AC_CHECK_PROG(KPSEWHICH, kpsewhich, kpsewhich, :)
-if test "x$KPSEWHICH" = xkpsewhich ; then
- AC_DEFINE(HAVE_KPSEWHICH, 1,
- [Define this if you have the kpsewhich program working on your system.])
-fi
-AC_CHECK_PROGS(M4, gm4 gnum4 m4, m4)
-
-# 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
-
-### check for special systems
-AC_ISC_POSIX
-AC_AIX
-
-### check which frontend we want to use
-LYX_USE_FRONTEND
-
-### Check for a C++ compiler
-LYX_PROG_CXX
-### Some checks on what the C++ compiler can(not) do
-AC_LANG(C++)
-dnl we do not need that currently (and probably all our supported
-dnl compiler allow that)
-dnl LYX_CXX_PARTIAL
-LYX_CXX_EXPLICIT
-LYX_CXX_STL_STRING
-LYX_CXX_GOOD_STD_STRING
-LYX_CXX_CHEADERS
-LYX_CXX_GLOBAL_CSTD
-LYX_STD_COUNT
-dnl we disable rtti for now
-dnl LYX_CXX_RTTI
-AC_CHECK_HEADERS(ostream istream sstream locale limits ios)
-LYX_CXX_STL_MODERN_STREAMS
-
-### and now some special lyx flags.
-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
-
-### 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)
-
-### 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))
-test ! x"$lyx_ldflags" = x && LDFLAGS="$lyx_ldflags $LDFLAGS"
-
-### Add extra directories to check for include files.
-LYX_WITH_DIR([extra-inc],[extra include directory],extra_inc, NONE)
-LYX_LOOP_DIR($lyx_cv_extra_inc,LYX_ADD_INC_DIR(lyx_cppflags,$dir))
-test ! x"$lyx_cppflags" = x && CPPFLAGS="$lyx_cppflags $CPPFLAGS"
-
-### Add both includes and libraries
-LYX_WITH_DIR([extra-prefix],[extra lib+include directory],extra_prefix, NONE, ${prefix})
-LYX_LOOP_DIR($lyx_cv_extra_prefix,[
-LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
- LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)])
-
-AC_ARG_WITH(aiksaurus,
- [ --without-aiksaurus do not use the Aiksaurus library],
- [lyx_use_aiksaurus=$withval])
-if test x$lyx_use_aiksaurus != xno; then
-AC_CHECK_LIB(Aiksaurus, main,
- [AC_DEFINE(HAVE_LIBAIKSAURUS,1,[Define this if you have the AikSaurus library])
- AIKSAURUS_LIBS="-lAiksaurus -lbz2"
- ],,"-lbz2")
-AC_CHECK_HEADER(Aiksaurus.h,[
- ac_cv_header_aiksaurus_h=yes
- lyx_cv_aiksaurus_h_location="<Aiksaurus.h>"])
-AC_CHECK_HEADER(Aiksaurus/Aiksaurus.h,[
- ac_cv_header_aiksaurus_h=yes
- lyx_cv_aiksaurus_h_location="<Aiksaurus/Aiksaurus.h>"])
-AC_DEFINE_UNQUOTED(AIKSAURUS_H_LOCATION,$lyx_cv_aiksaurus_h_location,[Location of Aiksaurus.h])
-fi
-AC_SUBST(AIKSAURUS_LIBS)
-
-LYX_USE_INCLUDED_BOOST
-
-### Setup libtool
-AC_DISABLE_SHARED
-AC_LIBTOOL_WIN32_DLL
-#AM_PROG_LIBTOOL
-LYX_PROG_LIBTOOL
-
-### Check if we want spell libraries, prefer new aspell
-CHECK_WITH_ASPELL
-if test "$USING_ASPELL" != "yes"; then
- CHECK_WITH_PSPELL
-fi
-
-### Check for some Cygwin-specific details.
-CHECK_WITH_CYGWIN
-
-### Check for X libraries
-AC_PATH_XTRA
-case $have_x in
- yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
- CPPFLAGS="$CPPFLAGS $X_CFLAGS";;
- no) 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
- the development tools.]);;
- disable) ;;
-esac
-
-### check which frontend we want to use
-
-# XForms tests
-LYX_PATH_XPM
-LYX_PATH_XFORMS
-LYX_CHECK_XFORMS_IMAGE_LOADER
-# QT tests
-QT_DO_IT_ALL
-
-#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
- xforms)
- FRONTEND="xforms"
- RPM_FRONTEND="xforms"
- RPM_FRONTEND_DEPS='libforms >= 1.0'
- FRONTEND_GUILIB="frontends/xforms/libxforms.la"
- FRONTEND_INFO=" libXpm version: ${XPM_VERSION}\n\
- libforms version: ${XFORMS_VERSION}\n"
- ;;
-dnl gnome)
-dnl LYX_PATH_XPM
-dnl LYX_PATH_XFORMS
-dnl LYX_CHECK_XFORMS_IMAGE_LOADER
-dnl PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
-dnl AC_SUBST(GNOME_FRONTEND_CFLAGS)
-dnl AC_SUBST(GNOME_FRONTEND_LIBS)
-
-dnl FRONTEND="xforms gnome"
-dnl FRONTEND_GUILIB="gnome/*.lo"
-dnl FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
-dnl FRONTEND_INCLUDES="${GNOME_FRONTEND_CFLAGS}"
-dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}"
-dnl ;;
- qt)
- RPM_FRONTEND="qt"
- RPM_FRONTEND_DEPS='qt >= 2.2.1'
- FRONTEND="qt2"
- FRONTEND_GUILIB="frontends/qt2/libqt2.la"
- FRONTEND_INCLUDES="\$(QT_INCLUDES)"
- FRONTEND_INFO=" Qt version: ${QT_VERSION}\n"
- ;;
- *)
- LYX_ERROR(Unknown frontend $lyx_use_frontend);;
-esac
-
-### Setup GNU gettext
-dnl GNU gettext is written in C
-AC_LANG_PUSH(C)
-# Some tests that may be useful for gettext
-AC_C_CONST
-AC_C_INLINE
-# Do the real setup now
-AM_GNU_GETTEXT
-# a hack for those who try to change LyX, but do not have gettext installed
-case "${XGETTEXT}" in
- *:) XGETTEXT='cp ${srcdir}/lyx.pot ./${PACKAGE}.po ; :'
-esac
-
-AC_SUBST(LINGUAS)
-
-AC_LANG_POP(C)
-
-# some standard header files
-AC_HEADER_DIRENT
-AC_HEADER_MAJOR
-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
-
-# some standard types
-AC_TYPE_MODE_T
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_SIGNAL
-AC_TYPE_SIZE_T
-AC_TYPE_UID_T
-
-AC_CHECK_FUNCS(snprintf vsnprintf strerror)
-LYX_CHECK_DECL(snprintf, stdio.h)
-LYX_CHECK_DECL(vsnprintf, stdio.h)
-LYX_CHECK_DECL(istreambuf_iterator, iterator)
-LYX_CHECK_DECL(mkstemp,[unistd.h stdlib.h])
-
-dnl This is a slight hack: the tests generated by autoconf 2.52 do not
-dnl work correctly because of some conflict with stdlib.h with g++ 2.96
-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_PUSH(C)
-AC_CHECK_FUNCS(memmove memset strchr mkfifo mkstemp mktemp)
-AC_LANG_POP(C)
-
-AC_FUNC_SELECT_ARGTYPES
-
-### Some information on what just happened
-real_bindir=`eval "echo \`eval \"echo ${bindir}\"\`"`
-real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
-VERSION_INFO="Configuration\n\
- Host type: ${host}\n\
- Special build flags: ${lyx_flags}\n\
- C Compiler: ${CC}\n\
- C Compiler flags: ${CFLAGS}\n\
- C++ Compiler: ${CXX} ${CXX_VERSION}\n\
- C++ Compiler flags: ${CXXFLAGS}\n\
- Linker flags: ${LDFLAGS}\n\
- Frontend: ${lyx_use_frontend}\n\
-${FRONTEND_INFO}\
- LyX binary dir: ${real_bindir}\n\
- LyX files dir: ${real_datadir}\n"
-
-
-AC_SUBST(VERSION_INFO)
-AC_SUBST(RPM_FRONTEND)
-AC_SUBST(RPM_FRONTEND_DEPS)
-
-## Some config.h stuff
-
-AH_TOP([
-/* -*- C++ -*- */
-/* This is the compilation configuration file for LyX. It was generated by
- autoconfs configure. You might want to change some of the defaults if
- something goes wrong during the compilation
-
- * This file is part of
- * ======================================================
- *
- * LyX, the High Level Word Processor
- *
- * Copyright 1995 Matthias Ettrich
- * Copyright 1995-2001 The LyX Team.
- *
- *======================================================*/
-
-#ifndef _CONFIG_H
-#define _CONFIG_H
-])
-
-AH_BOTTOM([
-/************************************************************
- ** You should not need to change anything beyond this point */
-
-#ifndef HAVE_STRCHR
-# define strchr(a,b) index(a,b)
-#endif
-
-#ifndef HAVE_MEMMOVE
-# 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)
-extern "C"
-#endif
-int mkstemp(char*);
-#endif
-#endif
-
-#ifdef __EMX__
-#include "support/os2_defines.h"
-#endif
-
-#if defined(__CYGWIN__) || defined(__CYGWIN32__)
-#include "support/nt_defines.h"
-#endif
-
-#if defined(HAVE_OSTREAM) && defined(HAVE_LOCALE) && defined(HAVE_SSTREAM)
-#define USE_BOOST_FORMAT 1
-#else
-#define USE_BOOST_FORMAT 0
-#endif
-
-#define BOOST_DISABLE_THREADS 1
-#define BOOST_NO_EXCEPTIONS 1
-#define BOOST_NO_WREGEX 1
-#define BOOST_NO_WSTRING 1
-
-#endif
-])
-
-### Finish the work.
-AC_CONFIG_SUBDIRS(lib lib/reLyX)
-AC_CONFIG_FILES([Makefile \
- boost/Makefile \
- boost/libs/Makefile \
- boost/libs/regex/Makefile \
- boost/libs/regex/src/Makefile \
- boost/libs/signals/Makefile \
- boost/libs/signals/src/Makefile \
- config/Makefile \
- development/Makefile \
- development/lyx.spec \
- lib/Makefile \
- intl/Makefile \
- po/Makefile.in \
- sourcedoc/Doxyfile \
- sourcedoc/Makefile \
- src/Makefile \
- src/version.C \
- src/tex2lyx/Makefile \
- src/mathed/Makefile \
- src/graphics/Makefile \
- src/insets/Makefile \
- src/support/Makefile \
- src/frontends/Makefile \
- src/frontends/controllers/Makefile \
- src/frontends/xforms/Makefile \
- src/frontends/xforms/lyx_forms.h \
- src/frontends/xforms/lyx_xpm.h \
- src/frontends/xforms/forms/Makefile \
- src/frontends/qt2/Makefile \
- src/frontends/qt2/moc/Makefile \
- src/frontends/qt2/ui/Makefile \
- src/frontends/qt2/ui/moc/Makefile \
- src/frontends/gnome/Makefile \
-])
-
-AC_OUTPUT
-# show version information
-echo
-printf "$VERSION_INFO"
-echo
-
-# Display a final warning if there has been a LYX_ERROR
-LYX_CHECK_ERRORS
Index: config/configure.in
===================================================================
RCS file: config/configure.in
diff -N config/configure.in
--- config/configure.in 25 Jul 2003 21:34:43 -0000 1.35
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,328 +0,0 @@
-dnl Process with autoconf to generate configure script -*- sh -*-
-
-AC_INIT(src/main.C)
-AC_PREREQ(2.13) dnl We want to use autoconf 2.13
-AM_CONFIG_HEADER(src/config.h)
-dnl This is a trick to make autoheader do the right thing
-dnl AM_CONFIG_HEADER(src/config.h)
-AC_CONFIG_AUX_DIR(config)
-
-PACKAGE=lyx${program_suffix}
-VERSION="1.4.0cvs"
-LYX_CHECK_VERSION
-
-AM_MAINTAINER_MODE
-AC_CANONICAL_SYSTEM
-
-LYX_VERSION_SUFFIX
-
-AM_INIT_AUTOMAKE($lyxname, $VERSION)
-
-# The list of languages known to LyX
-# This is needed by GNU gettext
-ALL_LINGUAS="bg ca cs da de es eu fi fr he hu it nl nn no pl pt ro ru sk sl sv tr wa"
-
-# fix the value of the prefixes.
-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 lib/configure ; do
- chmod 755 ${srcdir}/${file}
-done
-
-### Check for programs
-AC_PROG_MAKE_SET
-AC_PROG_INSTALL
-#AC_PROG_RANLIB
-AC_CHECK_PROG(KPSEWHICH, kpsewhich, kpsewhich, :)
-if test "x$KPSEWHICH" = xkpsewhich ; then
- AC_DEFINE(HAVE_KPSEWHICH, 1,
- [Define this if you have the kpsewhich program working on your system.])
-fi
-AC_CHECK_PROGS(M4, gm4 gnum4 m4, m4)
-
-# 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
-
-### check for special systems
-AC_ISC_POSIX
-AC_AIX
-
-### Check for program extensions (.exe or nothing)
-AC_EXEEXT
-
-### check which frontend we want to use
-LYX_USE_FRONTEND
-
-### Check for a C++ compiler
-LYX_PROG_CXX
-### Some checks on what the C++ compiler can(not) do
-AC_LANG_CPLUSPLUS
-dnl we do not need that currently (and probably all our supported
-dnl compiler allow that)
-dnl LYX_CXX_PARTIAL
-LYX_CXX_EXPLICIT
-LYX_CXX_STL_STRING
-LYX_CXX_GOOD_STD_STRING
-LYX_CXX_CHEADERS
-LYX_CXX_GLOBAL_CSTD
-LYX_STD_COUNT
-dnl we disable rtti for now
-dnl LYX_CXX_RTTI
-AC_CHECK_HEADERS(ostream istream sstream locale limits)
-LYX_CXX_STL_MODERN_STREAMS
-
-### and now some special lyx flags.
-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
-
-### 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)
-
-### 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))
-test ! x"$lyx_ldflags" = x && LDFLAGS="$lyx_ldflags $LDFLAGS"
-
-### Add extra directories to check for include files.
-LYX_WITH_DIR([extra-inc],[extra include directory],extra_inc, NONE)
-LYX_LOOP_DIR($lyx_cv_extra_inc,LYX_ADD_INC_DIR(lyx_cppflags,$dir))
-test ! x"$lyx_cppflags" = x && CPPFLAGS="$lyx_cppflags $CPPFLAGS"
-
-### Add both includes and libraries
-LYX_WITH_DIR([extra-prefix],[extra lib+include directory],extra_prefix, NONE, ${prefix})
-LYX_LOOP_DIR($lyx_cv_extra_prefix,[
-LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
- LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)])
-
-AC_ARG_WITH(aiksaurus,
- [ --without-aiksaurus do not use the Aiksaurus library],
- [lyx_use_aiksaurus=$withval])
-if test x$lyx_use_aiksaurus != xno; then
-AC_CHECK_LIB(Aiksaurus, main,
- [AC_DEFINE(HAVE_LIBAIKSAURUS,,[Define this if you have the AikSaurus library])
- AIKSAURUS_LIBS="-lAiksaurus -lbz2"
- ],,"-lbz2")
-AC_CHECK_HEADER(Aiksaurus.h,[
- ac_cv_header_aiksaurus_h=yes
- lyx_cv_aiksaurus_h_location="<Aiksaurus.h>"])
-AC_CHECK_HEADER(Aiksaurus/Aiksaurus.h,[
- ac_cv_header_aiksaurus_h=yes
- lyx_cv_aiksaurus_h_location="<Aiksaurus/Aiksaurus.h>"])
-AC_DEFINE_UNQUOTED(AIKSAURUS_H_LOCATION,$lyx_cv_aiksaurus_h_location,[Location of Aiksaurus.h])
-fi
-AC_SUBST(AIKSAURUS_LIBS)
-
-### Setup libtool
-AC_DISABLE_SHARED
-AC_LIBTOOL_WIN32_DLL
-#AM_PROG_LIBTOOL
-LYX_PROG_LIBTOOL
-
-### Check if we want spell libraries, prefer new aspell
-CHECK_WITH_ASPELL
-if test "$USING_ASPELL" != "yes"; then
- CHECK_WITH_PSPELL
-fi
-
-### Check for some Cygwin-specific details.
-CHECK_WITH_CYGWIN
-
-### Check for X libraries
-AC_PATH_XTRA
-case $have_x in
- yes) LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS"
- CPPFLAGS="$CPPFLAGS $X_CFLAGS";;
- no) 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
- the development tools.]);;
- disable) ;;
-esac
-
-### 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
- xforms)
- LYX_PATH_XPM
- LYX_PATH_XFORMS
- LYX_CHECK_XFORMS_IMAGE_LOADER
- FRONTEND="xforms"
- RPM_FRONTEND="xforms"
- RPM_FRONTEND_DEPS='libforms >= 1.0'
- FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo"
- FRONTEND_LIBS="@XFORMS_IMAGE_LIB@ @XFORMS_LIB@ @XPM_LIB@"
- FRONTEND_INFO=" libXpm version: ${XPM_VERSION}\n\
- libforms version: ${XFORMS_VERSION}\n"
- ;;
-dnl gnome)
-dnl # Leaving these tests in means that they are performed twice for the
-dnl # xforms frontend. No, I don't understand why :-(
-dnl # Angus 16 Dec 2002.
-dnl # LYX_PATH_XPM
-dnl # LYX_PATH_XFORMS
-dnl # LYX_CHECK_XFORMS_IMAGE_LOADER
-dnl PKG_CHECK_MODULES(GNOME_FRONTEND, gtkmm-2.0 libglademm-2.0)
-dnl AC_SUBST(GNOME_FRONTEND_CFLAGS)
-dnl AC_SUBST(GNOME_FRONTEND_LIBS)
-
-dnl FRONTEND="xforms gnome"
-dnl FRONTEND_GUILIB="gnome/*.lo"
-dnl FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
-dnl FRONTEND_INCLUDES="${GNOME_FRONTEND_CFLAGS} "
-dnl FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}";;
- qt)
- QT_DO_IT_ALL
- RPM_FRONTEND="qt"
- RPM_FRONTEND_DEPS='qt >= 2.2.1'
- FRONTEND="qt2"
- FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
- FRONTEND_LDFLAGS='$(QT_LDFLAGS)'
- FRONTEND_INCLUDES='$(QT_INCLUDES)'
- FRONTEND_LIBS="\$(QT_LIB)"
- FRONTEND_INFO=" Qt version: ${QT_VERSION}\n"
- ;;
- *)
- LYX_ERROR(Unknown frontend $lyx_use_frontend);;
-esac
-
-### Setup GNU gettext
-dnl GNU gettext is written in C
-AC_LANG_C
-# Some tests that may be useful for gettext
-AC_C_CONST
-AC_C_INLINE
-# Do the real setup now
-AM_GNU_GETTEXT
-# a hack for those who try to change LyX, but do not have gettext installed
-case "${XGETTEXT}" in
- *:) XGETTEXT='cp ${srcdir}/lyx.pot ./${PACKAGE}.po ; :'
-esac
-
-AC_SUBST(LINGUAS)
-
-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 strings.h locale.h)
-
-# some standard structures
-AC_HEADER_STAT
-AC_HEADER_TIME
-
-# some standard types
-AC_TYPE_MODE_T
-AC_TYPE_OFF_T
-AC_TYPE_PID_T
-AC_TYPE_SIGNAL
-AC_TYPE_SIZE_T
-AC_TYPE_UID_T
-
-AC_CHECK_FUNCS(snprintf vsnprintf strerror)
-LYX_CHECK_DECL(snprintf, stdio.h)
-LYX_CHECK_DECL(vsnprintf, stdio.h)
-LYX_CHECK_DECL(istreambuf_iterator, iterator)
-
-dnl This is a slight hack: the tests generated by autoconf 2.52 do not
-dnl work correctly because of some conflict with stdlib.h with g++ 2.96
-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 mkfifo mkstemp mktemp)
-AC_LANG_CPLUSPLUS
-
-dnl Until this is fixed in autoconf we provide our own version
-LYX_FUNC_SELECT_ARGTYPES
-
-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="Configuration\n\
- Host type: ${host}\n\
- Special build flags: ${lyx_flags}\n\
- C Compiler: ${CC}\n\
- C Compiler flags: ${CFLAGS}\n\
- C++ Compiler: ${CXX} ${CXX_VERSION}\n\
- C++ Compiler flags: ${CXXFLAGS}\n\
- Linker flags: ${LDFLAGS}\n\
- Frontend: ${lyx_use_frontend}\n\
-${FRONTEND_INFO}\
- LyX binary dir: ${real_bindir}\n\
- LyX files dir: ${real_datadir}\n"
-
-
-AC_SUBST(VERSION_INFO)
-AC_SUBST(RPM_FRONTEND)
-AC_SUBST(RPM_FRONTEND_DEPS)
-
-### Finish the work.
-AC_CONFIG_SUBDIRS(lib lib/reLyX)
-AC_OUTPUT([Makefile \
- boost/Makefile \
- boost/libs/Makefile \
- boost/libs/regex/Makefile \
- boost/libs/regex/src/Makefile \
- boost/libs/signals/Makefile \
- boost/libs/signals/src/Makefile \
- config/Makefile \
- development/Makefile \
- development/lyx.spec \
- lib/Makefile \
- intl/Makefile \
- po/Makefile.in \
- sourcedoc/Doxyfile \
- sourcedoc/Makefile \
- src/Makefile \
- src/version.C \
- src/tex2lyx/Makefile \
- src/mathed/Makefile \
- src/graphics/Makefile \
- src/insets/Makefile \
- src/support/Makefile \
- src/frontends/Makefile \
- src/frontends/controllers/Makefile \
- src/frontends/xforms/Makefile \
- src/frontends/xforms/lyx_forms.h \
- src/frontends/xforms/lyx_xpm.h \
- src/frontends/xforms/forms/Makefile \
- src/frontends/qt2/Makefile \
- src/frontends/qt2/moc/Makefile \
- src/frontends/qt2/ui/Makefile \
- src/frontends/qt2/ui/moc/Makefile \
- src/frontends/gnome/Makefile \
-])
-
-# show version information
-echo
-printf "$VERSION_INFO"
-echo
-
-# Display a final warning if there has been a LYX_ERROR
-LYX_CHECK_ERRORS
Index: config/lyxinclude213.m4
===================================================================
RCS file: config/lyxinclude213.m4
diff -N config/lyxinclude213.m4
--- config/lyxinclude213.m4 7 May 2003 12:34:26 -0000 1.4
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,77 +0,0 @@
-dnl We use this until autoconf fixes its version.
-AC_DEFUN(LYX_FUNC_SELECT_ARGTYPES,
-[AC_MSG_CHECKING([types of arguments for select()])
- AC_CACHE_VAL(ac_cv_func_select_arg234,dnl
- [AC_CACHE_VAL(ac_cv_func_select_arg1,dnl
- [AC_CACHE_VAL(ac_cv_func_select_arg5,dnl
- [for ac_cv_func_select_arg234 in 'fd_set *' 'int *' 'void *'; do
- for ac_cv_func_select_arg1 in 'int' 'size_t' 'unsigned long' 'unsigned'; do for ac_cv_func_select_arg5 in 'struct timeval *' 'const struct timeval *'; do
- AC_TRY_COMPILE(dnl
-[#ifdef HAVE_SYS_TYPES_H
-#include <sys/types.h>
-#endif
-#ifdef HAVE_SYS_TIME_H
-#include <sys/time.h>
-#endif
-#ifdef HAVE_SYS_SELECT_H
-#include <sys/select.h>
-#endif
-#ifdef HAVE_SYS_SOCKET_H
-#include <sys/socket.h>
-#endif
-extern int select ($ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5);],,dnl
- [ac_not_found=no ; break 3],ac_not_found=yes)
- done
- done
- done
- ])dnl AC_CACHE_VAL
- ])dnl AC_CACHE_VAL
- ])dnl AC_CACHE_VAL
- if test "$ac_not_found" = yes; then
- ac_cv_func_select_arg1=int
- ac_cv_func_select_arg234='int *'
- ac_cv_func_select_arg5='struct timeval *'
- fi
- AC_MSG_RESULT([$ac_cv_func_select_arg1,$ac_cv_func_select_arg234,$ac_cv_func_select_arg5])
- AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG1,$ac_cv_func_select_arg1,
- [Define to the type of arg1 for select().])
- AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG234,($ac_cv_func_select_arg234),
- [Define to the type of args 2, 3 and 4 for select().])
- AC_DEFINE_UNQUOTED(SELECT_TYPE_ARG5,($ac_cv_func_select_arg5),
- [Define to the type of arg5 for select().])
-])
-
-dnl Check things are declared in headers to avoid errors or warnings.
-dnl Called like LYX_CHECK_DECL(function, headerfile)
-dnl Defines HAVE_DECL_{FUNCTION}
-AC_DEFUN(LYX_CHECK_DECL,
-[AC_MSG_CHECKING(if $1 is declared by header $2)
-tr_func=`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
-
-tr_hdr=`echo $2 | tr . _`
-AC_CACHE_VAL([lyx_cv_declare_${tr_hdr}_$1],
-[AC_EGREP_HEADER($1, $2, [eval "lyx_cv_declare_${tr_hdr}_$1=yes"], [eval "lyx_cv_declare_${tr_hdr}_$1=no"])])
-if eval "test \"\${lyx_cv_declare_${tr_hdr}_$1}\" = \"yes\""; then
- AC_DEFINE_UNQUOTED(HAVE_DECL_${tr_func},1,[dummy])
- AC_MSG_RESULT(yes)
-else
- AC_MSG_RESULT(no)
-fi])
-
-dnl This is the multiple headers version of the LYX_CHECK_DECL macro above.
-dnl Called like LYX_CHECK_DECL_HDRS(function, file1 file2 file3)
-AC_DEFUN(LYX_CHECK_DECL_HDRS,
-[ got="no"
-for I in $2; do
-tr_hdr=`echo $I | tr . _`
-if test "${got}" = "no"; then
- LYX_CHECK_DECL($1, $I)
-fi
-if eval "test \"\${lyx_cv_declare_${tr_hdr}_$1}\" = \"yes\""; then
- got="yes"
-fi
-done])
-
-dnl A terrible hack because the code from autoconf 2.5x does not work
-dnl here. It works for the uses in pspell.m4, so that's enough
-AC_DEFUN([AC_HELP_STRING],[ $1 $2])
Index: config/relyx_configure.ac
===================================================================
RCS file: config/relyx_configure.ac
diff -N config/relyx_configure.ac
--- config/relyx_configure.ac 27 May 2003 12:57:15 -0000 1.5
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,48 +0,0 @@
-dnl Process with autoconf to generate configure script -*- sh -*-
-AC_INIT
-AC_CONFIG_SRCDIR(reLyX.in)
-AC_PREREQ(2.52)
-AC_CONFIG_AUX_DIR(../../config)
-
-dnl PACKAGE=reLyX
-dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX
-
-AM_MAINTAINER_MODE
-
-AC_ARG_WITH(version-suffix,
- [ --with-version-suffix[=<version>] install lyx files as lyx<version>],
- [lyxname="lyx$withval"
- program_suffix=$withval],
- [lyxname=lyx])
-
-dnl must make a macro that gets the reLyX version
-VERSION=2.0
-AM_INIT_AUTOMAKE($lyxname, $VERSION)
-
-# if reLyX has already been generated in this directory, delete it first
-test -x reLyX && rm -f reLyX
-# fix the value of the prefixes.
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# we need to expand ${datadir} to put it into the reLyX wrapper.
-LYX_DIR=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
-AC_SUBST(LYX_DIR)
-
-# 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}'
-
-dnl Checks for programs.
-AC_PROG_INSTALL
-RELYX_CHECK_PERL
-
-dnl Finish the work
-AC_CONFIG_FILES([Makefile])
-AC_CONFIG_FILES([reLyX], [chmod 755 reLyX])
-AC_CONFIG_FILES([noweb2lyx], [chmod 755 noweb2lyx])
-AC_OUTPUT
-
-RELYX_CHECK_ERRORS
Index: config/relyx_configure.in
===================================================================
RCS file: config/relyx_configure.in
diff -N config/relyx_configure.in
--- config/relyx_configure.in 27 May 2003 12:57:15 -0000 1.2
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,45 +0,0 @@
-dnl Process with autoconf to generate configure script -*- sh -*-
-AC_INIT(reLyX.in)
-AC_PREREQ(2.13) dnl We want to use autoconf 2.13
-AC_CONFIG_AUX_DIR(../../config)
-AC_EXEEXT
-
-dnl PACKAGE=reLyX
-dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX
-
-AM_MAINTAINER_MODE
-
-AC_ARG_WITH(version-suffix,
- [ --with-version-suffix[=<version>] install lyx files as lyx<version>],
- [lyxname="lyx$withval"
- program_suffix=$withval],
- [lyxname=lyx])
-
-dnl must make a macro that gets the reLyX version
-VERSION=2.0
-AM_INIT_AUTOMAKE($lyxname, $VERSION)
-
-# if reLyX has already been generated in this directory, delete it first
-test -x reLyX && rm -f reLyX
-# fix the value of the prefixes.
-test "x$prefix" = xNONE && prefix=$ac_default_prefix
-test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
-
-# we need to expand ${datadir} to put it into the reLyX wrapper.
-LYX_DIR=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
-AC_SUBST(LYX_DIR)
-
-# 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}'
-
-dnl Checks for programs.
-AC_PROG_INSTALL
-RELYX_CHECK_PERL
-
-dnl Finish the work
-AC_OUTPUT(Makefile reLyX noweb2lyx, chmod 755 reLyX noweb2lyx)
-
-RELYX_CHECK_ERRORS
Index: lib/reLyX/.cvsignore
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/lib/reLyX/.cvsignore,v
retrieving revision 1.6
diff -u -p -r1.6 .cvsignore
--- lib/reLyX/.cvsignore 7 Aug 2002 22:45:38 -0000 1.6
+++ lib/reLyX/.cvsignore 26 Jul 2003 23:28:33 -0000
@@ -1,6 +1,4 @@
autom4te-2.53.cache
-configure.in
-configure.ac
reLyX
noweb2lyx
Makefile.in
@@ -10,7 +8,6 @@ configure
config.log
config.status
configure
-aclocal.m4
reLyX.1
autom4te.cache
configure.lineno
Index: lib/reLyX/configure.ac
===================================================================
RCS file: lib/reLyX/configure.ac
diff -N lib/reLyX/configure.ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ lib/reLyX/configure.ac 26 Jul 2003 23:28:33 -0000
@@ -0,0 +1,48 @@
+dnl Process with autoconf to generate configure script -*- sh -*-
+AC_INIT
+AC_CONFIG_SRCDIR(reLyX.in)
+AC_PREREQ(2.52)
+AC_CONFIG_AUX_DIR(../../config)
+
+dnl PACKAGE=reLyX
+dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX
+
+AM_MAINTAINER_MODE
+
+AC_ARG_WITH(version-suffix,
+ [ --with-version-suffix[=<version>] install lyx files as lyx<version>],
+ [lyxname="lyx$withval"
+ program_suffix=$withval],
+ [lyxname=lyx])
+
+dnl must make a macro that gets the reLyX version
+VERSION=2.0
+AM_INIT_AUTOMAKE($lyxname, $VERSION)
+
+# if reLyX has already been generated in this directory, delete it first
+test -x reLyX && rm -f reLyX
+# fix the value of the prefixes.
+test "x$prefix" = xNONE && prefix=$ac_default_prefix
+test "x$exec_prefix" = xNONE && exec_prefix='${prefix}'
+
+# we need to expand ${datadir} to put it into the reLyX wrapper.
+LYX_DIR=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
+AC_SUBST(LYX_DIR)
+
+# 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}'
+
+dnl Checks for programs.
+AC_PROG_INSTALL
+RELYX_CHECK_PERL
+
+dnl Finish the work
+AC_CONFIG_FILES([Makefile])
+AC_CONFIG_FILES([reLyX], [chmod 755 reLyX])
+AC_CONFIG_FILES([noweb2lyx], [chmod 755 noweb2lyx])
+AC_OUTPUT
+
+RELYX_CHECK_ERRORS
--
Lgb
