Make -lqthreads be detected by qt_null, not main - now works on Debian

svn path=/trunk/; revision=821

diff --git a/macros/ChangeLog b/macros/ChangeLog
index 8f978eb..38150d5 100644 (file)
--- a/macros/ChangeLog
+++ b/macros/ChangeLog
@@ -1,3 +1,9 @@
+1999-06-11  Tuomas J. Lukka <lukka@iki.fi>
+
+       * gnome-guile-checks.m4: Debian has qt_null in -lqthreads but
+         no main. Changed both checks for 'main' to qt_null.
+         I hope this is correct - it shouldn't break anything.
+
 1999-05-11  Raja R Harinath  <harinath@cs.umn.edu>
 
        * Makefile.am (MACROS): Add `gnome-bonobo-check.m4'.

diff --git a/macros/gnome-guile-checks.m4 b/macros/gnome-guile-checks.m4
index f858f65..1086d30 100644 (file)
--- a/macros/gnome-guile-checks.m4
+++ b/macros/gnome-guile-checks.m4
@@ -10,7 +10,7 @@ AC_DEFUN([GNOME_CHECK_GUILE],
        saved_cppflags="$CPPFLAGS"
        LDFLAGS="$LDFLAGS $GNOME_LIBDIR"
 
-       AC_CHECK_LIB(qthreads,main,[
+       AC_CHECK_LIB(qthreads,qt_null,[
                QTTHREADS_LIB="-lqthreads"
        ],[
                AC_CHECK_LIB(qt, qt_null, QTTHREADS_LIB="-lqt")
@@ -71,7 +71,7 @@ AC_DEFUN([GNOME_CHECK_GUILE],
                GUILE_LIBS="$GNOME_LIBDIR"
                GUILE_INCS="$GNOME_INCLUDEDIR"
                AC_CHECK_LIB(rx, main, GUILE_LIBS="-lrx $GUILE_LIBS")
-               AC_CHECK_LIB(qt, main, GUILE_LIBS="-lqt $GUILE_LIBS")
+               AC_CHECK_LIB(qt, qt_null, GUILE_LIBS="-lqt $GUILE_LIBS")
                AC_CHECK_LIB(dl, dlopen, GUILE_LIBS="-ldl $GUILE_LIBS")
                AC_CHECK_LIB(nsl, t_accept, GUILE_LIBS="$GUILE_LIBS -lnsl")
                AC_CHECK_LIB(socket, socket, GUILE_LIBS="$GUILE_LIBS -lsocket")