Changeset 8061 in orxonox.OLD for trunk/configure.ac

Timestamp:

Jun 1, 2006, 1:59:42 PM (19 years ago)

Author:

bensch

Message:

merged the scriptengine back to the trunk

File:

• trunk/configure.ac (modified) (4 diffs)

trunk/configure.ac

@@ -310 +310 @@
     AC_CHECK_LIB([winmm], [main], [FOUND_winmm=yes])
     if test x${FOUND_winmm} = xyes ; then
-        LIBS="$LIBS -lwinmm"
+        LIBS="$LIBS -lwinmm"
     fi
 
@@ -524 +524 @@
 #--------#
 # checking for FFmpeg-headers
-  AC_CHECK_HEADERS([avformat.h] ,,
-      [AC_CHECK_HEADERS([ffmpeg/avformat.h] ,,AC_MSG_ERROR([cannot find FFmpeg header.])]))
-# checking for ffmpeg-lib
-  AC_CHECK_LIB([avformat], [main], [FOUND_avformat=yes; LIBS="$LIBS -lavformat"])
-     if test x$FOUND_avformat != xyes ; then
-        echo "------------------"
-        echo "avformat library not found."
-        echo "please install the FFmpeg library, which can be found at http://ffmpeg.sourceforge.net"
-        echo "------------------"
-        exit -1
-     fi
-  AC_CHECK_HEADERS([avcodec.h] ,,
-      [AC_CHECK_HEADERS([ffmpeg/avcodec.h] ,,AC_MSG_ERROR([cannot find FFmpeg header.])]))
-  AC_CHECK_LIB([avcodec], [main], [FOUND_avcodec=yes; LIBS="$LIBS -lavcodec"])
-     if test x$FOUND_avcodec != xyes ; then
-        echo "------------------"
-        echo "avcodec library not found."
-        echo "please install the FFmpeg library, which can be found at http://ffmpeg.sourceforge.net"
-        echo "------------------"
-        exit -1
-     fi
+  AX_CHECK_REQUIRED_HEADER_LIB([avformat.h ffmpeg/avformat.h] ,[avformat], [main],
+   [AX_CHECK_REQUIRED_HEADER_LIB([avcodec.h ffmpeg/avcodec.h], [avcodec], [main],,, [http://ffmpeg.sourceforge.net]) LIBS="${LIBS} -lavformat -lavcodec"],
+   [AX_GET_INSTALL_NECESSARY_LIB([http://svn.orxonox.net/webdev/develop/ext_libs], [ffmpeg.tar.gz], [ffmpeg], [extern_libs/], [include/*.h lib/*.a])
+       LIBS="-llualib -llua"  CPPFLAGS="${CPPFLAGS} -I$(top_build_dir)/extern_libs" ],
+  [http://ffmpeg.sourceforge.net])
+
+
   AC_CHECK_LIB([avutil], [main], [FOUND_avutil=yes; LIBS="$LIBS -lavutil"])
   AC_CHECK_LIB([xvid], [main], [FOUND_xvid=yes; LIBS="$LIBS -lxvid"])
@@ -588 +574 @@
 AC_SUBST(CURL_CFLAGS)
 AM_CONDITIONAL(HAVE_CURL, test "x$have_curl" = "xyes")
+
+#-----#
+# LUA #
+#-----#
+LUA_DIR="/usr/include/lua"
+AX_CHECK_LUA([${LUA_DIR}])
 
 #--------#
@@ -636 +628 @@
                  src/lib/gui/gl_gui/Makefile
                  src/lib/gui/qt_gui/Makefile
+                 src/lib/script_engine/Makefile
                  src/lib/parser/Makefile
                  src/lib/parser/tinyxml/Makefile