avoid -lrt, gettimeofday isn't that bad for our purposes

diff --git a/config.h.in b/config.h.in
index c17272b8d7de2b78bb0bce9a5c50239c28b75c54..eed72eec9bf791789bfbabe38a13f6a5fd938a38 100644 (file)
--- a/config.h.in
+++ b/config.h.in
@@ -100,9 +100,6 @@
 /* Define to 1 if you have the <libutil.h> header file. */
 #undef HAVE_LIBUTIL_H
 
-/* Define to 1 if you have the `Xft' library (-lXft). */
-#undef HAVE_LIBXFT
-
 /* Define to 1 if you have the <memory.h> header file. */
 #undef HAVE_MEMORY_H
 

diff --git a/configure b/configure
index 066703b3808f4c6d5015ff401ca93fd65f1c60c5..b076a703ff06b3b5b1fb71eb9254e4d8475a5068 100755 (executable)
--- a/configure
+++ b/configure
@@ -4894,6 +4894,7 @@ fi
 
 
 
+LIBEV_M4_AVOID_LIBRT=1
 
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -5691,6 +5692,7 @@ if test $ac_cv_func_clock_gettime = yes; then
   :
 else
 
+   if test -z "$LIBEV_M4_AVOID_LIBRT"; then
 
 { echo "$as_me:$LINENO: checking for clock_gettime in -lrt" >&5
 echo $ECHO_N "checking for clock_gettime in -lrt... $ECHO_C" >&6; }
@@ -5856,6 +5858,7 @@ _ACEOF
 fi
 done
 
+   fi
 
 fi
 
@@ -13026,6 +13029,8 @@ fi
     fi
   fi
 
+  save_LIBS="$LIBS"
+  LIBS="$LIBS $X_LIBS"
 
 for ac_header in X11/Xft/Xft.h
 do
@@ -13168,10 +13173,7 @@ fi
 
 done
 
-  ac_save_LIBS="$LIBS"
-  LIBS="$LIBS $X_LIBS"
-
-{ echo "$as_me:$LINENO: checking for XftDrawString32 in -lXft" >&5
+  { echo "$as_me:$LINENO: checking for XftDrawString32 in -lXft" >&5
 echo $ECHO_N "checking for XftDrawString32 in -lXft... $ECHO_C" >&6; }
 if test "${ac_cv_lib_Xft_XftDrawString32+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -13233,17 +13235,12 @@ fi
 { echo "$as_me:$LINENO: result: $ac_cv_lib_Xft_XftDrawString32" >&5
 echo "${ECHO_T}$ac_cv_lib_Xft_XftDrawString32" >&6; }
 if test $ac_cv_lib_Xft_XftDrawString32 = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_LIBXFT 1
-_ACEOF
-
-  LIBS="-lXft $LIBS"
-
+  :
 else
   support_xft=no
 fi
 
-  LIBS="$ac_save_LIBS"
+  LIBS="$save_LIBS"
 
   if test x$support_xft = xyes; then
 

diff --git a/configure.ac b/configure.ac
index 119a29012610f5014ba5e628ac34ab003afd2449..1971bf010b532d32e28cb71d14c27ccd2f9e9f24 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -438,6 +438,7 @@ AC_ARG_WITH(terminfo,
 
 dnl# --------------------------------------------------------------------------
 
+LIBEV_M4_AVOID_LIBRT=1
 m4_include([libev/libev.m4])
 
 dnl# --------------------------------------------------------------------------