AC_CONFIG_AUX_DIR(config)
PACKAGE=lyx${program_suffix}
-VERSION="1.2.0pre5"
+VERSION="1.3.0cvs"
LYX_CHECK_VERSION
AC_CANONICAL_SYSTEM
### 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
- gnome)
- GNOME_INIT
- GNOME_COMPILE_WARNINGS
- GNOME_X_CHECKS
-esac
+
+#old gnome stuff removed by Michael Koziarski 25-05-2002
### Check for a C++ compiler
LYX_PROG_CXX
[Define if you want assertions to be enabled in the code])
fi
-### We need a regex implementation, so we provide our own if none is found.
-LYX_REGEX
-
### 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)
-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")
-fi
-AC_SUBST(AIKSAURUS_LIBS)
### Add extra directories to check for libraries.
LYX_WITH_DIR([extra-lib],[extra library directory],extra_lib, NONE)
LYX_ADD_INC_DIR(CPPFLAGS,$dir/include)
LYX_ADD_LIB_DIR(LDFLAGS,$dir/lib)])
-### Check for the -liberty library
-test "x$GXX" = xyes && lyx_use_liberty=yes
-AC_ARG_WITH(liberty,
- [ --without-liberty do not try to link against libiberty.a],
- [lyx_use_liberty=$withval])
-if test x$lyx_use_liberty = xyes; then
- # AC_CHECK_LIB(iberty,main,LIBS="-liberty $LIBS")
- AC_CHECK_LIB(iberty,main)
+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")
fi
+AC_SUBST(AIKSAURUS_LIBS)
### Setup libtool
AC_DISABLE_SHARED
#AM_PROG_LIBTOOL
LYX_PROG_LIBTOOL
-### Check which libsigc++ we're using
-LYX_WITH_SIGC
-
### Check if we want pspell libraries
CHECK_WITH_PSPELL
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
- LYX_PATH_XPM
- LYX_PATH_XFORMS
FRONTEND="xforms"
- FRONTEND_GUILIB="xforms/*.lo"
+ FRONTEND_GUILIB="xforms/*.lo xforms/forms/*.lo"
FRONTEND_INCLUDES="-I\$(srcdir)/xforms"
- FRONTEND_LIBS="@XFORMS_LIB@ @XPM_LIB@"
+ 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=`cat <<EOF
libXpm version: ${XPM_VERSION}\n\
libforms version: ${XFORMS_VERSION}\n
`
;;
gnome)
- LYX_PATH_XPM
- LYX_PATH_XFORMS
- AM_PATH_GTKMM(1.2.1,,
- AC_MSG_ERROR(Cannot find GTK--: Please install Version 1.2.1+))
- AM_PATH_GNOMEMM
-
-dnl ******************************
-dnl LibGlade checking
-dnl ******************************
-dnl Ensure gnome-config is available...
- AC_PATH_PROG(GNOME_CONFIG, gnome-config, no)
- AC_MSG_CHECKING(for Glade libraries)
- if $GNOME_CONFIG --libs libglade > /dev/null 2>&1; then
- AC_MSG_RESULT(found)
- else
- AC_MSG_ERROR(Did not find libGlade installed)
- fi
+ 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="\$(GNOMEMM_LIBDIR)"
- FRONTEND_INCLUDES="-I\${srcdir}/gnome -I\${srcdir}/xforms \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS) `gnome-config --cflags libglade gnomeui`"
- FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ \$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade gnomeui`";;
+ 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)
- LYX_PATH_XPM
- LYX_PATH_XFORMS
QT2_DO_IT_ALL
FRONTEND="qt2"
- FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo qt2/xforms/*.lo"
+ FRONTEND_GUILIB="qt2/*.lo qt2/ui/*.lo qt2/moc/*.lo qt2/ui/moc/*.lo"
FRONTEND_LDFLAGS="\$(QT2_LDFLAGS)"
- FRONTEND_INCLUDES="-I\${srcdir}/qt2 -I\${top_srcdir}/src/frontends/xforms \$(QT2_INCLUDES)"
- FRONTEND_LIBS="@XPM_LIB@ @XFORMS_LIB@ \$(QT2_LIBS)";;
+ FRONTEND_INCLUDES="-I\${srcdir}/qt2 \$(QT2_INCLUDES)"
+ FRONTEND_LIBS="\$(QT2_LIBS)";;
*)
LYX_ERROR(Unknown frontend $lyx_use_frontend);;
esac
### For now, run this test always so config.h is unchanged by a change in
### frontend
LYX_USE_XFORMS_IMAGE_LOADER
-LYX_XFORMS_IMAGE_LOADER_NEEDS_JPEG
### Setup GNU gettext
dnl GNUÂ gettext is written in C
AC_HEADER_MAJOR
AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h)
-# some annoying header files
-#LYX_PATH_HEADER(stl_string_fwd.h)
-LYX_STL_STRING_FWD
-
# some standard structures
AC_HEADER_STAT
AC_HEADER_TIME
real_datadir=`eval "echo \`eval \"echo ${datadir}/${PACKAGE}\"\`"`
VERSION_INFO=`cat <<EOF
Configuration\n\
- Host type: ${host_alias}\n\
+ Host type: ${host}\n\
Special build flags: ${lyx_flags}\n\
C Compiler: ${CC}\n\
C Compiler flags: ${CFLAGS}\n\
AC_SUBST(VERSION_INFO)
### Finish the work.
-AC_CONFIG_SUBDIRS(sigc++ lib lib/reLyX)
+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/lyx.spec \
lib/Makefile \
src/frontends/xforms/Makefile \
src/frontends/xforms/forms/Makefile \
src/frontends/qt2/Makefile \
- src/frontends/qt2/xforms/Makefile \
src/frontends/qt2/moc/Makefile \
src/frontends/qt2/ui/Makefile \
src/frontends/qt2/ui/moc/Makefile \
projects / lyx.git / blobdiff