X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=38085adf683f17aa60887f9ac7640e2dc65af0f0;hb=e5e65c031c05dee8caa0995219c208ecd5e80dde;hp=5d2650036ab034a0dc0e5d32616444315a5f7ea9;hpb=8518086ebebc243d63d88a39d51479dfb2d15130;p=lyx.git

diff --git a/configure.ac b/configure.ac
index 5d2650036a..38085adf68 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
 dnl Process with autoconf to generate configure script   -*- sh -*-
 
 AC_INIT(LyX,1.6.0svn,[lyx-devel@lists.lyx.org],[lyx])
-AC_SUBST(LYX_DATE, ["Wed, Jun 27, 2007"])
+AC_SUBST(LYX_DATE, ["Fri, Aug 1, 2008"])
 AC_PREREQ(2.52)
 AC_CONFIG_SRCDIR(src/main.cpp)
-AC_CONFIG_HEADERS([src/config.h])
+AC_CONFIG_HEADERS([config.h])
 
 AC_CONFIG_AUX_DIR(config)
 
@@ -34,19 +34,8 @@ for file in config/install-sh config/mkinstalldirs ; do
 done
 
 ### Check for programs
-AC_PROG_MAKE_SET
-AC_PROG_INSTALL
-
-AC_PROG_AWK
-test "$AWK" = gawk && AWK="gawk --posix"
-
-#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)
+dnl AC_PROG_MAKE_SET
+dnl AC_PROG_INSTALL
 
 # Check for installed python
 AM_PATH_PYTHON(2.3,, :)
@@ -59,10 +48,7 @@ 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
+AC_USE_SYSTEM_EXTENSIONS
 
 ### we need to know the byte order for unicode conversions
 AC_C_BIGENDIAN
@@ -78,13 +64,17 @@ dnl we do not need that currently (and probably all our supported
 dnl compiler allow that)
 dnl LYX_CXX_PARTIAL
 dnl LYX_CXX_EXPLICIT
-LYX_CXX_GLOBAL_CSTD
+dnl LYX_CXX_GLOBAL_CSTD
 dnl LYX_STD_COUNT
 dnl we disable rtti for now
 dnl LYX_CXX_RTTI
 dnl AC_CHECK_HEADERS(ostream istream sstream locale limits ios)
 dnl LYX_CXX_STL_MODERN_STREAMS
 
+### Objective-C compiler
+AC_PROG_OBJC
+_AM_DEPENDENCIES([OBJC])
+
 ### and now some special lyx flags.
 AC_ARG_ENABLE(assertions,
   AC_HELP_STRING([--enable-assertions],[add runtime sanity checks in the program]),,
@@ -230,7 +220,12 @@ 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
+AM_GNU_GETTEXT_VERSION([0.16.1])
 AC_LANG_POP(C)
 
 # some standard header files
@@ -312,19 +307,12 @@ ${FRONTEND_INFO}\
   LyX binary dir:               ${real_bindir}\n\
   LyX files dir:                ${real_pkgdatadir}\n"
 
-MSYS_AC_CANONICAL_PATH(LYX_ABS_TOP_SRCDIR, ${srcdir})
-MSYS_AC_CANONICAL_PATH(LYX_ABS_INSTALLED_LOCALEDIR, ${real_localedir})
-MSYS_AC_CANONICAL_PATH(LYX_ABS_INSTALLED_DATADIR, ${real_pkgdatadir})
-
 AC_SUBST(VERSION_INFO)
 AC_SUBST(RPM_FRONTEND)
 AC_SUBST(AM_CPPFLAGS)
 AC_SUBST(AM_CXXFLAGS)
 AC_SUBST(AM_CFLAGS)
 AC_SUBST(AM_LDFLAGS)
-AC_SUBST(LYX_ABS_TOP_SRCDIR)
-AC_SUBST(LYX_ABS_INSTALLED_LOCALEDIR)
-AC_SUBST(LYX_ABS_INSTALLED_DATADIR)
 
 ## Some config.h stuff
 
@@ -418,12 +406,6 @@ AC_ARG_ENABLE(monolithic-client,
   [enable_monolithic_client=no])
 AM_CONDITIONAL(MONOLITHIC_CLIENT, test "$enable_monolithic_client" = "yes")
 
-AC_ARG_ENABLE(monolithic-controllers,
-  AC_HELP_STRING([--enable-monolithic-controllers],
-		[Use monolithic controllers compilations]),,
-  [enable_monolithic_controllers=no])
-AM_CONDITIONAL(MONOLITHIC_CONTROLLERS, test "$enable_monolithic_controllers" = "yes")
-
 AC_ARG_ENABLE(monolithic-insets,
   AC_HELP_STRING([--enable-monolithic-insets],
 		[Use monolithic insets compilations]),,
@@ -454,14 +436,28 @@ AC_ARG_ENABLE(monolithic-frontend-qt4,
   [enable_monolithic_frontend_qt4=no])
 AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT4, test "$enable_monolithic_frontend_qt4" = "yes")
 
+MSYS_AC_CANONICAL_PATH(lyx_abs_top_srcdir, ${srcdir})
+MSYS_AC_CANONICAL_PATH(lyx_abs_installed_localedir, ${real_localedir})
+MSYS_AC_CANONICAL_PATH(lyx_abs_installed_datadir, ${real_pkgdatadir})
+
+AC_DEFINE_UNQUOTED([LYX_ABS_TOP_SRCDIR],
+	"${lyx_abs_top_srcdir}", [Top source directory])
+AC_DEFINE_UNQUOTED([LYX_ABS_INSTALLED_LOCALEDIR],
+	"${lyx_abs_installed_localedir}",[Hard coded locale directory])
+AC_DEFINE_UNQUOTED([LYX_ABS_INSTALLED_DATADIR],
+	"${lyx_abs_installed_datadir}",[Hard system support directory])
+AC_DEFINE_UNQUOTED([PROGRAM_SUFFIX],
+	"${version_suffix}",[Program version suffix])
+
 AC_DEFINE_UNQUOTED([LYX_DATE],"$LYX_DATE",[Date of release])
 AC_DEFINE_UNQUOTED([VERSION_INFO],"$VERSION_INFO",[Full version info])
+AC_DEFINE_UNQUOTED([LYX_DIR_VER],"$lyx_dir_ver",[Versioned env var for system dir])
+AC_DEFINE_UNQUOTED([LYX_USERDIR_VER],"$lyx_userdir_ver",[Versioned env var for user dir])
 AC_DEFINE_UNQUOTED([LYX_MAJOR_VERSION],$lyx_major,[Major version number])
 AC_DEFINE_UNQUOTED([LYX_MINOR_VERSION],$lyx_minor,[Minor version number])
 AC_DEFINE_UNQUOTED([LYX_RELEASE_LEVEL],$lyx_release,[Release version number])
 AC_DEFINE_UNQUOTED([LYX_RELEASE_PATCH],$lyx_patch,[Patch version number])
 
-
 AC_CONFIG_FILES([Makefile
       boost/Makefile \
       config/Makefile \
@@ -485,7 +481,6 @@ AC_CONFIG_FILES([Makefile
       src/tex2lyx/Makefile \
       src/support/Makefile \
       src/frontends/Makefile \
-      src/frontends/controllers/Makefile \
       src/frontends/qt4/Makefile
 ])
 
@@ -503,7 +498,6 @@ if test x$with_qmake = xyes ; then
 		rm src/tex2lyx/Makefile
 		rm src/support/Makefile
 		rm src/frontends/Makefile
-		rm src/frontends/controllers/Makefile
 		rm src/frontends/qt4/Makefile
 		rm -rf boost/.deps
 		rm -rf src/client/.deps
@@ -511,7 +505,6 @@ if test x$with_qmake = xyes ; then
 		rm -rf src/tex2lyx/.deps
 		rm -rf src/support/.deps
 		rm -rf src/frontends/.deps
-		rm -rf src/frontends/controllers/.deps
 		rm -rf src/frontends/qt4/.deps
 		${srcdir}/development/qmake/doit
 	fi