diff options
| author | Andreas Politz <politza@hochschule-trier.de> | 2017-10-07 21:35:22 +0200 |
|---|---|---|
| committer | Andreas Politz <politza@hochschule-trier.de> | 2017-10-13 07:26:25 +0200 |
| commit | 094b2931de775c734ad353c5d06cf5fc6a55f11d (patch) | |
| tree | 45491cf48187b1b60d17b679ee7c2782b2789485 | |
| parent | f13f9e649408d2afb615f2156ddc048e17c4087e (diff) | |
Link against shlwapi on windows systems
| -rw-r--r-- | server/Makefile.am | 4 | ||||
| -rw-r--r-- | server/configure.ac | 18 |
2 files changed, 18 insertions, 4 deletions
diff --git a/server/Makefile.am b/server/Makefile.am index dacd047..5a5a7a6 100644 --- a/server/Makefile.am +++ b/server/Makefile.am @@ -11,6 +11,10 @@ libsynctex_a_SOURCES = synctex_parser.c synctex_parser_utils.c synctex_parser.h synctex_parser_local.h synctex_parser_utils.h libsynctex_a_CFLAGS = -w $(zlib_CFLAGS) +if HAVE_W32 +epdfinfo_LDADD += -lshlwapi +endif + SYNCTEX_UPSTREAM = svn://tug.org/texlive/tags/texlive-2017.1/Build/source/texk/web2c/synctexdir SYNCTEX_FILES = synctex_parser.c \ synctex_parser.h \ diff --git a/server/configure.ac b/server/configure.ac index 8bf87d8..2d3fcf9 100644 --- a/server/configure.ac +++ b/server/configure.ac @@ -28,10 +28,20 @@ PKG_CHECK_EXISTS([poppler-glib >= 0.22], [HAVE_POPPLER_FIND_OPTS=yes]) PKG_CHECK_EXISTS([poppler-glib >= 0.26], [HAVE_POPPLER_ANNOT_MARKUP=yes]) PKG_CHECK_MODULES([zlib], [zlib]) -AM_CONDITIONAL(HAVE_MSYS2, [test "$MSYSTEM" = MINGW32 -o "$MSYSTEM" = MINGW64]) - -# glib won't work properly on msys2 without it. -AM_COND_IF(HAVE_MSYS2, [CFLAGS="-D__USE_MINGW_ANSI_STDIO=1 $CFLAGS"]) +AC_COMPILE_IFELSE( + [AC_LANG_PROGRAM([[ + #ifndef _WIN32 + error + #endif + ]])], [have_w32=true], [have_w32=false]) +AM_CONDITIONAL(HAVE_W32, [test "$have_w32" = true]) + +if test "$have_w32" = true; then + if test "$MSYSTEM" = MINGW32 -o "$MSYSTEM" = MINGW64; then + # glib won't work properly on msys2 without it. + CFLAGS="-D__USE_MINGW_ANSI_STDIO=1 $CFLAGS" + fi +fi SAVED_CPPFLAGS=$CPPFLAGS CPPFLAGS=$poppler_CFLAGS |