I just upgraded my system to use these and then I tried to build
lyx...
... close to _no_ problems...
Of course since we really want to convert to 2.53 fully some time in
the future I did some changes...
Attached is the patch that show what I did...
There are still some small problems... but nothing that hinders
building lyx.
? auto
? autom4te-2.53.cache
? build
? config.pre:config.h.in:config.post
? qtbuild
? test
? config/config.pre:config.h.in:config.post
? lib/reLyX/autom4te-2.53.cache
Index: acconfig.h
===================================================================
RCS file: acconfig.h
diff -N acconfig.h
--- acconfig.h 17 Jul 2002 21:14:03 -0000 1.26
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,96 +0,0 @@
-/* -*- C++ -*- */
-/* This is the compilation configuration file for LyX. It was generated by
- autoconf's 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
-
-@TOP@
-
-/* Define as 1 if the MKSTEMP function is declared */
-#undef HAVE_DECL_MKSTEMP
-
-/* Define if you have the function prototype for snprintf(). */
-#undef HAVE_DECL_SNPRINTF
-
-/* Define if you have the function prototype for vsnprintf(). */
-#undef HAVE_DECL_VSNPRINTF
-
-/* Define if you have the function prototype istreambuf_iterator in
- <iterator> */
-#undef HAVE_DECL_ISTREAMBUF_ITERATOR
-
-@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
-
-#ifdef HAVE_MKSTEMP
-#ifndef HAVE_DECL_MKSTEMP
-#if defined (__cplusplus)
-extern "C"
-#endif
-int mkstemp(char*);
-#endif
-#endif
-
-/* C++ always support the keyword `inline' */
-#if defined inline && defined __cplusplus
-/**/#undef inline
-#endif
-
-/* C++ always has a good enough `const' */
-#if defined const && defined __cplusplus
-/**/#undef const
-#endif
-
-/* Check on the run if we are using exceptions during this compilation.*/
-#if defined(__sgi) || defined(__GNUC__)
-# ifdef __EXCEPTIONS
-# define USING_EXCEPTIONS
-# endif
-#endif
-
-#if defined(__USLC__) || defined(__SUNPRO_CC) || defined(__COMO__) || defined(__ICL)
-# define USING_EXCEPTIONS
-#endif
-
-#ifdef __EMX__
-#include "support/os2_defines.h"
-#endif
-
-#if defined(__CYGWIN__) || defined( __CYGWIN32__)
-#include "support/nt_defines.h"
-#endif
-
-/* Some support for the boost library. */
-/*
- * #ifndef HAVE_LIMITS
- * #define BOOST_NO_LIMITS
- * #endif
- *
- * #ifndef HAVE_SSTREAM
- * #define BOOST_NO_STRINGSTREAM
- * #endif
- */
-
-#endif /* _CONFIG_H */
Index: autogen.sh
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/autogen.sh,v
retrieving revision 1.31
diff -u -p -r1.31 autogen.sh
--- autogen.sh 8 Jul 2002 15:00:54 -0000 1.31
+++ autogen.sh 1 Aug 2002 22:11:21 -0000
@@ -1,9 +1,9 @@
#!/bin/sh
ACLOCAL=aclocal
-AUTOHEADER=autoheader
+AUTOHEADER="autoheader -W none -W obsolete"
AUTOMAKE="automake -a -c --foreign"
-AUTOCONF=autoconf
+AUTOCONF="autoconf -W none -W obsolete"
GNUM4=
ACINCLUDE_FILES="lyxinclude.m4 libtool.m4 codeset.m4 gettext.m4 glibc21.m4 iconv.m4 isc-posix.m4 lcmessage.m4 progtest.m4 xforms.m4 qt2.m4 gtk--.m4 gnome--.m4 gnome.m4 pspell.m4 pkg.m4"
Index: configure.ac
===================================================================
RCS file: configure.ac
diff -N configure.ac
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ configure.ac 1 Aug 2002 22:11:21 -0000
@@ -0,0 +1,328 @@
+dnl Process with autoconf to generate configure script -*- sh -*-
+
+AC_INIT(lyx,1.3.0cvs,[EMAIL PROTECTED])
+AC_PREREQ(2.53)
+AC_CONFIG_SRCDIR(src/main.C)
+AM_CONFIG_HEADER([src/config.h:config/config.pre:src/config.h.in:config/config.post])
+AC_CONFIG_AUX_DIR(config)
+
+PACKAGE=lyx${program_suffix}
+VERSION="1.3.0cvs"
+LYX_CHECK_VERSION
+
+AC_CANONICAL_TARGET
+# AC_VALIDATE_CACHE_SYSTEM_TYPE
+
+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 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
+
+#old gnome stuff removed by Michael Koziarski 25-05-2002
+
+### 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,1,[Define this if you have the AikSaurus library])
+ AIKSAURUS_LIBS="-lAiksaurus -lbz2"
+ ],,"-lbz2")
+fi
+AC_SUBST(AIKSAURUS_LIBS)
+
+### Setup libtool
+AC_DISABLE_SHARED
+AC_LIBTOOL_WIN32_DLL
+#AM_PROG_LIBTOOL
+LYX_PROG_LIBTOOL
+
+### Check if we want pspell libraries
+CHECK_WITH_PSPELL
+
+### Check for X libraries
+# 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
+# We have to check for xforms anyway
+LYX_PATH_XPM
+LYX_PATH_XFORMS
+
+#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)
+ # for now don't set it for xforms as this is always entered
+ FRONTEND="xforms"
+ FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo"
+ FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
+ 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)
+ AC_SUBST(GNOME_FRONTEND_CFLAGS)
+ AC_SUBST(GNOME_FRONTEND_LIBS)
+
+ FRONTEND="xforms gnome"
+ FRONTEND_GUILIB="gnome/*.lo"
+ FRONTEND_LDFLAGS="${GNOME_FRONTEND_LIBS}"
+ FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms ${GNOME_FRONTEND_CFLAGS} "
+ FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ ${GNOME_FRONTEND_LIBS}";;
+ qt2)
+ QT2_DO_IT_ALL
+ FRONTEND="qt2"
+ FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
+ FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)"
+ 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
+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.])
+fi
+
+### Check whether the xforms library has a viable image loader
+### For now, run this test always so config.h is unchanged by a change in
+### frontend
+LYX_USE_XFORMS_IMAGE_LOADER
+
+### 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)
+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 putenv setenv mkfifo mkstemp mktemp)
+AC_LANG_CPLUSPLUS
+
+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
+
+
+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)
+
+### 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/lyx.spec \
+ lib/Makefile \
+ intl/Makefile \
+ po/Makefile.in \
+ sourcedoc/Doxyfile \
+ src/Makefile \
+ src/version.C \
+ 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/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/config.post
===================================================================
RCS file: config/config.post
diff -N config/config.post
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ config/config.post 1 Aug 2002 22:11:21 -0000
@@ -0,0 +1 @@
+#endif
Index: config/config.pre
===================================================================
RCS file: config/config.pre
diff -N config/config.pre
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ config/config.pre 1 Aug 2002 22:11:21 -0000
@@ -0,0 +1,2 @@
+#ifndef _CONFIG_H
+#define _CONFIG_H
Index: config/gnome.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/gnome.m4,v
retrieving revision 1.2
diff -u -p -r1.2 gnome.m4
--- config/gnome.m4 27 Sep 2000 15:43:49 -0000 1.2
+++ config/gnome.m4 1 Aug 2002 22:11:23 -0000
@@ -1,7 +1,7 @@
# aclocal-include.m4
-#
+#
# This macro adds the name macrodir to the set of directories
-# that `aclocal' searches for macros.
+# that `aclocal' searches for macros.
# serial 1
@@ -18,7 +18,7 @@ dnl GNOME_COMPILE_WARNINGS
dnl Turn on many useful compiler warnings
dnl For now, only works on GCC
AC_DEFUN([GNOME_COMPILE_WARNINGS],[
- AC_ARG_ENABLE(compile-warnings,
+ AC_ARG_ENABLE(compile-warnings,
[ --enable-compile-warnings=[no/minimum/yes] Turn on compiler warnings.],,enable_compile_warnings=minimum)
AC_MSG_CHECKING(what warning flags to pass to the C compiler)
@@ -48,7 +48,7 @@ AC_DEFUN([GNOME_COMPILE_WARNINGS],[
dnl For C++, do basically the same thing.
AC_DEFUN([GNOME_CXX_WARNINGS],[
- AC_ARG_ENABLE(cxx-warnings,
+ AC_ARG_ENABLE(cxx-warnings,
[ --enable-cxx-warnings=[no/minimum/yes] Turn on compiler warnings.],,enable_cxx_warnings=minimum)
AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
@@ -80,7 +80,7 @@ dnl =============
dnl
dnl - Determine which version of curses is installed on your system
dnl and set the -I/-L/-l compiler entries and add a few preprocessor
-dnl symbols
+dnl symbols
dnl - Do an AC_SUBST on the CURSES_INCLUDEDIR and CURSES_LIBS so that
dnl @CURSES_INCLUDEDIR@ and @CURSES_LIBS@ will be available in
dnl Makefile.in's
@@ -90,7 +90,7 @@ dnl CURSES_INCLUDEDIR - contains -I's
dnl an ncurses.h that's been renamed to curses.h
dnl is found.
dnl CURSES_LIBS - sets -L and -l's appropriately
-dnl CFLAGS - if --with-sco, add -D_SVID3
+dnl CFLAGS - if --with-sco, add -D_SVID3
dnl has_curses - exports result of tests to rest of configure
dnl
dnl Usage:
@@ -114,7 +114,7 @@ dnl - call AM_CONDITIONAL(HAS_CURSES, te
dnl configure.in
dnl - your Makefile.am can look something like this
dnl -----------------------------------------------
-dnl INCLUDES= blah blah blah $(CURSES_INCLUDEDIR)
+dnl INCLUDES= blah blah blah $(CURSES_INCLUDEDIR)
dnl if HAS_CURSES
dnl CURSES_TARGETS=name_of_curses_prog
dnl endif
@@ -132,25 +132,25 @@ dnl
dnl /*=== Curses version detection defines ===*/
dnl /* Found some version of curses that we're going to use */
dnl #undef HAS_CURSES
-dnl
+dnl
dnl /* Use SunOS SysV curses? */
dnl #undef USE_SUNOS_CURSES
-dnl
+dnl
dnl /* Use old BSD curses - not used right now */
dnl #undef USE_BSD_CURSES
-dnl
+dnl
dnl /* Use SystemV curses? */
dnl #undef USE_SYSV_CURSES
-dnl
+dnl
dnl /* Use Ncurses? */
dnl #undef USE_NCURSES
-dnl
+dnl
dnl /* If you Curses does not have color define this one */
dnl #undef NO_COLOR_CURSES
-dnl
+dnl
dnl /* Define if you want to turn on SCO-specific code */
dnl #undef SCO_FLAVOR
-dnl
+dnl
dnl /* Set to reflect version of ncurses *
dnl * 0 = version 1.*
dnl * 1 = version 1.9.9g
@@ -158,7 +158,7 @@ dnl * 2 = version 4.0/4.1 */
dnl #undef NCURSES_970530
dnl
dnl /*=== End new stuff for acconfig.h ===*/
-dnl
+dnl
AC_DEFUN(AC_CHECK_CURSES,[
@@ -174,7 +174,7 @@ AC_DEFUN(AC_CHECK_CURSES,[
AC_ARG_WITH(sco,
[ --with-sco Use this to turn on SCO-specific code],[
if test x$withval = xyes; then
- AC_DEFINE(SCO_FLAVOR)
+ AC_DEFINE(SCO_FLAVOR, 1, [dummy])
CFLAGS="$CFLAGS -D_SVID3"
fi
])
@@ -210,8 +210,8 @@ AC_DEFUN(AC_CHECK_CURSES,[
CURSES_INCLUDEDIR="-I$withval/include"
search_ncurses=false
screen_manager="ncurses"
- AC_DEFINE(USE_NCURSES)
- AC_DEFINE(HAS_CURSES)
+ AC_DEFINE(USE_NCURSES, 1, [dummy])
+ AC_DEFINE(HAS_CURSES, 1, [dummy])
has_curses=true
fi
)
@@ -229,11 +229,11 @@ AC_DEFUN(AC_USE_SUNOS_CURSES, [
search_ncurses=false
screen_manager="SunOS 4.x /usr/5include curses"
AC_MSG_RESULT(Using SunOS 4.x /usr/5include curses)
- AC_DEFINE(USE_SUNOS_CURSES)
- AC_DEFINE(HAS_CURSES)
+ AC_DEFINE(USE_SUNOS_CURSES, 1, [dummy])
+ AC_DEFINE(HAS_CURSES, 1, [dummy])
has_curses=true
- AC_DEFINE(NO_COLOR_CURSES)
- AC_DEFINE(USE_SYSV_CURSES)
+ AC_DEFINE(NO_COLOR_CURSES, 1, [dummy])
+ AC_DEFINE(USE_SYSV_CURSES, 1, [dummy])
CURSES_INCLUDEDIR="-I/usr/5include"
CURSES_LIBS="/usr/5lib/libcurses.a /usr/5lib/libtermcap.a"
AC_MSG_RESULT(Please note that some screen refreshs may fail)
@@ -243,18 +243,18 @@ AC_DEFUN(AC_USE_OSF1_CURSES, [
AC_MSG_RESULT(Using OSF1 curses)
search_ncurses=false
screen_manager="OSF1 curses"
- AC_DEFINE(HAS_CURSES)
+ AC_DEFINE(HAS_CURSES, 1, [dummy])
has_curses=true
- AC_DEFINE(NO_COLOR_CURSES)
- AC_DEFINE(USE_SYSV_CURSES)
+ AC_DEFINE(NO_COLOR_CURSES, 1 [dummy])
+ AC_DEFINE(USE_SYSV_CURSES, 1, [dummy])
CURSES_LIBS="-lcurses"
])
AC_DEFUN(AC_USE_SYSV_CURSES, [
AC_MSG_RESULT(Using SysV curses)
- AC_DEFINE(HAS_CURSES)
+ AC_DEFINE(HAS_CURSES, 1, [dummy])
has_curses=true
- AC_DEFINE(USE_SYSV_CURSES)
+ AC_DEFINE(USE_SYSV_CURSES, 1, [dummy])
search_ncurses=false
screen_manager="SysV/curses"
CURSES_LIBS="-lcurses"
@@ -262,7 +262,7 @@ AC_DEFUN(AC_USE_SYSV_CURSES, [
dnl AC_ARG_WITH(bsd-curses,
dnl [--with-bsd-curses Used to compile with bsd curses, not very fancy],
-dnl search_ncurses=false
+dnl search_ncurses=false
dnl screen_manager="Ultrix/cursesX"
dnl if test $system = ULTRIX
dnl then
@@ -272,32 +272,32 @@ dnl THIS_CURSES=curses
dnl fi
dnl
dnl CURSES_LIBS="-l$THIS_CURSES -ltermcap"
-dnl AC_DEFINE(HAS_CURSES)
+dnl AC_DEFINE(HAS_CURSES, 1, [dummy])
dnl has_curses=true
-dnl AC_DEFINE(USE_BSD_CURSES)
+dnl AC_DEFINE(USE_BSD_CURSES, 1, [dummy])
dnl AC_MSG_RESULT(Please note that some screen refreshs may fail)
dnl AC_WARN(Use of the bsdcurses extension has some)
dnl AC_WARN(display/input problems.)
dnl AC_WARN(Reconsider using xcurses)
dnl)
-
+
dnl
dnl Parameters: directory filename cureses_LIBS curses_INCLUDEDIR nicename
dnl
AC_DEFUN(AC_NCURSES, [
if $search_ncurses
then
- if test -f $1/$2
+ if test -f $1/$2
then
AC_MSG_RESULT(Found ncurses on $1/$2)
- CURSES_LIBS="$3"
+ CURSES_LIBS="$3"
CURSES_INCLUDEDIR="$4"
search_ncurses=false
screen_manager=$5
- AC_DEFINE(HAS_CURSES)
- has_curses=true
- AC_DEFINE(USE_NCURSES)
+ AC_DEFINE(HAS_CURSES, 1, [dummy])
+ has_curses=true
+ AC_DEFINE(USE_NCURSES, 1, [dummy])
fi
fi
])
@@ -317,9 +317,9 @@ AC_DEFUN(AC_SEARCH_NCURSES, [
dnl
dnl We couldn't find ncurses, try SysV curses
dnl
- if $search_ncurses
+ if $search_ncurses
then
- AC_EGREP_HEADER(init_color, /usr/include/curses.h,
+ AC_EGREP_HEADER(init_color, /usr/include/curses.h,
AC_USE_SYSV_CURSES)
AC_EGREP_CPP(USE_NCURSES,[
#include <curses.h>
@@ -329,11 +329,11 @@ USE_NCURSES
#endif
],[
CURSES_INCLUDEDIR="$CURSES_INCLUDEDIR -DRENAMED_NCURSES"
- AC_DEFINE(HAS_CURSES)
+ AC_DEFINE(HAS_CURSES, 1, [dummy])
has_curses=true
- AC_DEFINE(USE_NCURSES)
- search_ncurses=false
- screen_manager="ncurses installed as curses"
+ AC_DEFINE(USE_NCURSES, 1, [dummy])
+ search_ncurses=false
+ screen_manager="ncurses installed as curses"
])
fi
@@ -347,9 +347,9 @@ USE_NCURSES
if test -f /usr/5include/curses.h
then
AC_USE_SUNOS_CURSES
- fi
+ fi
else
- # check for ncurses version, to properly ifdef mouse-fix
+ # check for ncurses version, to properly ifdef mouse-fix
AC_MSG_CHECKING(for ncurses version)
ncurses_version=unknown
cat > conftest.$ac_ext <<EOF
@@ -363,26 +363,26 @@ cat > conftest.$ac_ext <<EOF
#undef VERSION
VERSION:NCURSES_VERSION
EOF
- if (eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC |
+ if (eval "$ac_cpp conftest.$ac_ext") 2>&AC_FD_CC |
egrep "VERSION:" >conftest.out 2>&1; then
changequote(,)dnl
- ncurses_version=`cat conftest.out|sed -e 's/^[^"]*"//' -e 's/".*//'`
+ ncurses_version=`cat conftest.out|sed -e 's/^[^"]*"//' -e 's/".*//'`
changequote([,])dnl
fi
rm -rf conftest*
- AC_MSG_RESULT($ncurses_version)
+ AC_MSG_RESULT($ncurses_version)
case "$ncurses_version" in
changequote(,)dnl
4.[01])
changequote([,])dnl
- AC_DEFINE(NCURSES_970530,2)
- ;;
+ AC_DEFINE(NCURSES_970530, 2, [dummy])
+ ;;
1.9.9g)
- AC_DEFINE(NCURSES_970530,1)
- ;;
+ AC_DEFINE(NCURSES_970530, 1, [dummy])
+ ;;
1*)
- AC_DEFINE(NCURSES_970530,0)
- ;;
+ AC_DEFINE(NCURSES_970530, 0, [dummy])
+ ;;
esac
fi
])
@@ -404,26 +404,26 @@ dnl Test for Bonobo, and define BONOBO_C
dnl
AC_DEFUN([AM_PATH_BONOBO],
[
-dnl
+dnl
dnl Get the cflags and libraries from the gnome-config script
dnl
AC_ARG_WITH(bonobo-prefix,[ --with-bonobo-prefix=PFX Prefix where Bonobo is installed (optional)],
- bonobo_prefix="$withval", bonobo_prefix="")
+ bonobo_prefix="$withval", bonobo_prefix="")
AC_ARG_WITH(bonobo-exec-prefix,[ --with-bonobo-exec-prefix=PFX Exec prefix where Bonobo is installed (optional)],
- bonobo_exec_prefix="$withval", bonobo_exec_prefix="")
+ bonobo_exec_prefix="$withval", bonobo_exec_prefix="")
AC_ARG_ENABLE(bonobotest, [ --disable-bonobotest Do not try to compile and run a test Bonobo program],
, enable_bonobotest=yes)
if test x$bonobo_exec_prefix != x ; then
bonobo_args="$bonobo_args --exec-prefix=$bonobo_exec_prefix"
if test x${GNOME_CONFIG+set} != xset ; then
- GNOME_CONFIG=$bonobo_exec_prefix/bin/gnome-config
+ GNOME_CONFIG=$bonobo_exec_prefix/bin/gnome-config
fi
fi
if test x$bonobo_prefix != x ; then
bonobo_args="$bonobo_args --prefix=$bonobo_prefix"
if test x${GNOME_CONFIG+set} != xset ; then
- GNOME_CONFIG=$bonobo_prefix/bin/gnome-config
+ GNOME_CONFIG=$bonobo_prefix/bin/gnome-config
fi
fi
@@ -438,11 +438,11 @@ AC_ARG_ENABLE(bonobotest, [ --disable-b
BONOBO_LIBS=`$GNOME_CONFIG $bonoboconf_args --libs bonobo`
bonobo_major_version=`$GNOME_CONFIG $bonobo_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
bonobo_minor_version=`$GNOME_CONFIG $bonobo_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
bonobo_micro_version=`$GNOME_CONFIG $bonobo_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_bonobotest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
@@ -463,7 +463,7 @@ static char*
my_strdup (char *str)
{
char *new_str;
-
+
if (str)
{
new_str = malloc ((strlen (str) + 1) * sizeof(char));
@@ -471,7 +471,7 @@ my_strdup (char *str)
}
else
new_str = NULL;
-
+
return new_str;
}
@@ -492,7 +492,7 @@ int main ()
fi
if test "x$no_bonobo" = x ; then
AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
+ ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$GNOME_CONFIG" = "no" ; then
@@ -502,30 +502,30 @@ int main ()
echo "*** full path to gnome-config."
else
if test -f conf.bonobotest ; then
- :
+ :
else
- echo "*** Could not run BONOBO test program, checking why..."
- CFLAGS="$CFLAGS $BONOBO_CFLAGS"
- LIBS="$LIBS $BONOBO_LIBS"
- AC_TRY_LINK([
+ echo "*** Could not run BONOBO test program, checking why..."
+ CFLAGS="$CFLAGS $BONOBO_CFLAGS"
+ LIBS="$LIBS $BONOBO_LIBS"
+ AC_TRY_LINK([
#include <stdio.h>
#include <bonobo/gnome-object.h>
], [ return 0; ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding BONOBO or finding the wrong"
- echo "*** version of BONOBO. If it is not finding BONOBO, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
+ [ echo "*** The test program compiled, but did not run. This usually means"
+ echo "*** that the run-time linker is not finding BONOBO or finding the wrong"
+ echo "*** version of BONOBO. If it is not finding BONOBO, you'll need to set your"
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
+ echo "*** is required on your system"
echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means BONOBO was incorrectly installed"
- echo "*** or that you have moved BONOBO since it was installed. In the latter case, you"
- echo "*** may want to edit the gnome-config script: $GNOME_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
+ echo "*** If you have an old version installed, it is best to remove it, although"
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** exact error that occured. This usually means BONOBO was incorrectly installed"
+ echo "*** or that you have moved BONOBO since it was installed. In the latter case, you"
+ echo "*** may want to edit the gnome-config script: $GNOME_CONFIG" ])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
fi
fi
BONOBO_CFLAGS=""
@@ -542,7 +542,7 @@ AC_DEFUN([BONOBO_CHECK], [
])
# gnome-common.m4
-#
+#
# This only for packages that are not in the GNOME CVS tree.
dnl GNOME_COMMON_INIT
@@ -562,7 +562,7 @@ dnl checks that are needed for the disku
dnl
AC_DEFUN([GNOME_FILEUTILS_CHECKS],
-[
+[
AC_CHECK_HEADERS(fcntl.h sys/param.h sys/statfs.h sys/fstyp.h \
mnttab.h mntent.h sys/statvfs.h sys/vfs.h sys/mount.h \
sys/filsys.h sys/fs_types.h sys/fs/s5param.h)
@@ -624,7 +624,7 @@ yes
AC_MSG_RESULT($fu_cv_sys_mounted_cray_listmntent)
if test $fu_cv_sys_mounted_cray_listmntent = yes; then
list_mounted_fs=found
-AC_DEFINE(MOUNTED_LISTMNTENT)
+AC_DEFINE(MOUNTED_LISTMNTENT, 1, [dummy])
fi
fi
@@ -643,7 +643,7 @@ AC_CACHE_VAL(fu_cv_sys_mounted_getmntent
AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1)
if test $fu_cv_sys_mounted_getmntent1 = yes; then
list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTENT1)
+AC_DEFINE(MOUNTED_GETMNTENT1, 1, [dummy])
fi
fi
@@ -657,7 +657,7 @@ fu_cv_sys_mounted_getmntent2=no)])
AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2)
if test $fu_cv_sys_mounted_getmntent2 = yes; then
list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTENT2)
+AC_DEFINE(MOUNTED_GETMNTENT2, 1, [dummy])
fi
fi
@@ -682,7 +682,7 @@ fu_cv_sys_mounted_getsstat=no)])
AC_MSG_RESULT($fu_cv_sys_mounted_getsstat)
if test $fu_cv_sys_mounted_getsstat = yes; then
list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETFSSTAT)
+AC_DEFINE(MOUNTED_GETFSSTAT, 1, [dummy])
fi
fi
@@ -696,7 +696,7 @@ fu_cv_sys_mounted_vmount=no)])
AC_MSG_RESULT($fu_cv_sys_mounted_vmount)
if test $fu_cv_sys_mounted_vmount = yes; then
list_mounted_fs=found
-AC_DEFINE(MOUNTED_VMOUNT)
+AC_DEFINE(MOUNTED_VMOUNT, 1, [dummy])
fi
fi
@@ -713,7 +713,7 @@ fu_cv_sys_mounted_fread_fstyp=no)])
AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp)
if test $fu_cv_sys_mounted_fread_fstyp = yes; then
list_mounted_fs=found
-AC_DEFINE(MOUNTED_FREAD_FSTYP)
+AC_DEFINE(MOUNTED_FREAD_FSTYP, 1, [dummy])
fi
fi
@@ -734,7 +734,7 @@ test -n "$ok" \
AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo)
if test $fu_cv_sys_mounted_getmntinfo = yes; then
list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNTINFO)
+AC_DEFINE(MOUNTED_GETMNTINFO, 1, [dummy])
fi
fi
@@ -752,7 +752,7 @@ fu_cv_sys_mounted_getmnt=no)])
AC_MSG_RESULT($fu_cv_sys_mounted_getmnt)
if test $fu_cv_sys_mounted_getmnt = yes; then
list_mounted_fs=found
-AC_DEFINE(MOUNTED_GETMNT)
+AC_DEFINE(MOUNTED_GETMNT, 1, [dummy])
fi
fi
@@ -766,7 +766,7 @@ fu_cv_sys_mounted_fread=no)])
AC_MSG_RESULT($fu_cv_sys_mounted_fread)
if test $fu_cv_sys_mounted_fread = yes; then
list_mounted_fs=found
-AC_DEFINE(MOUNTED_FREAD)
+AC_DEFINE(MOUNTED_FREAD, 1, [dummy])
fi
fi
@@ -795,7 +795,7 @@ fu_cv_sys_stat_statvfs=yes,
fu_cv_sys_stat_statvfs=no)])
if test $fu_cv_sys_stat_statvfs = yes; then
space=yes
-AC_DEFINE(STAT_STATVFS)
+AC_DEFINE(STAT_STATVFS, 1, [dummy])
fi
fi
@@ -819,7 +819,7 @@ fu_cv_sys_stat_statfs3_osf1=no)])
AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1)
if test $fu_cv_sys_stat_statfs3_osf1 = yes; then
space=yes
-AC_DEFINE(STAT_STATFS3_OSF1)
+AC_DEFINE(STAT_STATFS3_OSF1, 1, [dummy])
fi
fi
@@ -850,7 +850,7 @@ fu_cv_sys_stat_statfs2_bsize=no)])
AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize)
if test $fu_cv_sys_stat_statfs2_bsize = yes; then
space=yes
-AC_DEFINE(STAT_STATFS2_BSIZE)
+AC_DEFINE(STAT_STATFS2_BSIZE, 1, [dummy])
fi
fi
@@ -871,7 +871,7 @@ fu_cv_sys_stat_statfs4=no)])
AC_MSG_RESULT($fu_cv_sys_stat_statfs4)
if test $fu_cv_sys_stat_statfs4 = yes; then
space=yes
-AC_DEFINE(STAT_STATFS4)
+AC_DEFINE(STAT_STATFS4, 1, [dummy])
fi
fi
@@ -899,7 +899,7 @@ fu_cv_sys_stat_statfs2_fsize=no)])
AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize)
if test $fu_cv_sys_stat_statfs2_fsize = yes; then
space=yes
-AC_DEFINE(STAT_STATFS2_FSIZE)
+AC_DEFINE(STAT_STATFS2_FSIZE, 1, [dummy])
fi
fi
@@ -930,14 +930,14 @@ fu_cv_sys_stat_fs_data=no)])
AC_MSG_RESULT($fu_cv_sys_stat_fs_data)
if test $fu_cv_sys_stat_fs_data = yes; then
space=yes
-AC_DEFINE(STAT_STATFS2_FS_DATA)
+AC_DEFINE(STAT_STATFS2_FS_DATA, 1, [dummy])
fi
fi
if test $space = no; then
# SVR2
AC_TRY_CPP([#include <sys/filsys.h>],
-AC_DEFINE(STAT_READ_FILSYS) space=yes)
+AC_DEFINE(STAT_READ_FILSYS, 1, [dummy]) space=yes)
fi
if test -n "$list_mounted_fs" && test $space != no; then
@@ -962,12 +962,12 @@ fu_cv_sys_truncating_statfs=yes,
fu_cv_sys_truncating_statfs=no,
)])
if test $fu_cv_sys_truncating_statfs = yes; then
-AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS)
+AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS, 1, [dummy])
fi
AC_MSG_RESULT($fu_cv_sys_truncating_statfs)
AC_CHECKING(for AFS)
-test -d /afs && AC_DEFINE(AFS)
+test -d /afs && AC_DEFINE(AFS, 1, [dummy])
])
AC_DEFUN([GNOME_GHTTP_CHECK],[
AC_REQUIRE([GNOME_INIT_HOOK])
@@ -976,9 +976,9 @@ AC_DEFUN([GNOME_GHTTP_CHECK],[
AC_CHECK_LIB(socket,connect,
GHTTP_LIB="-lsocket $GHTTP_LIB",,$GHTTP_LIB)])
AC_CHECK_FUNC(gethostbyname,,[
- AC_CHECK_LIB(nsl,gethostbyname,
+ AC_CHECK_LIB(nsl,gethostbyname,
GHTTP_LIB="-lnsl $GHTTP_LIB",,$GHTTP_LIB)])
- AC_CHECK_LIB(ghttp, ghttp_request_new,
+ AC_CHECK_LIB(ghttp, ghttp_request_new,
GHTTP_LIB="-lghttp $GHTTP_LIB",GHTTP_LIB="",-L$gnome_prefix $GHTTP_LIB)
AC_SUBST(GHTTP_LIB)
AC_PROVIDE([GNOME_GHTTP_CHECK])
@@ -1009,9 +1009,9 @@ AC_DEFUN([GNOME_GNORBA_HOOK],[
AC_SUBST(GNORBA_CFLAGS)
AC_SUBST(GNORBA_LIBS)
else
- if test x$2 = xfailure; then
+ if test x$2 = xfailure; then
AC_MSG_ERROR(gnorba library not installed or installation problem)
- fi
+ fi
fi
])
@@ -1062,7 +1062,7 @@ AC_DEFUN([GNOME_CHECK_GUILE],
if test "x$cross_compiling" = "xyes" ; then
name_build_guile="$target_alias-build-guile"
- else
+ else
name_build_guile="build-guile"
fi
@@ -1071,7 +1071,7 @@ AC_DEFUN([GNOME_CHECK_GUILE],
if test "x$BUILD_GUILE" = "xyes"; then
AC_MSG_CHECKING(whether $name_build_guile works)
if test x`$name_build_guile --version >/dev/null 2>&1 || \
- echo no` = xno; then
+ echo no` = xno; then
BUILD_GUILE=no
fi
AC_MSG_RESULT($BUILD_GUILE)
@@ -1114,7 +1114,7 @@ AC_DEFUN([GNOME_CHECK_GUILE],
scm_boot_guile(0,NULL,NULL,NULL);
],[
ac_cv_guile_found=yes
- AC_DEFINE(HAVE_GUILE)
+ AC_DEFINE(HAVE_GUILE, 1, [dummy])
],[
ac_cv_guile_found=no
])
@@ -1165,7 +1165,7 @@ changequote([,]), [#include <sys/types.h
], ac_cv_type_$1=yes, ac_cv_type_$1=no)])dnl
AC_MSG_RESULT($ac_cv_type_$1)
if test $ac_cv_type_$1 = no; then
- AC_DEFINE($1, $2)
+ AC_DEFINE($1, $2, [dummy])
fi
])
@@ -1186,11 +1186,11 @@ dnl
dnl GNOME_LIBGTOP_HOOK (minversion, script-if-libgtop-enabled, failflag)
dnl
dnl if failflag is "fail" then GNOME_LIBGTOP_HOOK will abort if LibGTop
-dnl is not found.
+dnl is not found.
dnl
AC_DEFUN([GNOME_LIBGTOP_HOOK],
-[
+[
AC_REQUIRE([GNOME_LIBGTOP_TYPES])
AC_SUBST(LIBGTOP_LIBDIR)
@@ -1288,10 +1288,10 @@ AC_DEFUN([GNOME_LIBGTOP_HOOK],
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
libgtop_micro_version=`$LIBGTOP_CONFIG --version | \
sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
- if test $libgtop_major_version != $min_libgtop_major ; then
+ if test $libgtop_major_version != $min_libgtop_major ; then
no_libgtop=mismatch
- else
- test $libgtop_minor_version -lt $min_libgtop_minor && no_libgtop=yes
+ else
+ test $libgtop_minor_version -lt $min_libgtop_minor && no_libgtop=yes
if test $libgtop_minor_version = $min_libgtop_minor ; then
test $libgtop_micro_version -lt $min_libgtop_micro && no_libgtop=yes
fi
@@ -1299,13 +1299,13 @@ AC_DEFUN([GNOME_LIBGTOP_HOOK],
. $configfile
fi
if test x$no_libgtop = x ; then
- AC_DEFINE(HAVE_LIBGTOP)
- AC_DEFINE_UNQUOTED(LIBGTOP_VERSION, "$LIBGTOP_VERSION")
- AC_DEFINE_UNQUOTED(LIBGTOP_VERSION_CODE, $LIBGTOP_VERSION_CODE)
- AC_DEFINE_UNQUOTED(LIBGTOP_MAJOR_VERSION, $LIBGTOP_MAJOR_VERSION)
- AC_DEFINE_UNQUOTED(LIBGTOP_MINOR_VERSION, $LIBGTOP_MINOR_VERSION)
- AC_DEFINE_UNQUOTED(LIBGTOP_MICRO_VERSION, $LIBGTOP_MICRO_VERSION)
- AC_DEFINE_UNQUOTED(LIBGTOP_SERVER_VERSION, $LIBGTOP_SERVER_VERSION)
+ AC_DEFINE(HAVE_LIBGTOP, 1, [dummy])
+ AC_DEFINE_UNQUOTED(LIBGTOP_VERSION, "$LIBGTOP_VERSION", [dummy])
+ AC_DEFINE_UNQUOTED(LIBGTOP_VERSION_CODE, $LIBGTOP_VERSION_CODE, [dummy])
+ AC_DEFINE_UNQUOTED(LIBGTOP_MAJOR_VERSION, $LIBGTOP_MAJOR_VERSION, [dummy])
+ AC_DEFINE_UNQUOTED(LIBGTOP_MINOR_VERSION, $LIBGTOP_MINOR_VERSION, [dummy])
+ AC_DEFINE_UNQUOTED(LIBGTOP_MICRO_VERSION, $LIBGTOP_MICRO_VERSION, [dummy])
+ AC_DEFINE_UNQUOTED(LIBGTOP_SERVER_VERSION, $LIBGTOP_SERVER_VERSION, [dummy]
AC_MSG_RESULT(yes)
dnl Note that an empty true branch is not valid sh syntax.
ifelse([$2], [], :, [$2])
@@ -1344,7 +1344,7 @@ AC_DEFUN([GNOME_LIBGTOP_DOCU],
if test -f "$helpdir/C/topic.dat" ; then
have_libgtop_docu=yes
- AC_DEFINE(HAVE_LIBGTOP_DOCU)
+ AC_DEFINE(HAVE_LIBGTOP_DOCU, 1, [dummy])
else
have_libgtop_docu=no
fi
@@ -1373,8 +1373,8 @@ dnl FIXME: extend list of possible names
AC_CHECK_LIB(rt,sched_yield,
OBJC_LIBS="$OBJC_LIBS -lrt",[
AC_CHECK_LIB(posix4,sched_yield,
- OBJC_LIBS="$OBJC_LIBS -lposix4",,
- $OBJC_LIBS)],
+ OBJC_LIBS="$OBJC_LIBS -lposix4",,
+ $OBJC_LIBS)],
$OBJC_LIBS)])
AC_SUBST(OBJC_LIBS)
@@ -1403,7 +1403,7 @@ EOF
rm -f conftest*
if test $result -eq 0; then
- ac_cv_prog_objc_works=yes
+ ac_cv_prog_objc_works=yes
fi
else
ac_cv_prog_objc_works=no
@@ -1428,7 +1428,7 @@ AC_DEFUN([GNOME_INIT_OBJC],
AC_MSG_WARN(Could not find the obGnomeConf.sh file that is generated by gnome-objc install)
ac_cv_have_gnome_objc=no
fi
-
+
dnl Add a conditional on whether or not we have gnome-objc
AM_CONDITIONAL(HAVE_GNOME_OBJC, test x$ac_cv_have_gnome_objc = xyes)
HAVE_GNOME_OBJC=$ac_cv_have_gnome_objc
@@ -1461,9 +1461,9 @@ AC_DEFUN([GNOME_ORBIT_HOOK],[
AC_SUBST(ORBIT_CFLAGS)
AC_SUBST(ORBIT_LIBS)
else
- if test x$2 = xfailure; then
+ if test x$2 = xfailure; then
AC_MSG_ERROR(ORBit not installed or installation problem)
- fi
+ fi
fi
])
@@ -1481,26 +1481,26 @@ dnl AM_PATH_GNOME_PRINT([MINIMUM-VERSION
dnl Test for GNOME-PRINT, and define GNOME_PRINT_CFLAGS and GNOME_PRINT_LIBS
dnl
AC_DEFUN(AM_PATH_GNOME_PRINT,
-[dnl
+[dnl
dnl Get the cflags and libraries from the gnome-config script
dnl
AC_ARG_WITH(gnome-print-prefix,[ --with-gnome-print-prefix=PFX Prefix where GNOME-PRINT is installed (optional)],
- gnome_print_prefix="$withval", gnome_print_prefix="")
+ gnome_print_prefix="$withval", gnome_print_prefix="")
AC_ARG_WITH(gnome-print-exec-prefix,[ --with-gnome-print-exec-prefix=PFX Exec prefix where GNOME-PRINT is installed (optional)],
- gnome_print_exec_prefix="$withval", gnome_print_exec_prefix="")
+ gnome_print_exec_prefix="$withval", gnome_print_exec_prefix="")
AC_ARG_ENABLE(gnome-printtest, [ --disable-gnome-printtest Do not try to compile and run a test GNOME-PRINT program],
, enable_gnome_printtest=yes)
if test x$gnome_print_exec_prefix != x ; then
gnome_print_args="$gnome_print_args --exec-prefix=$gnome_print_exec_prefix"
if test x${GNOME_CONFIG+set} != xset ; then
- GNOME_CONFIG=$gnome_print_exec_prefix/bin/gnome-config
+ GNOME_CONFIG=$gnome_print_exec_prefix/bin/gnome-config
fi
fi
if test x$gnome_print_prefix != x ; then
gnome_print_args="$gnome_print_args --prefix=$gnome_print_prefix"
if test x${GNOME_CONFIG+set} != xset ; then
- GNOME_CONFIG=$gnome_print_prefix/bin/gnome-config
+ GNOME_CONFIG=$gnome_print_prefix/bin/gnome-config
fi
fi
@@ -1515,11 +1515,11 @@ AC_ARG_ENABLE(gnome-printtest, [ --disa
GNOME_PRINT_LIBS=`$GNOME_CONFIG $gnome_printconf_args --libs print`
gnome_print_major_version=`$GNOME_CONFIG $gnome_print_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
gnome_print_minor_version=`$GNOME_CONFIG $gnome_print_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
gnome_print_micro_version=`$GNOME_CONFIG $gnome_print_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_gnome_printtest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
@@ -1540,7 +1540,7 @@ static char*
my_strdup (char *str)
{
char *new_str;
-
+
if (str)
{
new_str = malloc ((strlen (str) + 1) * sizeof(char));
@@ -1548,7 +1548,7 @@ my_strdup (char *str)
}
else
new_str = NULL;
-
+
return new_str;
}
@@ -1593,7 +1593,7 @@ int main ()
fi
if test "x$no_gnome_print" = x ; then
AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
+ ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$GNOME_CONFIG" = "no" ; then
@@ -1603,30 +1603,30 @@ int main ()
echo "*** full path to gnome-config."
else
if test -f conf.gnome_printtest ; then
- :
+ :
else
- echo "*** Could not run GNOME-PRINT test program, checking why..."
- CFLAGS="$CFLAGS $GNOME_PRINT_CFLAGS"
- LIBS="$LIBS $GNOME_PRINT_LIBS"
- AC_TRY_LINK([
+ echo "*** Could not run GNOME-PRINT test program, checking why..."
+ CFLAGS="$CFLAGS $GNOME_PRINT_CFLAGS"
+ LIBS="$LIBS $GNOME_PRINT_LIBS"
+ AC_TRY_LINK([
#include <stdio.h>
#include <libgnomeprint/gnome-print.h>
], [ return 0; ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding GNOME-PRINT or finding the wrong"
- echo "*** version of GNOME-PRINT. If it is not finding GNOME-PRINT, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
+ [ echo "*** The test program compiled, but did not run. This usually means"
+ echo "*** that the run-time linker is not finding GNOME-PRINT or finding the wrong"
+ echo "*** version of GNOME-PRINT. If it is not finding GNOME-PRINT, you'll need to set your"
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
+ echo "*** is required on your system"
echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means GNOME-PRINT was incorrectly installed"
- echo "*** or that you have moved GNOME-PRINT since it was installed. In the latter case, you"
- echo "*** may want to edit the gnome-config script: $GNOME_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
+ echo "*** If you have an old version installed, it is best to remove it, although"
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"],
+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** exact error that occured. This usually means GNOME-PRINT was incorrectly installed"
+ echo "*** or that you have moved GNOME-PRINT since it was installed. In the latter case, you"
+ echo "*** may want to edit the gnome-config script: $GNOME_CONFIG" ])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
fi
fi
GNOME_PRINT_CFLAGS=""
@@ -1660,7 +1660,7 @@ AC_DEFUN([GNOME_PTHREAD_CHECK],[
dnl GNOME_SUPPORT_CHECKS
dnl Check for various support functions needed by the standard
dnl Gnome libraries. Sets LIBOBJS, might define some macros.
-dnl This should only be used when building the Gnome libs;
+dnl This should only be used when building the Gnome libs;
dnl Gnome clients should not need this macro.
AC_DEFUN([GNOME_SUPPORT_CHECKS],[
# we need an `awk' to build `gnomesupport.h'
@@ -1688,7 +1688,7 @@ AC_DEFUN([GNOME_SUPPORT_CHECKS],[
if eval "test \"`echo '$gnome_cv_var_'$v`\" = yes"; then
AC_MSG_RESULT(yes)
n=HAVE_`echo $v | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- AC_DEFINE_UNQUOTED($n)
+ AC_DEFINE_UNQUOTED($n, 1, [dummy])
else
AC_MSG_RESULT(no)
fi
@@ -1701,7 +1701,7 @@ AC_DEFUN([GNOME_SUPPORT_CHECKS],[
# to include `error.c' error.c has some HAVE_* checks
AC_CHECK_FUNCS(vprintf doprnt strerror_r)
- AM_FUNC_ERROR_AT_LINE
+ AC_FUNC_ERROR_AT_LINE
# This is required if we declare setreuid () and setregid ().
AC_TYPE_UID_T
@@ -1739,7 +1739,7 @@ AC_DEFUN([GNOME_UNDELFS_CHECKS], [
then
if test x$ac_cv_header_linux_ext2_fs_h = xyes
then
- AC_DEFINE(USE_EXT2FSLIB)
+ AC_DEFINE(USE_EXT2FSLIB, 1, [dummy])
ext2fs_undel=yes
EXT2FS_UNDEL_LIBS="-lext2fs -lcom_err"
fi
@@ -1770,7 +1770,7 @@ AC_DEFUN([GNOME_WITH_VFS],[
AC_CHECK_LIB($lib, socket, [
LIBS="$LIBS -l$lib"
have_socket=yes
- AC_DEFINE(HAVE_SOCKET)
+ AC_DEFINE(HAVE_SOCKET, 1, [dummy])
break])
done
fi
@@ -1791,7 +1791,7 @@ AC_DEFUN([GNOME_WITH_VFS],[
AC_CHECK_FUNCS(pmap_set, , [
AC_CHECK_LIB(rpc, pmap_set, [
LIBS="-lrpc $LIBS"
- AC_DEFINE(HAVE_PMAP_SET)
+ AC_DEFINE(HAVE_PMAP_SET, 1, [dummy])
])])
AC_CHECK_FUNCS(pmap_getport pmap_getmaps rresvport)
dnl add for source routing support setsockopt
@@ -1806,17 +1806,17 @@ AC_DEFUN([GNOME_WITH_VFS],[
smbfs=""
SAMBAFILES=""
AC_ARG_WITH(samba,
- [--with-samba Support smb virtual file system],[
- if test "x$withval != xno"; then
- AC_DEFINE(WITH_SMBFS)
- vfs_flags="$vfs_flags, smbfs"
+ [--with-samba Support smb virtual file system],[
+ if test "x$withval != xno"; then
+ AC_DEFINE(WITH_SMBFS, 1, [dummy])
+ vfs_flags="$vfs_flags, smbfs"
smbfs="smbfs.o"
SAMBAFILES="\$(SAMBAFILES)"
- fi
+ fi
])
AC_SUBST(smbfs)
AC_SUBST(SAMBAFILES)
-
+
dnl
dnl The termnet support
dnl
@@ -1824,15 +1824,15 @@ AC_DEFUN([GNOME_WITH_VFS],[
AC_ARG_WITH(termnet,
[--with-termnet If you want a termified net support],[
if test x$withval = xyes; then
- AC_DEFINE(USE_TERMNET)
- termnet=true
+ AC_DEFINE(USE_TERMNET, 1, [dummy])
+ termnet=true
fi
])
TERMNET=""
- AC_DEFINE(USE_VFS)
+ AC_DEFINE(USE_VFS, 1, [dummy])
if $use_net_code; then
- AC_DEFINE(USE_NETCODE)
+ AC_DEFINE(USE_NETCODE, [dummy])
fi
mcserv=
if test $have_socket = yes; then
@@ -1857,9 +1857,9 @@ AC_DEFUN([GNOME_VFS_CHECKS],[
use_vfs=$withval
)
case $use_vfs in
- yes) GNOME_WITH_VFS;;
- no) use_vfs=no;;
- *) use_vfs=no;;
+ yes) GNOME_WITH_VFS;;
+ no) use_vfs=no;;
+ *) use_vfs=no;;
dnl Should we issue a warning?
esac
])
@@ -1888,17 +1888,17 @@ AC_DEFUN([GNOME_X_CHECKS],
dnl
dnl Use CPPFLAGS instead of CFLAGS because AC_CHECK_HEADERS uses
dnl CPPFLAGS, not CFLAGS
- CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
+ CPPFLAGS="$CPPFLAGS $GTK_CFLAGS"
- saved_ldflags="$LDFLAGS"
- LDFLAGS="$LDFLAGS $GTK_LIBS"
+ saved_ldflags="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $GTK_LIBS"
gnome_cv_passdown_x_libs="$GTK_LIBS"
gnome_cv_passdown_X_LIBS="$GTK_LIBS"
gnome_cv_passdown_X_CFLAGS="$GTK_CFLAGS"
gnome_cv_passdown_GTK_LIBS="$GTK_LIBS"
- LDFLAGS="$saved_ldflags $GTK_LIBS"
+ LDFLAGS="$saved_ldflags $GTK_LIBS"
dnl We are requiring GTK >= 1.1.1, which means this will be fine anyhow.
USE_DEVGTK=true
@@ -1923,7 +1923,7 @@ dnl AC_MSG_RESULT("$dev_gtk")
*)
dnl Assume that if we have -lSM then we also have -lICE.
AC_CHECK_LIB(SM, SmcSaveYourselfDone,
- [GTK_LIBS="-lSM -lICE $GTK_LIBS"],GNOME_HAVE_SM=false,
+ [GTK_LIBS="-lSM -lICE $GTK_LIBS"],GNOME_HAVE_SM=false,
$x_libs -lICE)
;;
esac
@@ -1933,7 +1933,7 @@ dnl AC_MSG_RESULT("$dev_gtk")
fi
if test "$GNOME_HAVE_SM" = true; then
- AC_DEFINE(HAVE_LIBSM)
+ AC_DEFINE(HAVE_LIBSM, 1, [dummy])
fi
XPM_LIBS=""
@@ -1941,7 +1941,7 @@ dnl AC_MSG_RESULT("$dev_gtk")
AC_SUBST(XPM_LIBS)
AC_REQUIRE([GNOME_PTHREAD_CHECK])
- LDFLAGS="$saved_ldflags"
+ LDFLAGS="$saved_ldflags"
AC_PROVIDE([GNOME_X_CHECKS])
])
@@ -1949,7 +1949,7 @@ dnl
dnl GNOME_XML_HOOK (script-if-xml-found, failflag)
dnl
dnl If failflag is "failure", script aborts due to lack of XML
-dnl
+dnl
dnl Check for availability of the libxml library
dnl the XML parser uses libz if available too
dnl
@@ -1965,7 +1965,7 @@ AC_DEFUN([GNOME_XML_HOOK],[
$1
GNOME_XML_LIB=`$GNOME_CONFIG --libs xml`
], [
- if test x$2 = xfailure; then
+ if test x$2 = xfailure; then
AC_MSG_ERROR(Could not link sample xml program)
fi
], `$GNOME_CONFIG --libs xml`)
@@ -1979,7 +1979,7 @@ dnl
dnl GNOME_INIT_HOOK (script-if-gnome-enabled, [failflag], [additional-inits])
dnl
dnl if failflag is "fail" then GNOME_INIT_HOOK will abort if gnomeConf.sh
-dnl is not found.
+dnl is not found.
dnl
AC_DEFUN([GNOME_INIT_HOOK],[
@@ -1995,7 +1995,7 @@ AC_DEFUN([GNOME_INIT_HOOK],[
[ --with-gnome-includes Specify location of GNOME headers],[
CFLAGS="$CFLAGS -I$withval"
])
-
+
AC_ARG_WITH(gnome-libs,
[ --with-gnome-libs Specify location of GNOME libs],[
LDFLAGS="$LDFLAGS -L$withval"
@@ -2005,20 +2005,20 @@ AC_DEFUN([GNOME_INIT_HOOK],[
AC_ARG_WITH(gnome,
[ --with-gnome Specify prefix for GNOME files],
if test x$withval = xyes; then
- want_gnome=yes
- dnl Note that an empty true branch is not
+ want_gnome=yes
+ dnl Note that an empty true branch is not
dnl valid sh syntax.
- ifelse([$1], [], :, [$1])
- else
- if test "x$withval" = xno; then
- want_gnome=no
- else
- want_gnome=yes
- LDFLAGS="$LDFLAGS -L$withval/lib"
- CFLAGS="$CFLAGS -I$withval/include"
- gnome_prefix=$withval/lib
- fi
- fi,
+ ifelse([$1], [], :, [$1])
+ else
+ if test "x$withval" = xno; then
+ want_gnome=no
+ else
+ want_gnome=yes
+ LDFLAGS="$LDFLAGS -L$withval/lib"
+ CFLAGS="$CFLAGS -I$withval/include"
+ gnome_prefix=$withval/lib
+ fi
+ fi,
want_gnome=yes)
if test "x$want_gnome" = xyes; then
@@ -2029,54 +2029,54 @@ AC_DEFUN([GNOME_INIT_HOOK],[
else
AC_MSG_CHECKING(if $GNOME_CONFIG works)
if $GNOME_CONFIG --libs-only-l gnome >/dev/null 2>&1; then
- AC_MSG_RESULT(yes)
- GNOME_GNORBA_HOOK([],$2)
- GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`"
- GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`"
- GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`"
- GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`"
+ AC_MSG_RESULT(yes)
+ GNOME_GNORBA_HOOK([],$2)
+ GNOME_LIBS="`$GNOME_CONFIG --libs-only-l gnome`"
+ GNOMEUI_LIBS="`$GNOME_CONFIG --libs-only-l gnomeui`"
+ GNOMEGNORBA_LIBS="`$GNOME_CONFIG --libs-only-l gnorba gnomeui`"
+ GTKXMHTML_LIBS="`$GNOME_CONFIG --libs-only-l gtkxmhtml`"
ZVT_LIBS="`$GNOME_CONFIG --libs-only-l zvt`"
- GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`"
- GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`"
- $1
+ GNOME_LIBDIR="`$GNOME_CONFIG --libs-only-L gnorba gnomeui`"
+ GNOME_INCLUDEDIR="`$GNOME_CONFIG --cflags gnorba gnomeui`"
+ $1
else
- AC_MSG_RESULT(no)
- no_gnome_config="yes"
- fi
- fi
+ AC_MSG_RESULT(no)
+ no_gnome_config="yes"
+ fi
+ fi
if test x$exec_prefix = xNONE; then
- if test x$prefix = xNONE; then
+ if test x$prefix = xNONE; then
gnome_prefix=$ac_default_prefix/lib
- else
- gnome_prefix=$prefix/lib
- fi
+ else
+ gnome_prefix=$prefix/lib
+ fi
else
- gnome_prefix=`eval echo \`echo $libdir\``
+ gnome_prefix=`eval echo \`echo $libdir\``
fi
-
+
if test "$no_gnome_config" = "yes"; then
- AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix)
+ AC_MSG_CHECKING(for gnomeConf.sh file in $gnome_prefix)
if test -f $gnome_prefix/gnomeConf.sh; then
- AC_MSG_RESULT(found)
- echo "loading gnome configuration from" \
+ AC_MSG_RESULT(found)
+ echo "loading gnome configuration from" \
"$gnome_prefix/gnomeConf.sh"
- . $gnome_prefix/gnomeConf.sh
- $1
+ . $gnome_prefix/gnomeConf.sh
+ $1
else
- AC_MSG_RESULT(not found)
- if test x$2 = xfail; then
- AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install)
- fi
+ AC_MSG_RESULT(not found)
+ if test x$2 = xfail; then
+ AC_MSG_ERROR(Could not find the gnomeConf.sh file that is generated by gnome-libs install)
+ fi
fi
- fi
+ fi
fi
if test -n "$3"; then
n="$3"
for i in $n; do
AC_MSG_CHECKING(extra library \"$i\")
- case $i in
+ case $i in
applets)
AC_SUBST(GNOME_APPLETS_LIBS)
GNOME_APPLETS_LIBS=`$GNOME_CONFIG --libs-only-l applets`
@@ -2134,7 +2134,7 @@ static char*
my_strdup (char *str)
{
char *new_str;
-
+
if (str)
{
new_str = malloc ((strlen (str) + 1) * sizeof(char));
@@ -2142,15 +2142,15 @@ my_strdup (char *str)
}
else
new_str = NULL;
-
+
return new_str;
}
-int
+int
main ()
{
char *tmp_version;
-
+
int major;
int minor;
@@ -2201,7 +2201,7 @@ main ()
exit (0);
}
],[
-AC_DEFINE(HAVE_STRUCT_LINGER)
+AC_DEFINE(HAVE_STRUCT_LINGER, 1, [dummy])
av_struct_linger=yes
],[
av_struct_linger=no
@@ -2237,7 +2237,7 @@ if eval "test \"`echo '$gcc_cv_decl_need
AC_MSG_RESULT(yes)
gcc_need_declarations="$gcc_need_declarations $1"
gcc_tr_decl=NEED_DECLARATION_`echo $1 | tr 'abcdefghijklmnopqrstuvwxyz' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ'`
- AC_DEFINE_UNQUOTED($gcc_tr_decl)
+ AC_DEFINE_UNQUOTED($gcc_tr_decl, 1, [dummy])
else
AC_MSG_RESULT(no)
fi
@@ -2259,35 +2259,35 @@ dnl AM_PATH_GTK([MINIMUM-VERSION, [ACTIO
dnl Test for GTK, and define GTK_CFLAGS and GTK_LIBS
dnl
AC_DEFUN(AM_PATH_GTK,
-[dnl
+[dnl
dnl Get the cflags and libraries from the gtk-config script
dnl
AC_ARG_WITH(gtk-prefix,[ --with-gtk-prefix=PFX Prefix where GTK is installed (optional)],
- gtk_config_prefix="$withval", gtk_config_prefix="")
+ gtk_config_prefix="$withval", gtk_config_prefix="")
AC_ARG_WITH(gtk-exec-prefix,[ --with-gtk-exec-prefix=PFX Exec prefix where GTK is installed (optional)],
- gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
+ gtk_config_exec_prefix="$withval", gtk_config_exec_prefix="")
AC_ARG_ENABLE(gtktest, [ --disable-gtktest Do not try to compile and run a test GTK program],
, enable_gtktest=yes)
for module in . $4
do
case "$module" in
- gthread)
- gtk_config_args="$gtk_config_args gthread"
- ;;
+ gthread)
+ gtk_config_args="$gtk_config_args gthread"
+ ;;
esac
done
if test x$gtk_config_exec_prefix != x ; then
gtk_config_args="$gtk_config_args --exec-prefix=$gtk_config_exec_prefix"
if test x${GTK_CONFIG+set} != xset ; then
- GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
+ GTK_CONFIG=$gtk_config_exec_prefix/bin/gtk-config
fi
fi
if test x$gtk_config_prefix != x ; then
gtk_config_args="$gtk_config_args --prefix=$gtk_config_prefix"
if test x${GTK_CONFIG+set} != xset ; then
- GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
+ GTK_CONFIG=$gtk_config_prefix/bin/gtk-config
fi
fi
@@ -2301,11 +2301,11 @@ AC_ARG_ENABLE(gtktest, [ --disable-gtkt
GTK_CFLAGS=`$GTK_CONFIG $gtk_config_args --cflags`
GTK_LIBS=`$GTK_CONFIG $gtk_config_args --libs`
gtk_config_major_version=`$GTK_CONFIG $gtk_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
gtk_config_minor_version=`$GTK_CONFIG $gtk_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
gtk_config_micro_version=`$GTK_CONFIG $gtk_config_args --version | \
- sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
if test "x$enable_gtktest" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
@@ -2321,7 +2321,7 @@ dnl
#include <stdio.h>
#include <stdlib.h>
-int
+int
main ()
{
int major, minor, micro;
@@ -2340,9 +2340,9 @@ main ()
(gtk_minor_version != $gtk_config_minor_version) ||
(gtk_micro_version != $gtk_config_micro_version))
{
- printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
- $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
- gtk_major_version, gtk_minor_version, gtk_micro_version);
+ printf("\n*** 'gtk-config --version' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
printf ("*** was found! If gtk-config was correct, then it is best\n");
printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
@@ -2351,11 +2351,11 @@ main ()
printf("*** If gtk-config was wrong, set the environment variable GTK_CONFIG\n");
printf("*** to point to the correct copy of gtk-config, and remove the file config.cache\n");
printf("*** before re-running configure\n");
- }
+ }
#if defined (GTK_MAJOR_VERSION) && defined (GTK_MINOR_VERSION) && defined (GTK_MICRO_VERSION)
else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
(gtk_minor_version != GTK_MINOR_VERSION) ||
- (gtk_micro_version != GTK_MICRO_VERSION))
+ (gtk_micro_version != GTK_MICRO_VERSION))
{
printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
@@ -2366,26 +2366,26 @@ main ()
else
{
if ((gtk_major_version > major) ||
- ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
- ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
+ ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
{
- return 0;
+ return 0;
}
else
{
- printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
- gtk_major_version, gtk_minor_version, gtk_micro_version);
- printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
+ gtk_major_version, gtk_minor_version, gtk_micro_version);
+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
major, minor, micro);
- printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n";);
- printf("***\n");
- printf("*** If you have already installed a sufficiently new version, this error\n");
- printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
- printf("*** being found. The easiest way to fix this is to remove the old version\n");
- printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
- printf("*** correct copy of gtk-config. (In this case, you will have to\n");
- printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
- printf("*** so that the correct libraries are found at run-time))\n");
+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n";);
+ printf("***\n");
+ printf("*** If you have already installed a sufficiently new version, this error\n");
+ printf("*** probably means that the wrong copy of the gtk-config shell script is\n");
+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
+ printf("*** of GTK+, but you can also set the GTK_CONFIG environment to point to the\n");
+ printf("*** correct copy of gtk-config. (In this case, you will have to\n");
+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
+ printf("*** so that the correct libraries are found at run-time))\n");
}
}
return 1;
@@ -2397,7 +2397,7 @@ main ()
fi
if test "x$no_gtk" = x ; then
AC_MSG_RESULT(yes)
- ifelse([$2], , :, [$2])
+ ifelse([$2], , :, [$2])
else
AC_MSG_RESULT(no)
if test "$GTK_CONFIG" = "no" ; then
@@ -2407,35 +2407,35 @@ main ()
echo "*** full path to gtk-config."
else
if test -f conf.gtktest ; then
- :
+ :
else
- echo "*** Could not run GTK test program, checking why..."
- CFLAGS="$CFLAGS $GTK_CFLAGS"
- LIBS="$LIBS $GTK_LIBS"
- AC_TRY_LINK([
+ echo "*** Could not run GTK test program, checking why..."
+ CFLAGS="$CFLAGS $GTK_CFLAGS"
+ LIBS="$LIBS $GTK_LIBS"
+ AC_TRY_LINK([
#include <gtk/gtk.h>
#include <stdio.h>
], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
- [ echo "*** The test program compiled, but did not run. This usually means"
- echo "*** that the run-time linker is not finding GTK or finding the wrong"
- echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
- echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
- echo "*** to the installed location Also, make sure you have run ldconfig if that"
- echo "*** is required on your system"
+ [ echo "*** The test program compiled, but did not run. This usually means"
+ echo "*** that the run-time linker is not finding GTK or finding the wrong"
+ echo "*** version of GTK. If it is not finding GTK, you'll need to set your"
+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
+ echo "*** is required on your system"
+ echo "***"
+ echo "*** If you have an old version installed, it is best to remove it, although"
+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
+ echo "***"
+ echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
+ echo "*** came with the system with the command"
echo "***"
- echo "*** If you have an old version installed, it is best to remove it, although"
- echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
- echo "***"
- echo "*** If you have a RedHat 5.0 system, you should remove the GTK package that"
- echo "*** came with the system with the command"
- echo "***"
- echo "*** rpm --erase --nodeps gtk gtk-devel" ],
- [ echo "*** The test program failed to compile or link. See the file config.log for the"
- echo "*** exact error that occured. This usually means GTK was incorrectly installed"
- echo "*** or that you have moved GTK since it was installed. In the latter case, you"
- echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
- CFLAGS="$ac_save_CFLAGS"
- LIBS="$ac_save_LIBS"
+ echo "*** rpm --erase --nodeps gtk gtk-devel" ],
+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
+ echo "*** exact error that occured. This usually means GTK was incorrectly installed"
+ echo "*** or that you have moved GTK since it was installed. In the latter case, you"
+ echo "*** may want to edit the gtk-config script: $GTK_CONFIG" ])
+ CFLAGS="$ac_save_CFLAGS"
+ LIBS="$ac_save_LIBS"
fi
fi
GTK_CFLAGS=""
Index: config/lyxinclude.m4
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/config/lyxinclude.m4,v
retrieving revision 1.71
diff -u -p -r1.71 lyxinclude.m4
--- config/lyxinclude.m4 28 Jul 2002 18:13:45 -0000 1.71
+++ config/lyxinclude.m4 1 Aug 2002 22:11:24 -0000
@@ -646,7 +646,7 @@ lyx_path_header_path=`(eval "$ac_cpp con
sed -e 's/.*\(".*$1"\).*/\1/' -e "1q"`
eval "lyx_cv_path2_${ac_safe}=\$lyx_path_header_path"
rm -f conftest*])
- AC_DEFINE_UNQUOTED($ac_tr_safe, $lyx_path_header_path)])
+ AC_DEFINE_UNQUOTED($ac_tr_safe, $lyx_path_header_path, [dummy])])
])
### end of LYX_PATH_HEADER
@@ -745,7 +745,7 @@ 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})
+ AC_DEFINE_UNQUOTED(HAVE_DECL_${tr_func},1,[dummy])
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
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 1 Aug 2002 22:11:24 -0000
@@ -0,0 +1,43 @@
+dnl Process with autoconf to generate configure script -*- sh -*-
+AC_INIT(reLyX.in)
+AC_PREREQ(2.53)
+AC_CONFIG_AUX_DIR(../../config)
+
+dnl PACKAGE=reLyX
+dnl Do this to install in $datadir/lyx/reLyX instead of $datadir/reLyX/reLyX
+
+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 reLyX noweb2lyx, chmod 755 reLyX noweb2lyx)
+AC_OUTPUT
+
+RELYX_CHECK_ERRORS
Index: po/POTFILES.in
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/po/POTFILES.in,v
retrieving revision 1.287
diff -u -p -r1.287 POTFILES.in
--- po/POTFILES.in 28 Jul 2002 18:13:46 -0000 1.287
+++ po/POTFILES.in 1 Aug 2002 22:11:24 -0000
@@ -50,7 +50,6 @@ src/frontends/qt2/QGraphics.C
src/frontends/qt2/QInclude.C
src/frontends/qt2/QIndex.C
src/frontends/qt2/QLog.C
-src/frontends/qt2/QLyXKeySym.C
src/frontends/qt2/QMinipage.C
src/frontends/qt2/QParagraph.C
src/frontends/qt2/QPreamble.C
Index: src/mathed/dimension.C
===================================================================
RCS file: /usr/local/lyx/cvsroot/lyx-devel/src/mathed/dimension.C,v
retrieving revision 1.2
diff -u -p -r1.2 dimension.C
--- src/mathed/dimension.C 16 Jul 2002 18:22:45 -0000 1.2
+++ src/mathed/dimension.C 1 Aug 2002 22:11:25 -0000
@@ -1,5 +1,5 @@
-
#include <config.h>
+
#include "dimension.h"
#include "math_support.h"
--
Lgb
