### 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
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)
AC_CHECK_LIB(iberty,main)
fi
+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
AC_LIBTOOL_WIN32_DLL
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
AC_CONFIG_SUBDIRS(sigc++ 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 \