cmake merge: declare before instantiate

[lyx.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5d2650036ab034a0dc0e5d32616444315a5f7ea9..f082e225e0adf332c85cb88b714933c98c2c7531 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -33,6 +33,9 @@ for file in config/install-sh config/mkinstalldirs ; do
   chmod 755 ${srcdir}/${file}
 done
 
+### Provide a dummy POTFILES.in in po in order to mark it as a PO directory
+test -f ${srcdir}/po/POTFILES.in || touch ${srcdir}/po/POTFILES.in
+
 ### Check for programs
 AC_PROG_MAKE_SET
 AC_PROG_INSTALL
@@ -312,19 +315,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 +414,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,6 +444,19 @@ 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_MAJOR_VERSION],$lyx_major,[Major version number])
@@ -461,7 +464,6 @@ 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 +487,6 @@ AC_CONFIG_FILES([Makefile
       src/tex2lyx/Makefile \
       src/support/Makefile \
       src/frontends/Makefile \
-      src/frontends/controllers/Makefile \
       src/frontends/qt4/Makefile
 ])
 
@@ -503,7 +504,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 +511,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