diff options
| author | Sebastian Geerken <devnull@localhost> | 2013-05-22 15:30:17 +0200 |
|---|---|---|
| committer | Sebastian Geerken <devnull@localhost> | 2013-05-22 15:30:17 +0200 |
| commit | 1e8db04f1f772c1aa039cef1a33ce6469d57dce7 (patch) | |
| tree | 79ae74f521a36cd7f22f5627e2d268ceee52891d | |
| parent | 77fe59dee756217603a17f6c4bd028a367a517cf (diff) | |
On X11 systems, link to X11 explicitely (on some systems, indirect linking does not seem to work).
| -rw-r--r-- | configure.ac | 27 | ||||
| -rw-r--r-- | src/Makefile.am | 2 |
2 files changed, 28 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 9e38c456..0c4dd953 100644 --- a/configure.ac +++ b/configure.ac @@ -124,6 +124,32 @@ case $fltk_version in AC_MSG_ERROR(FLTK 1.3 required; fltk-config not found) esac +dnl ----------------------------------- +dnl Test for X11 (only on some systems) +dnl ----------------------------------- +AC_MSG_CHECKING([whether to link to X11]) +AC_LANG_PUSH([C++]) +old_libs=$LIBS +old_cxxflags=$CXXFLAGS +LIBS=$LIBFLTK_LIBS +CXXFLAGS=$LIBFLTK_CXXFLAGS +AC_RUN_IFELSE([AC_LANG_PROGRAM([[ +#define FL_INTERNALS +#include <FL/x.H> +]],[[ +#ifdef X_PROTOCOL + return 0; +#else + return 1; +#endif +]])], [AC_MSG_RESULT(yes) + LIBX11_LIBS="-lX11"], + [AC_MSG_RESULT(no)], + [AC_MSG_RESULT(no) + AC_MSG_WARN([*** Test for X11 not possible when cross-compiling. ***])]) +CXXFLAGS=$old_cxxflags +LIBS=$old_libs +AC_LANG_POP([C++]) dnl ---------------- dnl Test for libjpeg @@ -469,6 +495,7 @@ AC_SUBST(LIBFLTK_CXXFLAGS) AC_SUBST(LIBFLTK_CFLAGS) AC_SUBST(LIBFLTK_LIBS) AC_SUBST(LIBICONV_LIBS) +AC_SUBST(LIBX11_LIBS) AC_SUBST(datadir) AC_CONFIG_FILES([ diff --git a/src/Makefile.am b/src/Makefile.am index c4c7949a..65a42cad 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,7 +19,7 @@ dillo_LDADD = \ $(top_builddir)/dw/libDw-core.a \ $(top_builddir)/lout/liblout.a \ @LIBJPEG_LIBS@ @LIBPNG_LIBS@ @LIBFLTK_LIBS@ @LIBZ_LIBS@ \ - @LIBICONV_LIBS@ @LIBPTHREAD_LIBS@ + @LIBICONV_LIBS@ @LIBPTHREAD_LIBS@ @LIBX11_LIBS@ dillo_SOURCES = \ dillo.cc \ |