X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.in;h=1a495887071871027f125c6c8c0a1d7f00070c72;hb=25e82b07459282a13ac1fd00a9b58ba595c7b6a0;hp=c9c287a0e0597a98b8b1904835197474c5a19518;hpb=9634d8c469731de52ce7995b44990cee0f5d1af5;p=lyx.git diff --git a/configure.in b/configure.in index c9c287a0e0..1a49588707 100644 --- a/configure.in +++ b/configure.in @@ -20,9 +20,7 @@ AM_INIT_AUTOMAKE($lyxname, $VERSION) # The list of languages known to LyX # This is needed by GNU gettext -ALL_LINGUAS="ca cs da de es eu fi fr he hu it nl no pl pt ro ru sl sv tr wa" - -AC_PREFIX_PROGRAM(lyx) +ALL_LINGUAS="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 @@ -114,12 +112,12 @@ 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], + [ --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_CHECK_LIB(Aiksaurus, main, [AC_DEFINE(HAVE_LIBAIKSAURUS,,[Define this if you have the AikSaurus library]) - AIKSAURUS_LIBS="-lAikSaurus -lbz2" + AIKSAURUS_LIBS="-lAiksaurus -lbz2" ],,"-lbz2") fi AC_SUBST(AIKSAURUS_LIBS) @@ -163,8 +161,8 @@ LYX_WITH_SIGC CHECK_WITH_PSPELL ### Check for X libraries -# Check for the pt library (for SCO, needed for X) -AC_CHECK_LIB(pt,ptsname,X_EXTRA_LIBS="-lpt $X_EXTRA_LIBS") +dnl # Check for the pt library (for SCO, needed for X) +dnl AC_CHECK_LIB(pt,ptsname,X_EXTRA_LIBS="-lpt $X_EXTRA_LIBS") # The real thing. AC_PATH_XTRA LIBS="$X_PRE_LIBS $LIBS $X_LIBS -lX11 $X_EXTRA_LIBS" @@ -210,8 +208,8 @@ dnl Ensure gnome-config is available... FRONTEND="gnome" FRONTEND_GUILIB="gnome/libgnome.la" FRONTEND_LDFLAGS="\$(GNOMEMM_LIBDIR)" - FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS)" - FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade`";; + FRONTEND_INCLUDES="-I\${srcdir}/gnome \$(GNOMEMM_INCLUDEDIR) \$(GTKMM_CFLAGS) `gnome-config --cflags libglade gnomeui`" + FRONTEND_LIBS="\$(GNOMEMM_LIBS) \$(GTKMM_LIBS) `gnome-config --libs libglade gnomeui`";; qt2) QT2_DO_IT_ALL FRONTEND="qt2" @@ -262,7 +260,7 @@ 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) +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)