From 9bf2e4c9892766dfa64e978fb17057b638659d57 Mon Sep 17 00:00:00 2001
From: Craig Small <csmall@enc.com.au>
Date: Thu, 10 May 2001 10:44:45 +0000
Subject: synced to klaus code

---
 configure.in | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'configure.in')

diff --git a/configure.in b/configure.in
index a0330ef..c1a07f1 100644
--- a/configure.in
+++ b/configure.in
@@ -2,7 +2,7 @@ dnl Process this file with autoconf to produce a configure script.
 AC_INIT(ax25/ax25d.c)
 
 dnl For automake
-VERSION=0.0.6
+VERSION=0.0.8cvs
 PACKAGE=ax25-tools
 AM_INIT_AUTOMAKE($PACKAGE,$VERSION)
 
@@ -31,8 +31,11 @@ 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(ncurses, initscr,NCURSES_LIB="-lncurses",NCURSES_LIB=)
 AC_CHECK_LIB(util, openpty, UTIL_LIB="-lutil",UTIL_LIB=)
-AC_CHECK_LIB(fltk, main, FLTK_LIB="-lfltk -lMesaGL", FLTK_LIB=,${X_LIBS} -lX11 -lXext -lMesaGL)
-
+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" )
 
 
@@ -41,8 +44,6 @@ dnl AC_PATH_X
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(fcntl.h limits.h paths.h strings.h sys/file.h sys/ioctl.h sys/time.h syslog.h unistd.h zlib.h )
-AC_SUBST(DMASCC)
-AC_CHECK_HEADERS(linux/dmascc.h, DMASCC="dmascc", DMASCC="")
 
 dnl Checks for working glibc 2.1 headers
 AC_MSG_CHECKING(for working netax25/ax25.h header file)
-- 
cgit v1.2.3