Skip to content

Commit 38e74e7

Browse files
author
Vadim Godunko
committed
U914-021 Remove obsolete OpenGL autoconf code.
Change-Id: I50c01b08a11631827cb98125b3246937cb4fd8ad
1 parent 9b8e146 commit 38e74e7

File tree

5 files changed

+1
-379
lines changed

5 files changed

+1
-379
lines changed

‎aclocal.m4

-1
Original file line numberDiff line numberDiff line change
@@ -290,7 +290,6 @@ AS_VAR_IF([$1], [""], [$5], [$4])dnl
290290

291291
m4_include([m4/add_os_specific_flags.m4])
292292
m4_include([m4/check_build_type.m4])
293-
m4_include([m4/check_opengl.m4])
294293
m4_include([m4/gnu_gettext.m4])
295294
m4_include([m4/gtk-3.0.m4])
296295
m4_include([m4/path_gnat.m4])

‎configure

-250
Original file line numberDiff line numberDiff line change
@@ -586,11 +586,6 @@ PACKAGE_URL=''
586586

587587
ac_subst_vars='LTLIBOBJS
588588
LIBOBJS
589-
GL_CFLAGS_GPR
590-
GL_LIBS_GPR
591-
HAVE_OPENGL
592-
GL_CFLAGS
593-
GL_LIBS
594589
GTK_LIBS_GPR
595590
FONTCONFIG_LIBS
596591
FONTCONFIG_CFLAGS
@@ -689,8 +684,6 @@ enable_shared
689684
enable_build
690685
enable_nls
691686
enable_gtktest
692-
with_GL
693-
with_GL_prefix
694687
'
695688
ac_precious_vars='build_alias
696689
host_alias
@@ -1350,12 +1343,6 @@ Optional Features:
13501343
--disable-nls do not use Native Language Support
13511344
--disable-gtktest do not try to compile and run a test GTK+ program
13521345
1353-
Optional Packages:
1354-
--with-PACKAGE[=ARG] use PACKAGE [ARG=yes]
1355-
--without-PACKAGE do not use PACKAGE (same as --with-PACKAGE=no)
1356-
--with-GL=value Which OpenGL library to compile GtkAda with (auto,GL,GL32,MesaGL,,no)
1357-
--with-GL-prefix=DIR Prefix where GL/MesaGL is installed
1358-
13591346
Some influential environment variables:
13601347
PKG_CONFIG path to pkg-config utility
13611348
PKG_CONFIG_PATH
@@ -4377,241 +4364,6 @@ fi
43774364

43784365

43794366

4380-
# try to find OpenGL if present
4381-
4382-
4383-
# checking for OpenGL libraries
4384-
4385-
# Check whether --with-GL was given.
4386-
if test "${with_GL+set}" = set; then :
4387-
withval=$with_GL;
4388-
fi
4389-
4390-
4391-
# Check whether --with-GL-prefix was given.
4392-
if test "${with_GL_prefix+set}" = set; then :
4393-
withval=$with_GL_prefix;
4394-
fi
4395-
4396-
4397-
if test "x$with_GL_prefix" = "x" ; then
4398-
GL_LDOPTS=""
4399-
GL_CFLAGS=""
4400-
else
4401-
GL_CFLAGS="-I$with_GL_prefix/include"
4402-
case "${host}" in
4403-
*64*)
4404-
GL_LDOPTS="-L$with_GL_prefix/lib64"
4405-
;;
4406-
*)
4407-
GL_LDOPTS="-L$with_GL_prefix/lib"
4408-
;;
4409-
esac
4410-
fi
4411-
4412-
saved_LIBS="$LIBS"
4413-
4414-
if test "x$with_GL" != xno ; then
4415-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenGL" >&5
4416-
$as_echo_n "checking for OpenGL... " >&6; }
4417-
LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS -lGLU -lGL -lm -lX11"
4418-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4419-
/* end confdefs.h. */
4420-
4421-
int
4422-
main ()
4423-
{
4424-
char glBegin(); glBegin();
4425-
;
4426-
return 0;
4427-
}
4428-
_ACEOF
4429-
if ac_fn_c_try_link "$LINENO"; then :
4430-
have_GL=yes
4431-
else
4432-
have_GL=no
4433-
fi
4434-
rm -f core conftest.err conftest.$ac_objext \
4435-
conftest$ac_exeext conftest.$ac_ext
4436-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_GL" >&5
4437-
$as_echo "$have_GL" >&6; }
4438-
4439-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GL32" >&5
4440-
$as_echo_n "checking for GL32... " >&6; }
4441-
LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS -lglu32 -lopengl32 -lgdi32"
4442-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4443-
/* end confdefs.h. */
4444-
4445-
#include <GL/gl.h>
4446-
#include <windows.h>
4447-
int
4448-
main ()
4449-
{
4450-
glBegin(0);
4451-
CreateCompatibleDC(NULL);
4452-
;
4453-
return 0;
4454-
}
4455-
_ACEOF
4456-
if ac_fn_c_try_link "$LINENO"; then :
4457-
have_GL32=yes
4458-
else
4459-
have_GL32=no
4460-
fi
4461-
rm -f core conftest.err conftest.$ac_objext \
4462-
conftest$ac_exeext conftest.$ac_ext
4463-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_GL32" >&5
4464-
$as_echo "$have_GL32" >&6; }
4465-
4466-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Mesa" >&5
4467-
$as_echo_n "checking for Mesa... " >&6; }
4468-
LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS -lMesaGLU -lMesaGL"
4469-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4470-
/* end confdefs.h. */
4471-
4472-
int
4473-
main ()
4474-
{
4475-
char glBegin(); glBegin();
4476-
;
4477-
return 0;
4478-
}
4479-
_ACEOF
4480-
if ac_fn_c_try_link "$LINENO"; then :
4481-
have_MesaGL=yes
4482-
else
4483-
have_MesaGL=no
4484-
fi
4485-
rm -f core conftest.err conftest.$ac_objext \
4486-
conftest$ac_exeext conftest.$ac_ext
4487-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_MesaGL" >&5
4488-
$as_echo "$have_MesaGL" >&6; }
4489-
4490-
if test "x$have_MesaGL" = "xno"; then
4491-
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking Mesa with pthreads" >&5
4492-
$as_echo_n "checking Mesa with pthreads... " >&6; }
4493-
LIBS="$saved_LIBS $GTK_LIBS $GL_LDOPTS -lMesaGLU -lMesaGL -lpthread"
4494-
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
4495-
/* end confdefs.h. */
4496-
4497-
int
4498-
main ()
4499-
{
4500-
char glBegin(); glBegin();
4501-
;
4502-
return 0;
4503-
}
4504-
_ACEOF
4505-
if ac_fn_c_try_link "$LINENO"; then :
4506-
have_MesaGL_pthread=yes
4507-
else
4508-
have_MesaGL_pthread=no
4509-
fi
4510-
rm -f core conftest.err conftest.$ac_objext \
4511-
conftest$ac_exeext conftest.$ac_ext
4512-
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_MesaGL_pthread" >&5
4513-
$as_echo "$have_MesaGL_pthread" >&6; }
4514-
fi
4515-
fi
4516-
4517-
LIBS="$saved_LIBS"
4518-
HAVE_OPENGL="False"
4519-
4520-
case "x$with_GL" in
4521-
x|xauto)
4522-
if test "x$have_GL" = "xyes"; then
4523-
GL_LIBS="$GL_LDOPTS -lGLU -lGL -lm -lX11"
4524-
HAVE_OPENGL="True"
4525-
elif test "x$have_GL32" = "xyes"; then
4526-
GL_LIBS="$GL_LDOPTS -lglu32 -lopengl32 -lgdi32"
4527-
HAVE_OPENGL="True"
4528-
elif test "x$have_MesaGL" = "xyes"; then
4529-
GL_LIBS="$GL_LDOPTS -lMesaGLU -lMesaGL"
4530-
HAVE_OPENGL="True"
4531-
elif test "x$have_MesaGL_pthread" = "xyes"; then
4532-
GL_LIBS="$GL_LDOPTS -lMesaGLU -lMesaGL -lpthread"
4533-
HAVE_OPENGL="True"
4534-
fi
4535-
;;
4536-
xGL)
4537-
if test "x$have_GL" = "xyes"; then
4538-
GL_LIBS="$GL_LDOPTS -lGLU -lGL -lm -lX11"
4539-
HAVE_OPENGL="True"
4540-
else
4541-
as_fn_error $? "Missing OpenGL library" "$LINENO" 5
4542-
fi
4543-
;;
4544-
xGL32)
4545-
if test "x$have_GL" = "xyes"; then
4546-
GL_LIBS="$GL_LDOPTS -lglu32 -lopengl32 -lgdi32"
4547-
HAVE_OPENGL="True"
4548-
else
4549-
as_fn_error $? "Missing Windows OpenGL library" "$LINENO" 5
4550-
fi
4551-
;;
4552-
xMesaGL)
4553-
if test "x$have_MesaGL" = "xyes"; then
4554-
GL_LIBS="$GL_LDOPTS -lMesaGLU -lMesaGL"
4555-
HAVE_OPENGL="True"
4556-
elif test "x$have_MesaGL_pthread" = "xyes"; then
4557-
GL_LIBS="$GL_LDOPTS -lMesaGLU -lMesaGL -lpthread"
4558-
HAVE_OPENGL="True"
4559-
else
4560-
as_fn_error $? "Missing Mesa library" "$LINENO" 5
4561-
fi
4562-
;;
4563-
xno)
4564-
;;
4565-
*)
4566-
as_fn_error $? "Unknown value for \"--with-GL\" option. Should be either auto, GL32, GL, MesaGL, no" "$LINENO" 5
4567-
;;
4568-
esac
4569-
4570-
4571-
4572-
4573-
4574-
value=$GL_LIBS
4575-
4576-
# Special handling on darwin for gcc 4.5 and 4.7
4577-
case "$build_os" in
4578-
*darwin*)
4579-
value=`echo $value | sed -e "s/-framework \([^ ]*\)/-Wl,-framework -Wl,\1/g"`
4580-
esac
4581-
4582-
output=GL_LIBS_GPR
4583-
result=""
4584-
for v in $value; do
4585-
if test "$result" != ""; then
4586-
result="$result, "
4587-
fi
4588-
result="$result\"$v\""
4589-
done
4590-
GL_LIBS_GPR=$result
4591-
4592-
4593-
4594-
value=$GL_CFLAGS
4595-
4596-
# Special handling on darwin for gcc 4.5 and 4.7
4597-
case "$build_os" in
4598-
*darwin*)
4599-
value=`echo $value | sed -e "s/-framework \([^ ]*\)/-Wl,-framework -Wl,\1/g"`
4600-
esac
4601-
4602-
output=GL_CFLAGS_GPR
4603-
result=""
4604-
for v in $value; do
4605-
if test "$result" != ""; then
4606-
result="$result, "
4607-
fi
4608-
result="$result\"$v\""
4609-
done
4610-
GL_CFLAGS_GPR=$result
4611-
4612-
4613-
4614-
46154367
# Ignore user's choice of libdir, as well as configure's own default,
46164368
# because we want GtkAda to always install in /lib (backward compatibility)
46174369

@@ -5782,7 +5534,5 @@ fi
57825534
$as_echo "$as_me: --------- Summary for Gtkada $PACKAGE_VERSION -----------------" >&6;}
57835535
{ $as_echo "$as_me:${as_lineno-$LINENO}: Shared libraries: $CAN_BUILD_SHARED (default: $DEFAULT_LIBRARY_TYPE)" >&5
57845536
$as_echo "$as_me: Shared libraries: $CAN_BUILD_SHARED (default: $DEFAULT_LIBRARY_TYPE)" >&6;}
5785-
{ $as_echo "$as_me:${as_lineno-$LINENO}: OpenGL: $HAVE_OPENGL" >&5
5786-
$as_echo "$as_me: OpenGL: $HAVE_OPENGL" >&6;}
57875537
{ $as_echo "$as_me:${as_lineno-$LINENO}: --------------------------------------------" >&5
57885538
$as_echo "$as_me: --------------------------------------------" >&6;}

‎configure.ac

-4
Original file line numberDiff line numberDiff line change
@@ -35,9 +35,6 @@ AM_GNU_GETTEXT([external])
3535
PKG_CHECK_MODULES([GTK], [gtk+-3.0])
3636
AM_PATH_GTK
3737

38-
# try to find OpenGL if present
39-
AM_CHECK_OPENGL
40-
4138
# Ignore user's choice of libdir, as well as configure's own default,
4239
# because we want GtkAda to always install in /lib (backward compatibility)
4340

@@ -48,5 +45,4 @@ AC_OUTPUT(Makefile shared.gpr po/Makefile docs/gtkada_rm/html/static/index.html)
4845
AC_MSG_NOTICE([--------- Summary for Gtkada $PACKAGE_VERSION -----------------])
4946
AC_MSG_NOTICE(AC_HELP_STRING(
5047
[Shared libraries:],[$CAN_BUILD_SHARED (default: $DEFAULT_LIBRARY_TYPE)]))
51-
AC_MSG_NOTICE(AC_HELP_STRING([OpenGL:],[$HAVE_OPENGL]))
5248
AC_MSG_NOTICE([--------------------------------------------])

0 commit comments

Comments
 (0)