From 3c1470b29c6efb69832c11cf9b958ec4c9de64ae Mon Sep 17 00:00:00 2001 From: Ralf Baechle Date: Wed, 27 Mar 2019 10:34:58 +0100 Subject: autoconf: Renovate checking for GUI libraries. These days the fltk-config script does it all and so we can drop all the GL tests. Signed-off-by: Ralf Baechle --- configure.ac | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 92947d3..fefa5b6 100644 --- a/configure.ac +++ b/configure.ac @@ -23,13 +23,8 @@ AC_SUBST(FLTK_LIB) AC_CHECK_LIB(z, zlibVersion,Z_LIB="-lz",Z_LIB=) AC_CHECK_LIB(ax25, ax25_config_load_ports, AX25_LIB="-lax25", AC_MSG_ERROR([Could not find the libax25 libraries; aborting])) AC_CHECK_LIB(util, openpty, UTIL_LIB="-lutil",AC_MSG_ERROR([Could not find libutil; aborting])) -AC_CHECK_LIB(GL, main, GL_LIB="-lGL", - AC_CHECK_LIB(MesaGL, main, GL_LIB="-lMesaGL", GL_LIB=, ${X_LIBS} ${X_PRE_LIBS} -lXi -lXext -lX11 ${X_EXTRA_LIBS}),${X_LIBS} ${X_PRE_LIBS} -lXi -lXext -lX11 ${X_EXTRA_LIBS}) -if test -n "$GL_LIB"; then - AC_CHECK_LIB(fltk, main, FLTK_LIB="-lfltk $GL_LIB $X_PRE_LIBS -lXi -lXext -lX11 $X_EXTRA_LIBS", FLTK_LIB=, ${GL_LIB} ${X_LIBS} ${X_PRE_LIBS} -lXi -lXext -lX11 ${X_EXTRA_LIBS}) -fi -AM_CONDITIONAL(HAVE_FLTK, test -n "$FLTK_LIB" ) - +AC_CHECK_LIB([fltk], [main], [FLTK_LIB=`fltk-config --ldflags`], FLTK_LIB=) +AM_CONDITIONAL([HAVE_FLTK], [test -n "$FLTK_LIB"]) dnl Checks for header files. dnl AC_PATH_X -- cgit v1.2.3