Changeset 2726 for trunk

Timestamp:

Dec 9, 2011, 12:28:45 PM (13 years ago)

Author:

gah

Message:

 

Location:

trunk

Files:

• configure (modified) (6 diffs)
• configure.in (modified) (5 diffs)

trunk/configure

@@ -609 +609 @@
 TK_VERSION
 TK_XLIBSW
-TCL_SHLIB_LD
-TCL_SHLIB_CFLAGS
-TCL_SHLIB_LDFLAGS
-TCL_SHLIB_SUFFIX
 TK_LIB_SPEC
 TK_INC_SPEC
 TCL_VERSION
+TCL_SHLIB_SUFFIX
+TCL_SHLIB_LDFLAGS
+TCL_SHLIB_LD
+TCL_SHLIB_CFLAGS
+TCL_CFLAGS_OPTIMIZE
+TCL_CFLAGS_DEBUG
 TCL_LIB_SPEC
 TCL_INC_SPEC
@@ -4912 +4914 @@
 fi
 
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for clrtoeol in -lncurses" >&5
+$as_echo_n "checking for clrtoeol in -lncurses... " >&6; }
+if ${ac_cv_lib_ncurses_clrtoeol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  ac_check_lib_save_LIBS=$LIBS
+LIBS="-lncurses  $LIBS"
+cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+/* Override any GCC internal prototype to avoid an error.
+   Use char because int might match the return type of a GCC
+   builtin and then its argument prototype would still apply.  */
+#ifdef __cplusplus
+extern "C"
+#endif
+char clrtoeol ();
+int
+main ()
+{
+return clrtoeol ();
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_cxx_try_link "$LINENO"; then :
+  ac_cv_lib_ncurses_clrtoeol=yes
+else
+  ac_cv_lib_ncurses_clrtoeol=no
+fi
+rm -f core conftest.err conftest.$ac_objext \
+    conftest$ac_exeext conftest.$ac_ext
+LIBS=$ac_check_lib_save_LIBS
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_ncurses_clrtoeol" >&5
+$as_echo "$ac_cv_lib_ncurses_clrtoeol" >&6; }
+if test "x$ac_cv_lib_ncurses_clrtoeol" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_LIBNCURSES 1
+_ACEOF
+
+  LIBS="-lncurses $LIBS"
+
+else
+  as_fn_error $? "ncursers library missing?" "$LINENO" 5
+fi
+
+for ac_header in ncurses.h
+do :
+  ac_fn_cxx_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
+if test "x$ac_cv_header_ncurses_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_NCURSES_H 1
+_ACEOF
+
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: ncurses headers missing ?" >&5
+$as_echo "$as_me: WARNING: ncurses headers missing ?" >&2;}
+fi
+
+done
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -lstdc++" >&5
 $as_echo_n "checking for main in -lstdc++... " >&6; }
@@ -9688 +9754 @@
 
 
-
 HAVE_FFMPEG_LIBS=""
 if test "${with_ffmpeg}" != "no"; then
@@ -9864 +9929 @@
   LIBS="-lswscale $LIBS"
 
-else
-  as_fn_error $? "librappture requires libswscale" "$LINENO" 5
 fi
 
@@ -10004 +10067 @@
 fi
 
+  for ac_func in sws_getCachedContext
+do :
   ac_fn_cxx_check_func "$LINENO" "sws_getCachedContext" "ac_cv_func_sws_getCachedContext"
 if test "x$ac_cv_func_sws_getCachedContext" = xyes; then :
-
-else
-  as_fn_error $? "oops! no sws_getCachedContext ?!?" "$LINENO" 5
-fi
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_SWS_GETCACHEDCONTEXT 1
+_ACEOF
+
+fi
+done
 
   for ac_func in img_convert
@@ -10082 +10149 @@
 
 MAKE=${make_command}
+
+
+
+
+
+
+
 
 

trunk/configure.in

@@ -60 +60 @@
 
 AC_CHECK_LIB(m, main,,AC_MSG_ERROR(librappture requires libm))
+
+AC_CHECK_LIB(ncurses, clrtoeol,,AC_MSG_ERROR([ncursers library missing?]))
+AC_CHECK_HEADERS(ncurses.h,,AC_MSG_WARN(ncurses headers missing ?))
+
 AC_CHECK_LIB(stdc++, main,,AC_MSG_ERROR(librappture requires libstdc++))
 AC_CHECK_HEADERS(algorithm,,AC_MSG_WARN(STL classes missing ?))
@@ -338 +342 @@
 ]])
 
-
 HAVE_FFMPEG_LIBS=""
 if test "${with_ffmpeg}" != "no"; then
@@ -355 +358 @@
   AC_CHECK_LIB(avutil, main,,AC_MSG_ERROR(librappture requires libavutil))
   AC_CHECK_LIB(avformat, main,,AC_MSG_ERROR(librappture requires libavformat))
-  AC_CHECK_LIB(swscale, main,,AC_MSG_ERROR(librappture requires libswscale))
+  AC_CHECK_LIB(swscale, main)
   AC_CHECK_FUNCS(avcodec_decode_video2)
   AC_CHECK_FUNCS(avcodec_decode_video)
@@ -377 +380 @@
     AC_MSG_ERROR(oops! no avpicture_get_size ?!?))
   AC_CHECK_FUNC(avpicture_fill,,AC_MSG_ERROR(oops! no avpicture_fill ?!?))
-  AC_CHECK_FUNC(sws_getCachedContext,,
-    AC_MSG_ERROR(oops! no sws_getCachedContext ?!?))
+  AC_CHECK_FUNCS(sws_getCachedContext)
   AC_CHECK_FUNCS(img_convert)
   AC_CHECK_FUNCS(sws_scale)
@@ -461 +463 @@
 AC_SUBST(TCL_INC_SPEC)
 AC_SUBST(TCL_LIB_SPEC)
+AC_SUBST(TCL_CFLAGS_DEBUG)
+AC_SUBST(TCL_CFLAGS_OPTIMIZE)
+AC_SUBST(TCL_SHLIB_CFLAGS)
+AC_SUBST(TCL_SHLIB_LD)
+AC_SUBST(TCL_SHLIB_LDFLAGS)
+AC_SUBST(TCL_SHLIB_SUFFIX)
 AC_SUBST(TCL_VERSION)
 AC_SUBST(TCL_VERSION)
 AC_SUBST(TK_INC_SPEC)
 AC_SUBST(TK_LIB_SPEC)
+AC_SUBST(TCL_CFLAGS_DEBUG)
+AC_SUBST(TCL_SHLIB_CFLAGS)
 AC_SUBST(TCL_SHLIB_SUFFIX)
+AC_SUBST(TCL_SHLIB_LD)
 AC_SUBST(TCL_SHLIB_LDFLAGS)
-AC_SUBST(TCL_SHLIB_CFLAGS)
-AC_SUBST(TCL_SHLIB_LD)
 AC_SUBST(TK_XLIBSW)
 AC_SUBST(TK_VERSION)