X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=df1ba41747eb9072fcfb1d66676238aba53ca515;hb=978ecc33092206c9d3ffcead33af5442f3370a5b;hp=e937a5047f9257bff37430a375bf84578ec5e979;hpb=d9cbac2fd3dbcb539bcb89a0972ff7252875bb40;p=lyx.git

diff --git a/configure.ac b/configure.ac
index e937a5047f..df1ba41747 100644
--- a/configure.ac
+++ b/configure.ac
@@ -58,15 +58,12 @@ for file in config/install-sh ; do
   chmod 755 ${srcdir}/${file}
 done
 
-# Check for installed python
 AM_PATH_PYTHON(2.4.0,, :)
+AC_PROG_RANLIB
 
 ### we need to know the byte order for unicode conversions
 AC_C_BIGENDIAN
 
-### check which frontend we want to use
-LYX_USE_FRONTENDS
-
 ### Check for a C++ compiler
 LYX_PROG_CXX
 
@@ -126,39 +123,14 @@ AC_CHECK_HEADERS(magic.h,
    is correctly installed on your system.
    Falling back to builtin file format detection.])])
 
-
-### check which frontend we want to use
-
+### setup the qt4 frontend.
 dnl The code below is not in a macro, because this would cause big
 dnl problems with the AC_REQUIRE contained in QT4_DO_IT_ALL.
-for frontend in $FRONTENDS ; do
-  case "$frontend" in
-    qt4)
-	  QT4_DO_IT_ALL([4.5.0])
-	  FRONTENDS_PROGS="$FRONTENDS_PROGS lyx-qt4\$(EXEEXT)"
-	  FRONTENDS_SUBDIRS="$FRONTENDS_SUBDIRS qt4"
-	  RPM_FRONTEND="qt4"
-	  FRONTEND_INFO="${FRONTEND_INFO}\
+QT4_DO_IT_ALL([4.5.0])
+AC_SUBST([FRONTENDS_SUBDIRS], [qt4])
+FRONTEND_INFO="${FRONTEND_INFO}\
   Qt 4 Frontend:\n\
       Qt 4 version:\t\t${QT4_VERSION}\n"
-dnl qt 4 build will fail without moc, uic, or bc
-	  if test -z "$MOC4"; then
-	    AC_MSG_ERROR([cannot find moc binary.])
-	  fi
-	  if test -z "$UIC4"; then
-	    AC_MSG_ERROR([cannot find uic binary.!])
-	  fi
-	  if test -z "$QT4_LIB"; then
-	    AC_MSG_ERROR([cannot find qt4 library.])
-	  fi
-	  if test "$bc_found" = "no"; then
-	    AC_MSG_ERROR([cannot find bc program.])
-	  fi
-      ;;
-    *)
-	  AC_MSG_ERROR([unknown frontend '$frontend'.]);;
-  esac
-done
 
 # fix the value of the prefixes.
 test "x$prefix" = xNONE && prefix=$default_prefix
@@ -171,16 +143,14 @@ if echo $prefix |grep ' ' >/dev/null 2>/dev/null ; then
   prefix=`pwd`/installprefix
 fi
 
-### Setup GNU gettext
-dnl GNU gettext is written in C
-AC_LANG_PUSH(C)
-dnl Dirty trick ahead: disable macro AC_GNU_SOURCE because it triggers a bug with autoconf 2.62.
-dnl this can be removed if gettext is been updated to avoid that.
-m4_undefine([AC_GNU_SOURCE])
-m4_defun([AC_GNU_SOURCE],[])
-AM_GNU_GETTEXT([no-libtool])
-AM_GNU_GETTEXT_VERSION([0.16.1])
-AC_LANG_POP(C)
+### Setup po directory
+AM_PO_SUBDIRS
+AM_NLS
+if test $USE_NLS = "yes" ; then
+  AC_DEFINE(ENABLE_NLS, 1,
+    [Define to 1 if translation of program messages to the user's native language
+   is requested.])dnl'
+fi
 
 # some standard header files
 AC_HEADER_MAJOR
@@ -192,10 +162,18 @@ AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_TYPE_UID_T
+# Taken from gettext
+AC_CACHE_CHECK([for wchar_t], [gt_cv_c_wchar_t],
+   [AC_TRY_COMPILE([#include <stddef.h>
+      wchar_t foo = (wchar_t)'\0';], ,
+      [gt_cv_c_wchar_t=yes], [gt_cv_c_wchar_t=no])])
+if test $gt_cv_c_wchar_t = yes; then
+  AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.])
+fi
 
 LYX_CHECK_DEF(PATH_MAX, limits.h, [int n = PATH_MAX;])
 
-AC_CHECK_FUNCS(chmod close _close fork getpid _getpid lstat mkfifo open _open pclose _pclose popen _popen readlink strerror unsetenv)
+AC_CHECK_FUNCS(chmod close _close fork getpid _getpid lstat mkfifo open _open pclose _pclose popen _popen readlink setenv strerror unsetenv)
 # Check the form of mkdir()
 AC_FUNC_MKDIR
 AC_FUNC_SELECT_ARGTYPES
@@ -244,7 +222,6 @@ ${FRONTEND_INFO}\
   LyX files dir:                ${real_pkgdatadir}\n"
 
 AC_SUBST(VERSION_INFO)
-AC_SUBST(RPM_FRONTEND)
 AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(AM_CXXFLAGS)
 AC_SUBST(AM_CFLAGS)
@@ -363,7 +340,6 @@ AC_CONFIG_FILES([Makefile \
       development/cygwin/Makefile \
       development/cygwin/lyxrc.dist \
       development/lyx.spec \
-      intl/Makefile \
       lib/lyx.desktop-temp:lib/lyx.desktop.in
       lib/Makefile \
       lib/doc/Makefile \