Author: tpg
Date: Fri Feb 9 06:09:52 2007
New Revision: 118315
Added:
packages/cooker/mm3d/current/SOURCES/mm3d-1.3.2-acinclude.m4.diff
packages/cooker/mm3d/current/SOURCES/mm3d-1.3.2-aclocal.m4.diff
packages/cooker/mm3d/current/SOURCES/mm3d-1.3.2-configure.diff
packages/cooker/mm3d/current/SOURCES/mm3d-1.3.2-luascript.h.diff
packages/cooker/mm3d/current/SOURCES/mm3d.desktop
Removed:
packages/cooker/mm3d/current/SOURCES/acinclude.m4.diff
packages/cooker/mm3d/current/SOURCES/aclocal.m4.diff
packages/cooker/mm3d/current/SOURCES/configure.diff
packages/cooker/mm3d/current/SOURCES/luascript.h.diff
Modified:
packages/cooker/mm3d/current/SPECS/mm3d.spec
Log:
- rename patches
- add icons
- add menu entry
Added: packages/cooker/mm3d/current/SOURCES/mm3d-1.3.2-acinclude.m4.diff
==============================================================================
--- (empty file)
+++ packages/cooker/mm3d/current/SOURCES/mm3d-1.3.2-acinclude.m4.diff Fri Feb
9 06:09:52 2007
@@ -0,0 +1,40 @@
+diff -ubrN mm3d-1.3.2/acinclude.m4 mm3d-lua/acinclude.m4
+--- mm3d-1.3.2/acinclude.m4 2006-08-20 13:30:37.000000000 -0700
++++ mm3d-lua/acinclude.m4 2007-01-23 16:51:13.000000000 -0800
+@@ -108,7 +108,7 @@
+ ksw_lua_lib="`ls $ksw_lua_lib_dir/liblua.* 2> /dev/null | sed -n 1p |
+ sed [EMAIL PROTECTED]/lib@@ | [sed [EMAIL PROTECTED]@@]`"
+ fi
+- ksw_lua_LIBS="-L$ksw_lua_lib_dir -l$ksw_lua_lib"
++ ksw_lua_LIBS="-L$ksw_lua_lib_dir -l$ksw_lua_lib -lm -ldl"
+ else
+ # Use cached value or do search, starting with suggestions from
+ # the command line
+@@ -129,9 +129,9 @@
+
+ if test x"$ksw_lua_lib" != x; then
+ if test x"$ksw_lua_lib_dir" = x; then
+- ksw_lua_LIBS="-l$ksw_lua_lib"
++ ksw_lua_LIBS="-l$ksw_lua_lib -lm -ldl"
+ else
+- ksw_lua_LIBS="-L$ksw_lua_lib_dir -l$ksw_lua_lib"
++ ksw_lua_LIBS="-L$ksw_lua_lib_dir -l$ksw_lua_lib -lm -ldl"
+ fi
+ # Record where we found lua for the cache.
+ ksw_cv_have_lua="have_lua=yes \
+@@ -175,6 +175,7 @@
+ cat > ksw_lua_test.c << EOF
+ #include "ksw_lua_test.h"
+ #include <lua.h>
++#include <lauxlib.h>
+ //#include <lualib.h>
+
+ int main( int argc, char **argv )
+@@ -343,6 +344,7 @@
+ cat > ksw_lualib_test.c << EOF
+ #include "ksw_lualib_test.h"
+ #include <lua.h>
++#include <lauxlib.h>
+ #include <lualib.h>
+
+ int main( int argc, char **argv )
Added: packages/cooker/mm3d/current/SOURCES/mm3d-1.3.2-aclocal.m4.diff
==============================================================================
--- (empty file)
+++ packages/cooker/mm3d/current/SOURCES/mm3d-1.3.2-aclocal.m4.diff Fri Feb
9 06:09:52 2007
@@ -0,0 +1,40 @@
+diff -ubrN mm3d-1.3.2/aclocal.m4 mm3d-lua/aclocal.m4
+--- mm3d-1.3.2/aclocal.m4 2007-01-21 17:15:20.000000000 -0800
++++ mm3d-lua/aclocal.m4 2007-01-23 16:51:16.000000000 -0800
+@@ -120,7 +120,7 @@
+ ksw_lua_lib="`ls $ksw_lua_lib_dir/liblua.* 2> /dev/null | sed -n 1p |
+ sed [EMAIL PROTECTED]/lib@@ | [sed [EMAIL PROTECTED]@@]`"
+ fi
+- ksw_lua_LIBS="-L$ksw_lua_lib_dir -l$ksw_lua_lib"
++ ksw_lua_LIBS="-L$ksw_lua_lib_dir -l$ksw_lua_lib -lm -ldl"
+ else
+ # Use cached value or do search, starting with suggestions from
+ # the command line
+@@ -141,9 +141,9 @@
+
+ if test x"$ksw_lua_lib" != x; then
+ if test x"$ksw_lua_lib_dir" = x; then
+- ksw_lua_LIBS="-l$ksw_lua_lib"
++ ksw_lua_LIBS="-l$ksw_lua_lib -lm -ldl"
+ else
+- ksw_lua_LIBS="-L$ksw_lua_lib_dir -l$ksw_lua_lib"
++ ksw_lua_LIBS="-L$ksw_lua_lib_dir -l$ksw_lua_lib -lm -ldl"
+ fi
+ # Record where we found lua for the cache.
+ ksw_cv_have_lua="have_lua=yes \
+@@ -187,6 +187,7 @@
+ cat > ksw_lua_test.c << EOF
+ #include "ksw_lua_test.h"
+ #include <lua.h>
++#include <lauxlib.h>
+ //#include <lualib.h>
+
+ int main( int argc, char **argv )
+@@ -355,6 +356,7 @@
+ cat > ksw_lualib_test.c << EOF
+ #include "ksw_lualib_test.h"
+ #include <lua.h>
++#include <lauxlib.h>
+ #include <lualib.h>
+
+ int main( int argc, char **argv )
Added: packages/cooker/mm3d/current/SOURCES/mm3d-1.3.2-configure.diff
==============================================================================
--- (empty file)
+++ packages/cooker/mm3d/current/SOURCES/mm3d-1.3.2-configure.diff Fri Feb
9 06:09:52 2007
@@ -0,0 +1,913 @@
+diff -ubrN mm3d-1.3.2/configure mm3d-lua/configure
+--- mm3d-1.3.2/configure 2007-01-21 17:15:21.000000000 -0800
++++ mm3d-lua/configure 2007-01-23 16:51:16.000000000 -0800
+@@ -1467,7 +1467,7 @@
+ ksw_lua_lib="`ls $ksw_lua_lib_dir/liblua.* 2> /dev/null | sed -n 1p |
+ sed [EMAIL PROTECTED]/lib@@ | sed [EMAIL PROTECTED]@@`"
+ fi
+- ksw_lua_LIBS="-L$ksw_lua_lib_dir -l$ksw_lua_lib"
++ ksw_lua_LIBS="-L$ksw_lua_lib_dir -l$ksw_lua_lib -lm -ldl"
+ else
+ # Use cached value or do search, starting with suggestions from
+ # the command line
+@@ -1490,9 +1490,9 @@
+
+ if test x"$ksw_lua_lib" != x; then
+ if test x"$ksw_lua_lib_dir" = x; then
+- ksw_lua_LIBS="-l$ksw_lua_lib"
++ ksw_lua_LIBS="-l$ksw_lua_lib -lm -ldl"
+ else
+- ksw_lua_LIBS="-L$ksw_lua_lib_dir -l$ksw_lua_lib"
++ ksw_lua_LIBS="-L$ksw_lua_lib_dir -l$ksw_lua_lib -lm -ldl"
+ fi
+ # Record where we found lua for the cache.
+ ksw_cv_have_lua="have_lua=yes \
+@@ -1543,6 +1543,7 @@
+ cat > ksw_lua_test.c << EOF
+ #include "ksw_lua_test.h"
+ #include <lua.h>
++#include <lauxlib.h>
+ //#include <lualib.h>
+
+ int main( int argc, char **argv )
+@@ -1556,7 +1557,7 @@
+
+ ksw_cv_lua_test_result="failure"
+ ksw_try_1="$CC $LUA_CCFLAGS $LUA_LIBS -o ksw_lua_test ksw_lua_test.c
>/dev/null 2>ksw_lua_test_1.out"
+- { (eval echo configure:1560: \"$ksw_try_1\") 1>&5; (eval $ksw_try_1)
2>&5; }
++ { (eval echo configure:1561: \"$ksw_try_1\") 1>&5; (eval $ksw_try_1)
2>&5; }
+ ksw_err_1=`grep -v '^ *+' ksw_lua_test_1.out | grep -v
"^ksw_lua_test.{$ac_ext}\$"`
+ if test x"$ksw_err_1" != x; then
+ echo "$ksw_err_1" >&5
+@@ -1586,7 +1587,7 @@
+
+
+ echo $ac_n "checking for lualib""... $ac_c" 1>&6
+-echo "configure:1590: checking for lualib" >&5
++echo "configure:1591: checking for lualib" >&5
+
+ # Check whether --with-lualib-dir or --without-lualib-dir was given.
+ if test "${with_lualib_dir+set}" = set; then
+@@ -1721,7 +1722,7 @@
+ #### Being paranoid:
+ if test x"$have_lualib" = xyes; then
+ echo $ac_n "checking correct functioning of lualib installation""...
$ac_c" 1>&6
+-echo "configure:1725: checking correct functioning of lualib installation" >&5
++echo "configure:1726: checking correct functioning of lualib installation" >&5
+ if eval "test \"`echo '$''{'ksw_cv_lualib_test_result'+set}'`\" = set";
then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1732,6 +1733,7 @@
+ cat > ksw_lualib_test.c << EOF
+ #include "ksw_lualib_test.h"
+ #include <lua.h>
++#include <lauxlib.h>
+ #include <lualib.h>
+
+ int main( int argc, char **argv )
+@@ -1745,7 +1747,7 @@
+
+ ksw_cv_lualib_test_result="failure"
+ ksw_try_1="$CC $LUALIB_CCFLAGS $LUALIB_LIBS -o ksw_lualib_test
ksw_lualib_test.c >/dev/null 2>ksw_lualib_test_1.out"
+- { (eval echo configure:1749: \"$ksw_try_1\") 1>&5; (eval $ksw_try_1)
2>&5; }
++ { (eval echo configure:1751: \"$ksw_try_1\") 1>&5; (eval $ksw_try_1)
2>&5; }
+ ksw_err_1=`grep -v '^ *+' ksw_lualib_test_1.out | grep -v
"^ksw_lualib_test.{$ac_ext}\$"`
+ if test x"$ksw_err_1" != x; then
+ echo "$ksw_err_1" >&5
+@@ -1773,7 +1775,7 @@
+
+
+ echo $ac_n "checking for OS X""... $ac_c" 1>&6
+-echo "configure:1777: checking for OS X" >&5
++echo "configure:1779: checking for OS X" >&5
+ if eval "test \"`echo '$''{'ksw_cv_is_osx'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1803,7 +1805,7 @@
+
+
+ echo $ac_n "checking for dlopen""... $ac_c" 1>&6
+-echo "configure:1807: checking for dlopen" >&5
++echo "configure:1809: checking for dlopen" >&5
+ if eval "test \"`echo '$''{'ksw_cv_have_dlopen'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -1859,7 +1861,7 @@
+ fi
+
+ echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6
+-echo "configure:1863: checking how to run the C preprocessor" >&5
++echo "configure:1865: checking how to run the C preprocessor" >&5
+ # On Suns, sometimes $CPP names a directory.
+ if test -n "$CPP" && test -d "$CPP"; then
+ CPP=
+@@ -1874,13 +1876,13 @@
+ # On the NeXT, cc -E runs the code through the compiler's parser,
+ # not just through cpp.
+ cat > conftest.$ac_ext <<EOF
+-#line 1878 "configure"
++#line 1880 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1884: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1886: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ :
+@@ -1891,13 +1893,13 @@
+ rm -rf conftest*
+ CPP="${CC-cc} -E -traditional-cpp"
+ cat > conftest.$ac_ext <<EOF
+-#line 1895 "configure"
++#line 1897 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1901: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1903: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ :
+@@ -1908,13 +1910,13 @@
+ rm -rf conftest*
+ CPP="${CC-cc} -nologo -E"
+ cat > conftest.$ac_ext <<EOF
+-#line 1912 "configure"
++#line 1914 "configure"
+ #include "confdefs.h"
+ #include <assert.h>
+ Syntax Error
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:1918: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:1920: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ :
+@@ -1943,7 +1945,7 @@
+ # Uses ac_ vars as temps to allow command line to override cache and checks.
+ # --without-x overrides everything else, but does not touch the cache.
+ echo $ac_n "checking for X""... $ac_c" 1>&6
+-echo "configure:1947: checking for X" >&5
++echo "configure:1949: checking for X" >&5
+
+ # Check whether --with-x or --without-x was given.
+ if test "${with_x+set}" = set; then
+@@ -2005,12 +2007,12 @@
+
+ # First, try using that file with no special directory specified.
+ cat > conftest.$ac_ext <<EOF
+-#line 2009 "configure"
++#line 2011 "configure"
+ #include "confdefs.h"
+ #include <$x_direct_test_include>
+ EOF
+ ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
+-{ (eval echo configure:2014: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
++{ (eval echo configure:2016: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+ ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
+ if test -z "$ac_err"; then
+ rm -rf conftest*
+@@ -2079,14 +2081,14 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-l$x_direct_test_library $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2083 "configure"
++#line 2085 "configure"
+ #include "confdefs.h"
+
+ int main() {
+ ${x_direct_test_function}()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2090: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2092: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ LIBS="$ac_save_LIBS"
+ # We can link X programs with no special library path.
+@@ -2192,17 +2194,17 @@
+ case "`(uname -sr) 2>/dev/null`" in
+ "SunOS 5"*)
+ echo $ac_n "checking whether -R must be followed by a space""... $ac_c"
1>&6
+-echo "configure:2196: checking whether -R must be followed by a space" >&5
++echo "configure:2198: checking whether -R must be followed by a space" >&5
+ ac_xsave_LIBS="$LIBS"; LIBS="$LIBS -R$x_libraries"
+ cat > conftest.$ac_ext <<EOF
+-#line 2199 "configure"
++#line 2201 "configure"
+ #include "confdefs.h"
+
+ int main() {
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2206: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2208: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_R_nospace=yes
+ else
+@@ -2218,14 +2220,14 @@
+ else
+ LIBS="$ac_xsave_LIBS -R $x_libraries"
+ cat > conftest.$ac_ext <<EOF
+-#line 2222 "configure"
++#line 2224 "configure"
+ #include "confdefs.h"
+
+ int main() {
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2229: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2231: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_R_space=yes
+ else
+@@ -2257,7 +2259,7 @@
+ # libraries were built with DECnet support. And [EMAIL PROTECTED] says
+ # the Alpha needs dnet_stub (dnet does not exist).
+ echo $ac_n "checking for dnet_ntoa in -ldnet""... $ac_c" 1>&6
+-echo "configure:2261: checking for dnet_ntoa in -ldnet" >&5
++echo "configure:2263: checking for dnet_ntoa in -ldnet" >&5
+ ac_lib_var=`echo dnet'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2265,7 +2267,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-ldnet $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2269 "configure"
++#line 2271 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2276,7 +2278,7 @@
+ dnet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2280: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2282: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2298,7 +2300,7 @@
+
+ if test $ac_cv_lib_dnet_dnet_ntoa = no; then
+ echo $ac_n "checking for dnet_ntoa in -ldnet_stub""... $ac_c" 1>&6
+-echo "configure:2302: checking for dnet_ntoa in -ldnet_stub" >&5
++echo "configure:2304: checking for dnet_ntoa in -ldnet_stub" >&5
+ ac_lib_var=`echo dnet_stub'_'dnet_ntoa | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2306,7 +2308,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-ldnet_stub $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2310 "configure"
++#line 2312 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2317,7 +2319,7 @@
+ dnet_ntoa()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2321: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2323: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2346,12 +2348,12 @@
+ # The nsl library prevents programs from opening the X display
+ # on Irix 5.2, according to [EMAIL PROTECTED]
+ echo $ac_n "checking for gethostbyname""... $ac_c" 1>&6
+-echo "configure:2350: checking for gethostbyname" >&5
++echo "configure:2352: checking for gethostbyname" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_gethostbyname'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2355 "configure"
++#line 2357 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char gethostbyname(); below. */
+@@ -2374,7 +2376,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2378: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2380: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_gethostbyname=yes"
+ else
+@@ -2395,7 +2397,7 @@
+
+ if test $ac_cv_func_gethostbyname = no; then
+ echo $ac_n "checking for gethostbyname in -lnsl""... $ac_c" 1>&6
+-echo "configure:2399: checking for gethostbyname in -lnsl" >&5
++echo "configure:2401: checking for gethostbyname in -lnsl" >&5
+ ac_lib_var=`echo nsl'_'gethostbyname | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2403,7 +2405,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lnsl $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2407 "configure"
++#line 2409 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2414,7 +2416,7 @@
+ gethostbyname()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2418: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2420: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2444,12 +2446,12 @@
+ # -lsocket must be given before -lnsl if both are needed.
+ # We assume that if connect needs -lnsl, so does gethostbyname.
+ echo $ac_n "checking for connect""... $ac_c" 1>&6
+-echo "configure:2448: checking for connect" >&5
++echo "configure:2450: checking for connect" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_connect'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2453 "configure"
++#line 2455 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char connect(); below. */
+@@ -2472,7 +2474,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2476: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2478: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_connect=yes"
+ else
+@@ -2493,7 +2495,7 @@
+
+ if test $ac_cv_func_connect = no; then
+ echo $ac_n "checking for connect in -lsocket""... $ac_c" 1>&6
+-echo "configure:2497: checking for connect in -lsocket" >&5
++echo "configure:2499: checking for connect in -lsocket" >&5
+ ac_lib_var=`echo socket'_'connect | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2501,7 +2503,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lsocket $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2505 "configure"
++#line 2507 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2512,7 +2514,7 @@
+ connect()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2516: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2518: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2536,12 +2538,12 @@
+
+ # [EMAIL PROTECTED] says -lposix is necessary on A/UX.
+ echo $ac_n "checking for remove""... $ac_c" 1>&6
+-echo "configure:2540: checking for remove" >&5
++echo "configure:2542: checking for remove" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_remove'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2545 "configure"
++#line 2547 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char remove(); below. */
+@@ -2564,7 +2566,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2568: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2570: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_remove=yes"
+ else
+@@ -2585,7 +2587,7 @@
+
+ if test $ac_cv_func_remove = no; then
+ echo $ac_n "checking for remove in -lposix""... $ac_c" 1>&6
+-echo "configure:2589: checking for remove in -lposix" >&5
++echo "configure:2591: checking for remove in -lposix" >&5
+ ac_lib_var=`echo posix'_'remove | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2593,7 +2595,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lposix $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2597 "configure"
++#line 2599 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2604,7 +2606,7 @@
+ remove()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2608: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2610: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2628,12 +2630,12 @@
+
+ # BSDI BSD/OS 2.1 needs -lipc for XOpenDisplay.
+ echo $ac_n "checking for shmat""... $ac_c" 1>&6
+-echo "configure:2632: checking for shmat" >&5
++echo "configure:2634: checking for shmat" >&5
+ if eval "test \"`echo '$''{'ac_cv_func_shmat'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 2637 "configure"
++#line 2639 "configure"
+ #include "confdefs.h"
+ /* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char shmat(); below. */
+@@ -2656,7 +2658,7 @@
+
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2660: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2662: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_func_shmat=yes"
+ else
+@@ -2677,7 +2679,7 @@
+
+ if test $ac_cv_func_shmat = no; then
+ echo $ac_n "checking for shmat in -lipc""... $ac_c" 1>&6
+-echo "configure:2681: checking for shmat in -lipc" >&5
++echo "configure:2683: checking for shmat in -lipc" >&5
+ ac_lib_var=`echo ipc'_'shmat | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2685,7 +2687,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lipc $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2689 "configure"
++#line 2691 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2696,7 +2698,7 @@
+ shmat()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2700: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2702: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2729,7 +2731,7 @@
+ # libraries we check for below, so use a different variable.
+ # [EMAIL PROTECTED], [EMAIL PROTECTED]
+ echo $ac_n "checking for IceConnectionNumber in -lICE""... $ac_c" 1>&6
+-echo "configure:2733: checking for IceConnectionNumber in -lICE" >&5
++echo "configure:2735: checking for IceConnectionNumber in -lICE" >&5
+ ac_lib_var=`echo ICE'_'IceConnectionNumber | sed 'y%./+-%__p_%'`
+ if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -2737,7 +2739,7 @@
+ ac_save_LIBS="$LIBS"
+ LIBS="-lICE $X_EXTRA_LIBS $LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2741 "configure"
++#line 2743 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2748,7 +2750,7 @@
+ IceConnectionNumber()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2752: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2754: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ eval "ac_cv_lib_$ac_lib_var=yes"
+ else
+@@ -2778,7 +2780,7 @@
+
+
+ echo $ac_n "checking for OpenGL""... $ac_c" 1>&6
+-echo "configure:2782: checking for OpenGL" >&5
++echo "configure:2784: checking for OpenGL" >&5
+ if eval "test \"`echo '$''{'mdl_cv_have_OpenGL'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -2842,14 +2844,14 @@
+
+
+ echo $ac_n "checking for library containing glAccum""... $ac_c" 1>&6
+-echo "configure:2846: checking for library containing glAccum" >&5
++echo "configure:2848: checking for library containing glAccum" >&5
+ if eval "test \"`echo '$''{'ac_cv_search_glAccum'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_func_search_save_LIBS="$LIBS"
+ ac_cv_search_glAccum="no"
+ cat > conftest.$ac_ext <<EOF
+-#line 2853 "configure"
++#line 2855 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2860,7 +2862,7 @@
+ glAccum()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2864: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2866: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_cv_search_glAccum="none required"
+ else
+@@ -2871,7 +2873,7 @@
+ test "$ac_cv_search_glAccum" = "no" && for i in $GL_search_list; do
+ LIBS="-l$i $ac_func_search_save_LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2875 "configure"
++#line 2877 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2882,7 +2884,7 @@
+ glAccum()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2886: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2888: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_cv_search_glAccum="-l$i"
+ break
+@@ -2904,14 +2906,14 @@
+ fi
+
+ echo $ac_n "checking for library containing gluBeginCurve""... $ac_c" 1>&6
+-echo "configure:2908: checking for library containing gluBeginCurve" >&5
++echo "configure:2910: checking for library containing gluBeginCurve" >&5
+ if eval "test \"`echo '$''{'ac_cv_search_gluBeginCurve'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_func_search_save_LIBS="$LIBS"
+ ac_cv_search_gluBeginCurve="no"
+ cat > conftest.$ac_ext <<EOF
+-#line 2915 "configure"
++#line 2917 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2922,7 +2924,7 @@
+ gluBeginCurve()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2926: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2928: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_cv_search_gluBeginCurve="none required"
+ else
+@@ -2933,7 +2935,7 @@
+ test "$ac_cv_search_gluBeginCurve" = "no" && for i in $GLU_search_list; do
+ LIBS="-l$i $ac_func_search_save_LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2937 "configure"
++#line 2939 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2944,7 +2946,7 @@
+ gluBeginCurve()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2948: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2950: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_cv_search_gluBeginCurve="-l$i"
+ break
+@@ -2966,14 +2968,14 @@
+ fi
+
+ echo $ac_n "checking for library containing glXChooseVisual""... $ac_c" 1>&6
+-echo "configure:2970: checking for library containing glXChooseVisual" >&5
++echo "configure:2972: checking for library containing glXChooseVisual" >&5
+ if eval "test \"`echo '$''{'ac_cv_search_glXChooseVisual'+set}'`\" = set";
then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_func_search_save_LIBS="$LIBS"
+ ac_cv_search_glXChooseVisual="no"
+ cat > conftest.$ac_ext <<EOF
+-#line 2977 "configure"
++#line 2979 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -2984,7 +2986,7 @@
+ glXChooseVisual()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:2988: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:2990: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_cv_search_glXChooseVisual="none required"
+ else
+@@ -2995,7 +2997,7 @@
+ test "$ac_cv_search_glXChooseVisual" = "no" && for i in $GLX_search_list; do
+ LIBS="-l$i $ac_func_search_save_LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 2999 "configure"
++#line 3001 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -3006,7 +3008,7 @@
+ glXChooseVisual()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3010: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:3012: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_cv_search_glXChooseVisual="-l$i"
+ break
+@@ -3028,14 +3030,14 @@
+ fi
+
+ echo $ac_n "checking for library containing glutInit""... $ac_c" 1>&6
+-echo "configure:3032: checking for library containing glutInit" >&5
++echo "configure:3034: checking for library containing glutInit" >&5
+ if eval "test \"`echo '$''{'ac_cv_search_glutInit'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_func_search_save_LIBS="$LIBS"
+ ac_cv_search_glutInit="no"
+ cat > conftest.$ac_ext <<EOF
+-#line 3039 "configure"
++#line 3041 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -3046,7 +3048,7 @@
+ glutInit()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3050: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:3052: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_cv_search_glutInit="none required"
+ else
+@@ -3057,7 +3059,7 @@
+ test "$ac_cv_search_glutInit" = "no" && for i in glut; do
+ LIBS="-l$i $ac_func_search_save_LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3061 "configure"
++#line 3063 "configure"
+ #include "confdefs.h"
+ /* Override any gcc2 internal prototype to avoid an error. */
+ /* We use char because int might match the return type of a gcc2
+@@ -3068,7 +3070,7 @@
+ glutInit()
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3072: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:3074: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+ ac_cv_search_glutInit="-l$i"
+ break
+@@ -3150,7 +3152,7 @@
+
+
+ echo $ac_n "checking for Qt""... $ac_c" 1>&6
+-echo "configure:3154: checking for Qt" >&5
++echo "configure:3156: checking for Qt" >&5
+
+ QT_XLIBS="$X_PRE_LIBS $X_LIBS -lX11 -lXext -lXmu -lXt -lXi $X_EXTRA_LIBS"
+ if test x"$no_x" = xyes; then
+@@ -3399,14 +3401,14 @@
+ fi
+ bnv_qt_LIBS="$LIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3403 "configure"
++#line 3405 "configure"
+ #include "confdefs.h"
+ #include <$qt_direct_test_header>
+ int main() {
+ $qt_direct_test_main
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3410: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:3412: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+
+ # Succes.
+@@ -3423,14 +3425,14 @@
+ bnv_qt_lib=qt-mt
+ LIBS="-l$bnv_qt_lib $QT_XLIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3427 "configure"
++#line 3429 "configure"
+ #include "confdefs.h"
+ #include <$qt_direct_test_header>
+ int main() {
+ $qt_direct_test_main
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3434: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:3436: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+
+ # Succes.
+@@ -3447,14 +3449,14 @@
+ bnv_qt_lib=qt-gl
+ LIBS="-l$bnv_qt_lib $QT_XLIBS"
+ cat > conftest.$ac_ext <<EOF
+-#line 3451 "configure"
++#line 3453 "configure"
+ #include "confdefs.h"
+ #include <$qt_direct_test_header>
+ int main() {
+ $qt_direct_test_main
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3458: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
++if { (eval echo configure:3460: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext}; then
+ rm -rf conftest*
+
+ # Succes.
+@@ -3604,7 +3606,7 @@
+ #### Being paranoid:
+ if test x"$have_qt" = xyes; then
+ echo $ac_n "checking correct functioning of Qt installation""... $ac_c"
1>&6
+-echo "configure:3608: checking correct functioning of Qt installation" >&5
++echo "configure:3610: checking correct functioning of Qt installation" >&5
+ if eval "test \"`echo '$''{'bnv_cv_qt_test_result'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3637,7 +3639,7 @@
+
+ bnv_cv_qt_test_result="failure"
+ bnv_try_1="$QT_MOC bnv_qt_test.h -o moc_bnv_qt_test.$ac_ext >/dev/null
2>bnv_qt_test_1.out"
+- { (eval echo configure:3641: \"$bnv_try_1\") 1>&5; (eval $bnv_try_1)
2>&5; }
++ { (eval echo configure:3643: \"$bnv_try_1\") 1>&5; (eval $bnv_try_1)
2>&5; }
+ bnv_err_1=`grep -v '^ *+' bnv_qt_test_1.out | grep -v
"^bnv_qt_test.h\$"`
+ if test x"$bnv_err_1" != x; then
+ echo "$bnv_err_1" >&5
+@@ -3645,7 +3647,7 @@
+ cat bnv_qt_test.h >&5
+ else
+ bnv_try_2="$CXX $QT_CXXFLAGS -c $CXXFLAGS -Wno-non-virtual-dtor -o
moc_bnv_qt_test.o moc_bnv_qt_test.$ac_ext >/dev/null 2>bnv_qt_test_2.out"
+- { (eval echo configure:3649: \"$bnv_try_2\") 1>&5; (eval $bnv_try_2)
2>&5; }
++ { (eval echo configure:3651: \"$bnv_try_2\") 1>&5; (eval $bnv_try_2)
2>&5; }
+ bnv_err_2=`grep -v '^ *+' bnv_qt_test_2.out | grep -v
"^bnv_qt_test.{$ac_ext}\$"`
+ if test x"$bnv_err_2" != x; then
+ echo "$bnv_err_2" >&5
+@@ -3653,7 +3655,7 @@
+ cat bnv_qt_test.$ac_ext >&5
+ else
+ bnv_try_3="$CXX $QT_CXXFLAGS -c $CXXFLAGS -o bnv_qt_main.o
bnv_qt_main.$ac_ext >/dev/null 2>bnv_qt_test_3.out"
+- { (eval echo configure:3657: \"$bnv_try_3\") 1>&5; (eval
$bnv_try_3) 2>&5; }
++ { (eval echo configure:3659: \"$bnv_try_3\") 1>&5; (eval
$bnv_try_3) 2>&5; }
+ bnv_err_3=`grep -v '^ *+' bnv_qt_test_3.out | grep -v
"^bnv_qt_main.{$ac_ext}\$"`
+ if test x"$bnv_err_3" != x; then
+ echo "$bnv_err_3" >&5
+@@ -3661,7 +3663,7 @@
+ cat bnv_qt_main.$ac_ext >&5
+ else
+ bnv_try_4="$CXX $QT_LIBS $LIBS -o bnv_qt_main bnv_qt_main.o
moc_bnv_qt_test.o >/dev/null 2>bnv_qt_test_4.out"
+- { (eval echo configure:3665: \"$bnv_try_4\") 1>&5; (eval
$bnv_try_4) 2>&5; }
++ { (eval echo configure:3667: \"$bnv_try_4\") 1>&5; (eval
$bnv_try_4) 2>&5; }
+ bnv_err_4=`grep -v '^ *+' bnv_qt_test_4.out`
+ if test x"$bnv_err_4" != x; then
+ echo "$bnv_err_4" >&5
+@@ -3707,7 +3709,7 @@
+
+
+ echo $ac_n "checking Qt OpenGL""... $ac_c" 1>&6
+-echo "configure:3711: checking Qt OpenGL" >&5
++echo "configure:3713: checking Qt OpenGL" >&5
+
+ if eval "test \"`echo '$''{'ksw_cv_qgl_test_result'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+@@ -3729,11 +3731,11 @@
+
+ ksw_cv_qgl_test_result="failure"
+ ksw_try_1="$CXX $GL_CFLAGS $GL_LIBS $QT_CXXFLAGS $QT_LIBS -o
ksw_qgl_test ksw_qgl_test.${ac_ext} >/dev/null 2>ksw_qgl_test_1.out"
+- { (eval echo configure:3733: \"$ksw_try_1\") 1>&5; (eval $ksw_try_1)
2>&5; }
++ { (eval echo configure:3735: \"$ksw_try_1\") 1>&5; (eval $ksw_try_1)
2>&5; }
+ ksw_err_1=`grep -v '^ *+' ksw_qgl_test_1.out | grep -v
"^ksw_qgl_test.{$ac_ext}\$"`
+ if test x"$ksw_err_1" != x; then
+ ksw_try_2="$CXX $GL_CFLAGS $GL_LIBS $QT_CXXFLAGS $QT_LIBS
-lqglviewer -o ksw_qgl_test ksw_qgl_test.${ac_ext} >/dev/null
2>ksw_qgl_test_2.out"
+- { (eval echo configure:3737: \"$ksw_try_2\") 1>&5; (eval
$ksw_try_2) 2>&5; }
++ { (eval echo configure:3739: \"$ksw_try_2\") 1>&5; (eval
$ksw_try_2) 2>&5; }
+ ksw_err_2=`grep -v '^ *+' ksw_qgl_test_2.out | grep -v
"^ksw_qgl_test.{$ac_ext}\$"`
+ if test x"$ksw_err_2" != x; then
+ echo "$ksw_err_2" >&5
+@@ -3772,7 +3774,7 @@
+
+
+ echo $ac_n "checking for x11 fonts""... $ac_c" 1>&6
+-echo "configure:3776: checking for x11 fonts" >&5
++echo "configure:3778: checking for x11 fonts" >&5
+ if eval "test \"`echo '$''{'ksw_cv_have_x11font'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3812,7 +3814,7 @@
+
+
+ echo $ac_n "checking for gettimeofday""... $ac_c" 1>&6
+-echo "configure:3816: checking for gettimeofday" >&5
++echo "configure:3818: checking for gettimeofday" >&5
+ if eval "test \"`echo '$''{'ksw_cv_have_gettimeofday'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+@@ -3850,14 +3852,14 @@
+ fi
+
+ echo $ac_n "checking whether byte ordering is bigendian""... $ac_c" 1>&6
+-echo "configure:3854: checking whether byte ordering is bigendian" >&5
++echo "configure:3856: checking whether byte ordering is bigendian" >&5
+ if eval "test \"`echo '$''{'ac_cv_c_bigendian'+set}'`\" = set"; then
+ echo $ac_n "(cached) $ac_c" 1>&6
+ else
+ ac_cv_c_bigendian=unknown
+ # See if sys/param.h defines the BYTE_ORDER macro.
+ cat > conftest.$ac_ext <<EOF
+-#line 3861 "configure"
++#line 3863 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/param.h>
+@@ -3868,11 +3870,11 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3872: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
++if { (eval echo configure:3874: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+ rm -rf conftest*
+ # It does; now see whether it defined to BIG_ENDIAN or not.
+ cat > conftest.$ac_ext <<EOF
+-#line 3876 "configure"
++#line 3878 "configure"
+ #include "confdefs.h"
+ #include <sys/types.h>
+ #include <sys/param.h>
+@@ -3883,7 +3885,7 @@
+ #endif
+ ; return 0; }
+ EOF
+-if { (eval echo configure:3887: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
++if { (eval echo configure:3889: \"$ac_compile\") 1>&5; (eval $ac_compile)
2>&5; }; then
+ rm -rf conftest*
+ ac_cv_c_bigendian=yes
+ else
+@@ -3903,7 +3905,7 @@
+ echo $ac_n "cross-compiling... " 2>&6
+ else
+ cat > conftest.$ac_ext <<EOF
+-#line 3907 "configure"
++#line 3909 "configure"
+ #include "confdefs.h"
+ main () {
+ /* Are we little or big endian? From Harbison&Steele. */
+@@ -3916,7 +3918,7 @@
+ exit (u.c[sizeof (long) - 1] == 1);
+ }
+ EOF
+-if { (eval echo configure:3920: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
++if { (eval echo configure:3922: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; }
&& test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+ then
+ ac_cv_c_bigendian=no
+ else
+@@ -3934,7 +3936,7 @@
+ echo "$ac_t""$ac_cv_c_bigendian" 1>&6
+ if test $ac_cv_c_bigendian = unknown; then
+ echo $ac_n "checking to probe for byte ordering""... $ac_c" 1>&6
+-echo "configure:3938: checking to probe for byte ordering" >&5
++echo "configure:3940: checking to probe for byte ordering" >&5
+
+ cat >conftest.c <<EOF
+ short ascii_mm[] = { 0x4249, 0x4765, 0x6E44, 0x6961, 0x6E53, 0x7953, 0 };
Added: packages/cooker/mm3d/current/SOURCES/mm3d-1.3.2-luascript.h.diff
==============================================================================
--- (empty file)
+++ packages/cooker/mm3d/current/SOURCES/mm3d-1.3.2-luascript.h.diff Fri Feb
9 06:09:52 2007
@@ -0,0 +1,11 @@
+diff -ubrN mm3d-1.3.2/src/mm3dcore/luascript.h
mm3d-lua/src/mm3dcore/luascript.h
+--- mm3d-1.3.2/src/mm3dcore/luascript.h 2006-12-31 20:17:13.000000000
-0800
++++ mm3d-lua/src/mm3dcore/luascript.h 2007-01-23 16:36:55.000000000 -0800
+@@ -29,6 +29,7 @@
+
+ extern "C"
+ {
++#include <lauxlib.h>
+ #include <lua.h>
+ };
+
Added: packages/cooker/mm3d/current/SOURCES/mm3d.desktop
==============================================================================
--- (empty file)
+++ packages/cooker/mm3d/current/SOURCES/mm3d.desktop Fri Feb 9 06:09:52 2007
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Misfit Model 3D
+Comment=OpenGL-based 3D model editor
+Exec=mm3d
+Icon=mm3d
+Type=Application
+Terminal=false
+X-KDE-StartupNotify=true
+Categories=X-MandrivaLinux-Multimedia-Graphics;QT;
Modified: packages/cooker/mm3d/current/SPECS/mm3d.spec
==============================================================================
--- packages/cooker/mm3d/current/SPECS/mm3d.spec (original)
+++ packages/cooker/mm3d/current/SPECS/mm3d.spec Fri Feb 9 06:09:52 2007
@@ -1,18 +1,20 @@
Summary: Misfit Model 3D - OpenGL-based 3D model editor
Name: mm3d
Version: 1.3.2
-Release: %mkrel 2
+Release: %mkrel 3
License: GPL
Group: Graphics
-Source0:
http://downloads.sourceforge.net/misfitmodel3d/%{name}-%{version}.tar.bz2
URL: http://www.misfitcode.com/misfitmodel3d/
-Patch0: luascript.h.diff
-Patch1: acinclude.m4.diff
-Patch2: aclocal.m4.diff
-Patch3: configure.diff
+Source0:
http://downloads.sourceforge.net/misfitmodel3d/%{name}-%{version}.tar.bz2
+Source1: %{name}.desktop
+Patch0: %{name}-1.3.2-luascript.h.diff
+Patch1: %{name}-1.3.2-acinclude.m4.diff
+Patch2: %{name}-1.3.2-aclocal.m4.diff
+Patch3: %{name}-1.3.2-configure.diff
BuildRequires: lua-devel >= 5.1
-Requires: lua >= 5.1
BuildRequires: libqt-devel >= 3.3.7
+BuildRequires: ImageMagick
+Requires: lua >= 5.1
BuildRoot: %{_tmppath}/%{name}-%{version}-buildroot
%description
@@ -40,6 +42,12 @@
[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
%makeinstall_std
+mkdir -p %{buildroot}%{_datadir}/applications
+mkdir -p %{buildroot}%{_iconsdir}/hicolor/{16x16,32x32}/apps
+
+install %{SOURCE1} %{buildroot}%{_datadir}/applications/%{name}.desktop
+convert src/pixmap/mm3dlogo-16x16.xpm
%{buildroot}%{_iconsdir}/hicolor/16x16/apps/%{name}.png
+convert src/pixmap/mm3dlogo-32x32.xpm
%{buildroot}%{_iconsdir}/hicolor/32x32/apps/%{name}.png
%clean
[ "%{buildroot}" != "/" ] && rm -rf %{buildroot}
@@ -59,7 +67,9 @@
%endif
%files
-%doc %{_datadir}/doc/%{name}/
+%doc %{_datadir}/doc/%{name}/html/*
%defattr(644,root,root,755)
-%attr(755,root,root) %{_bindir}/*
+%attr(755,root,root) %{_bindir}/%{name}
%dir %{_datadir}/%{name}/plugins/1.3
+%{_datadir}/applications/%{name}.desktop
+%{_iconsdir}/hicolor/*/apps/%{name}.png
