X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=configure.ac;h=17a463af5a6771ac076a95746ff31d4988875b6a;hb=9b7ccbfc8016398705583d6973395dfb46dceb8f;hp=f97622aafb1beed2d0c2dfa683a2a4684c4e4639;hpb=4f3d9d0092cbc82dc3b1228344ef0300e88efe06;p=lyx.git

diff --git a/configure.ac b/configure.ac
index f97622aafb..17a463af5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -213,7 +213,7 @@ save_LIBS="$LIBS"
 LIBS=
 AC_CHECK_FUNCS(fcntl,
   [AC_SEARCH_LIBS([gethostbyname], [nsl])
-   AC_SEARCH_LIBS([socket], [socket], [],
+   AC_SEARCH_LIBS([socket], [socket network], [],
      [AC_CHECK_LIB([socket], [socket], [LIBS="-lsocket -lnsl $LIBS"],
 		[], [-lnsl])])],
   [lyx_client_subdir=false])
@@ -276,6 +276,10 @@ AH_BOTTOM([
 /************************************************************
  ** You should not need to change anything beyond this point */
 
+#if __cplusplus >= 201103L || defined(__GXX_EXPERIMENTAL_CXX0X__)
+#define LYX_USE_CXX11
+#endif
+
 #ifndef HAVE_STRERROR
 #if defined(__cplusplus)
 extern "C"