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

Timestamp:

Jun 5, 2006, 11:49:26 AM (19 years ago)

Author:

bensch

Message:

trunk: merged the gui back
merged with command:
svn merge -r8114:HEAD ​https://svn.orxonox.net/orxonox/branches/gui .
→ no conflicts

File:

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

trunk/configure.ac

@@ -526 +526 @@
   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])
+     [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])
+
+
 
 
@@ -625 +627 @@
                  src/lib/shell/Makefile
                  src/lib/gui/Makefile
-                 src/lib/gui/gtk_gui/Makefile
-                 src/lib/gui/gl_gui/Makefile
-                 src/lib/gui/qt_gui/Makefile
+                 src/lib/gui/gtk/Makefile
+                 src/lib/gui/gl/Makefile
+                 src/lib/gui/qt/Makefile
                  src/lib/script_engine/Makefile
                  src/lib/parser/Makefile