X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=e010c8175dad6ef12f291a54d19436c84c2983e8;hb=2417d9d911dbca181c48f45d1aad26d31c9aa815;hp=b23313e2ed6125d4da9fe5f37b2fcbca9ed0e0b6;hpb=6d5a52b8e36152cc8a1e37f08848102f2a81c1d6;p=lyx.git

diff --git a/configure.ac b/configure.ac
index b23313e2ed..e010c8175d 100644
--- 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
@@ -236,7 +239,7 @@ AC_LANG_POP(C)
 # some standard header files
 AC_HEADER_DIRENT
 AC_HEADER_MAJOR
-AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h io.h process.h NewAPIs.h)
+AC_CHECK_HEADERS(sys/time.h sys/types.h sys/select.h strings.h locale.h io.h process.h NewAPIs.h utime.h sys/utime.h)
 
 # some standard structures
 AC_HEADER_STAT
@@ -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
 
@@ -410,49 +406,62 @@ AC_ARG_ENABLE(monolithic-boost,
   AC_HELP_STRING([--enable-monolithic-boost],
 		[Use monolithic boost compilations]),,
   [enable_monolithic_boost=no])
-AM_CONDITIONAL(MONOLITHIC_BOOST, test $enable_monolithic_boost = yes)
+AM_CONDITIONAL(MONOLITHIC_BOOST, test "$enable_monolithic_boost" = "yes")
 
 AC_ARG_ENABLE(monolithic-client,
   AC_HELP_STRING([--enable-monolithic-client],
 		[Use monolithic client compilations]),,
   [enable_monolithic_client=no])
-AM_CONDITIONAL(MONOLITHIC_CLIENT, test $enable_monolithic_client = yes)
+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)
+AM_CONDITIONAL(MONOLITHIC_CONTROLLERS, test "$enable_monolithic_controllers" = "yes")
 
 AC_ARG_ENABLE(monolithic-insets,
   AC_HELP_STRING([--enable-monolithic-insets],
 		[Use monolithic insets compilations]),,
   [enable_monolithic_insets=no])
-AM_CONDITIONAL(MONOLITHIC_INSETS, test $enable_monolithic_insets = yes)
+AM_CONDITIONAL(MONOLITHIC_INSETS, test "$enable_monolithic_insets" = "yes")
 
 AC_ARG_ENABLE(monolithic-mathed,
   AC_HELP_STRING([--enable-monolithic-mathed],
 		[Use monolithic mathed compilations]),,
   [enable_monolithic_mathed=no])
-AM_CONDITIONAL(MONOLITHIC_MATHED, test $enable_monolithic_mathed = yes)
+AM_CONDITIONAL(MONOLITHIC_MATHED, test "$enable_monolithic_mathed" = "yes")
 
 AC_ARG_ENABLE(monolithic-core,
   AC_HELP_STRING([--enable-monolithic-core],
 		[Use monolithic core files compilations]),,
   [enable_monolithic_core=no])
-AM_CONDITIONAL(MONOLITHIC_CORE, test $enable_monolithic_core = yes)
+AM_CONDITIONAL(MONOLITHIC_CORE, test "$enable_monolithic_core" = "yes")
 
 AC_ARG_ENABLE(monolithic-tex2lyx,
   AC_HELP_STRING([--enable-monolithic-tex2lyx],
 		[Use monolithic tex2lyx compilations]),,
   [enable_monolithic_tex2lyx=no])
-AM_CONDITIONAL(MONOLITHIC_TEX2LYX, test $enable_monolithic_tex2lyx = yes)
+AM_CONDITIONAL(MONOLITHIC_TEX2LYX, test "$enable_monolithic_tex2lyx" = "yes")
 
 AC_ARG_ENABLE(monolithic-frontend-qt4,
   AC_HELP_STRING([--enable-monolithic-frontend-qt4],
 		[Use monolithic compilation of the Qt 4 frontend. Only recommended with > 512 MB of RAM]),,
   [enable_monolithic_frontend_qt4=no])
-AM_CONDITIONAL(MONOLITHIC_FRONTEND_QT4, test $enable_monolithic_frontend_qt4 = yes)
+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])
@@ -461,7 +470,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 \