diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2019-03-27 10:34:58 +0100 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2019-03-27 10:34:58 +0100 |
| commit | 3c1470b29c6efb69832c11cf9b958ec4c9de64ae (patch) | |
| tree | 770fd5cf09fc598530642f962f941d244da560bc | |
| parent | 5e6076afed0447a131e9561baaaf8e9dbcad37c1 (diff) | |
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 <ralf@linux-mips.org>
| -rw-r--r-- | configure.ac | 9 |
1 files 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 |