neocturne/neofx-zoomedit
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

zoomedit: Big transition Ciaro -> OpenGL, enormous speedup!

Browse source
This commit is contained in:
neoraider 2007-09-21 21:47:05 +00:00
parent 1bce1d8ad7
commit 62e4240848
19 changed files with 1150 additions and 386 deletions
Download patch file Download diff file Expand all files Collapse all files

334
configure vendored
View file

@ -702,6 +702,8 @@ am__fastdepCC_FALSE
PKG_CONFIG
GTK_CFLAGS
GTK_LIBS
GTKGLEXT_CFLAGS
GTKGLEXT_LIBS
CPP
GREP
EGREP
@ -1300,6 +1302,7 @@ Optional Features:
--disable-dependency-tracking speeds up one-time build
--enable-dependency-tracking do not reject slow dependency extractors
--disable-gtktest do not try to compile and run a test GTK+ program
--disable-gtkglext-test do not try to compile and run a test GtkGLExt program
Some influential environment variables:
CXX C++ compiler command
@ -4260,6 +4263,333 @@ echo "$as_me: error: zoomedit needs GTK+ 2.8.0" >&2;}
rm -f conf.gtktest
no_gtkglext=""
GTKGLEXT_CFLAGS=""
GTKGLEXT_LIBS=""
# GtkGLExt pkg-config module
gtkglext_module=gtkglext-1.0
# minimum GtkGLExt version
gtkglext_min_version=1.0.0
# minimum pkg-config version
pkgconfig_min_version=0.7
# Check whether --enable-gtkglext-test was given.
if test "${enable_gtkglext_test+set}" = set; then
enableval=$enable_gtkglext_test;
else
enable_gtkglext_test=yes
fi
pkg_config_modules=$gtkglext_module
# Extract the first word of "pkg-config", so it can be a program name with args.
set dummy pkg-config; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_path_PKG_CONFIG+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
case $PKG_CONFIG in
[\\/]* | ?:[\\/]*)
ac_cv_path_PKG_CONFIG="$PKG_CONFIG" # Let the user override the test with a path.
;;
*)
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
done
done
IFS=$as_save_IFS
test -z "$ac_cv_path_PKG_CONFIG" && ac_cv_path_PKG_CONFIG="no"
;;
esac
fi
PKG_CONFIG=$ac_cv_path_PKG_CONFIG
if test -n "$PKG_CONFIG"; then
{ echo "$as_me:$LINENO: result: $PKG_CONFIG" >&5
echo "${ECHO_T}$PKG_CONFIG" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
if test x$PKG_CONFIG != xno ; then
if pkg-config --atleast-pkgconfig-version $pkgconfig_min_version ; then
:
else
echo ""
echo "*** pkg-config too old; version $pkgconfig_min_version or better required."
no_gtkglext=yes
PKG_CONFIG=no
fi
else
no_gtkglext=yes
fi
{ echo "$as_me:$LINENO: checking for GtkGLExt - version >= $gtkglext_min_version" >&5
echo $ECHO_N "checking for GtkGLExt - version >= $gtkglext_min_version... $ECHO_C" >&6; }
if test x$PKG_CONFIG != xno ; then
## don't try to run the test against uninstalled libtool libs
if $PKG_CONFIG --uninstalled $pkg_config_modules; then
echo ""
echo "Will use uninstalled version of GtkGLExt found in PKG_CONFIG_PATH"
enable_gtkglext_test=no
fi
if $PKG_CONFIG --atleast-version $gtkglext_min_version $pkg_config_modules; then
:
else
echo ""
echo "*** pkg-config cannot find $gtkglext_module >= $gtkglext_min_version"
echo "*** Set the environment variable PKG_CONFIG_PATH to point to the correct"
echo "*** configuration files."
no_gtkglext=yes
enable_gtkglext_test=no
fi
fi
if test x"$no_gtkglext" = x ; then
GTKGLEXT_CFLAGS=`$PKG_CONFIG --cflags $pkg_config_modules`
GTKGLEXT_LIBS=`$PKG_CONFIG --libs $pkg_config_modules`
gtkglext_config_major_version=`$PKG_CONFIG --modversion $gtkglext_module | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\1/'`
gtkglext_config_minor_version=`$PKG_CONFIG --modversion $gtkglext_module | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\2/'`
gtkglext_config_micro_version=`$PKG_CONFIG --modversion $gtkglext_module | \
sed 's/\([0-9]*\).\([0-9]*\).\([0-9]*\)/\3/'`
if test "x$enable_gtkglext_test" = "xyes" ; then
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTKGLEXT_CFLAGS"
LIBS="$GTKGLEXT_LIBS $LIBS"
rm -f conf.gtkgltest
if test "$cross_compiling" = yes; then
echo $ac_n "cross compiling; assumed OK... $ac_c"
else
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <gtk/gtk.h>
#include <gtk/gtkgl.h>
#include <stdio.h>
#include <stdlib.h>
int
main ()
{
int major, minor, micro;
char *tmp_version;
system ("touch conf.gtkgltest");
/* HP/UX 9 (%@#!) writes to sscanf strings */
tmp_version = g_strdup ("$gtkglext_min_version");
if (sscanf (tmp_version, "%d.%d.%d", &major, &minor, &micro) != 3)
{
printf ("%s, bad version string\n", "$gtkglext_min_version");
exit (1);
}
if ((gtkglext_major_version != $gtkglext_config_major_version) ||
(gtkglext_minor_version != $gtkglext_config_minor_version) ||
(gtkglext_micro_version != $gtkglext_config_micro_version))
{
printf ("\n*** 'pkg-config --modversion $gtkglext_module' returned %d.%d.%d, but GtkGLExt\n",
$gtkglext_config_major_version, $gtkglext_config_minor_version, $gtkglext_config_micro_version);
printf ("*** library %d.%d.%d was found!\n",
gtkglext_major_version, gtkglext_minor_version, gtkglext_micro_version);
printf ("***\n");
printf ("*** If pkg-config was correct, then it is best to remove the old version\n");
printf ("*** of GtkGLExt. You may also be able to fix the error by modifying your\n");
printf ("*** LD_LIBRARY_PATH enviroment variable, or by editing /etc/ld.so.conf.\n");
printf ("*** Make sure you have run ldconfig if that is required on your system.\n");
printf ("***\n");
printf ("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
printf ("*** to point to the correct configuration files.\n");
}
else if ((gtkglext_major_version != GTKGLEXT_MAJOR_VERSION) ||
(gtkglext_minor_version != GTKGLEXT_MINOR_VERSION) ||
(gtkglext_micro_version != GTKGLEXT_MICRO_VERSION))
{
printf ("\n*** GtkGLExt header files (version %d.%d.%d) do not match library (version %d.%d.%d).\n",
GTKGLEXT_MAJOR_VERSION, GTKGLEXT_MINOR_VERSION, GTKGLEXT_MICRO_VERSION,
gtkglext_major_version, gtkglext_minor_version, gtkglext_micro_version);
}
else
{
if ((gtkglext_major_version > major) ||
((gtkglext_major_version == major) && (gtkglext_minor_version > minor)) ||
((gtkglext_major_version == major) && (gtkglext_minor_version == minor) && (gtkglext_micro_version >= micro)))
{
return 0;
}
else
{
printf ("\n*** An old version of GtkGLExt library (%d.%d.%d) was found.\n",
gtkglext_major_version, gtkglext_minor_version, gtkglext_micro_version);
printf ("*** You need a version of GtkGLExt newer than %d.%d.%d. The latest version of\n",
major, minor, micro);
printf ("*** GtkGLExt is always available from http://gtkglext.sourceforge.net/.\n");
printf ("***\n");
printf ("*** If you have already installed a sufficiently new version, this error\n");
printf ("*** probably means that the wrong copy of the pkg-config shell script is\n");
printf ("*** being found. The easiest way to fix this is to remove the old version\n");
printf ("*** of GtkGLExt, but you can also set the PKG_CONFIG environment to point\n");
printf ("*** to the correct copy of pkg-config. (In this case, you will have to\n");
printf ("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
printf ("*** so that the correct libraries are found at run-time)\n");
}
}
return 1;
}
_ACEOF
rm -f conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && { ac_try='./conftest$ac_exeext'
{ (case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_try") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; }; then
:
else
echo "$as_me: program exited with status $ac_status" >&5
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
( exit $ac_status )
no_gtkglext=yes
fi
rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
fi
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
if test "x$no_gtkglext" = x ; then
{ echo "$as_me:$LINENO: result: yes (version $gtkglext_config_major_version.$gtkglext_config_minor_version.$gtkglext_config_micro_version)" >&5
echo "${ECHO_T}yes (version $gtkglext_config_major_version.$gtkglext_config_minor_version.$gtkglext_config_micro_version)" >&6; }
:
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
if test "$PKG_CONFIG" = "no" ; then
echo "*** A new enough version of pkg-config was not found."
echo "*** See http://www.freedesktop.org/software/pkgconfig/."
elif test "x$enable_gtkglext_test" = "xyes" ; then
if test -f conf.gtkgltest ; then
:
else
echo "*** Could not run GtkGLExt test program, checking why..."
ac_save_CFLAGS="$CFLAGS"
ac_save_LIBS="$LIBS"
CFLAGS="$CFLAGS $GTKGLEXT_CFLAGS"
LIBS="$LIBS $GTKGLEXT_LIBS"
cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
#include <gtk/gtk.h>
#include <gtk/gtkgl.h>
#include <stdio.h>
int
main ()
{
return ((gtkglext_major_version) || (gtkglext_minor_version) || (gtkglext_micro_version));
;
return 0;
}
_ACEOF
rm -f conftest.$ac_objext conftest$ac_exeext
if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
(eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); } && {
test -z "$ac_c_werror_flag" ||
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
echo "*** The test program compiled, but did not run. This usually means"
echo "*** that the run-time linker is not finding GtkGLExt or finding the wrong"
echo "*** version of GtkGLExt. If it is not finding GtkGLExt, you'll need to set your"
echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
echo "*** to the installed location Also, make sure you have run ldconfig if that"
echo "*** is required on your system"
echo "***"
echo "*** If you have an old version installed, it is best to remove it, although"
echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH"
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
echo "*** The test program failed to compile or link. See the file config.log for the"
echo "*** exact error that occured. This usually means GtkGLExt is incorrectly installed."
fi
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
CFLAGS="$ac_save_CFLAGS"
LIBS="$ac_save_LIBS"
fi
fi
GTKGLEXT_CFLAGS=""
GTKGLEXT_LIBS=""
{ { echo "$as_me:$LINENO: error: zoomedit needs GtkGLExt" >&5
echo "$as_me: error: zoomedit needs GtkGLExt" >&2;}
{ (exit 1); exit 1; }; }
fi
rm -f conf.gtkgltest
# Checks for header files.
#AC_HEADER_STDC
@ -6123,6 +6453,8 @@ am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
PKG_CONFIG!$PKG_CONFIG$ac_delim
GTK_CFLAGS!$GTK_CFLAGS$ac_delim
GTK_LIBS!$GTK_LIBS$ac_delim
GTKGLEXT_CFLAGS!$GTKGLEXT_CFLAGS$ac_delim
GTKGLEXT_LIBS!$GTKGLEXT_LIBS$ac_delim
CPP!$CPP$ac_delim
GREP!$GREP$ac_delim
EGREP!$EGREP$ac_delim
@ -6130,7 +6462,7 @@ LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 92; then
if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 94; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5