[Commit-gnuradio] r9596 - gnuradio/branches/developers/trondeau/qtgui/config

[trondeau]

Author: trondeau
Date: 2008-09-16 21:13:42 -0600 (Tue, 16 Sep 2008)
New Revision: 9596

Modified:
   gnuradio/branches/developers/trondeau/qtgui/config/gr_qwt.m4
Log:
wip: fixes so it doesn't check for libraries if it can't fin the header; allows 
user-inputted qwt library name if required.

Modified: gnuradio/branches/developers/trondeau/qtgui/config/gr_qwt.m4
===================================================================
--- gnuradio/branches/developers/trondeau/qtgui/config/gr_qwt.m4        
2008-09-17 03:11:44 UTC (rev 9595)
+++ gnuradio/branches/developers/trondeau/qtgui/config/gr_qwt.m4        
2008-09-17 03:13:42 UTC (rev 9596)
@@ -48,6 +48,9 @@
     AC_ARG_WITH([qwt-incdir],
                [  --with-qwt-incdir=path  Prefix where QWT include files are 
(optional)],
                [qwt_incdir="$withval"], [qwt_incdir=""])
+    AC_ARG_WITH([qwt-lib],
+               [  --with-qwt-lib=library  QWT library name (optional)],
+               [qwt_lib="$withval"], [qwt_lib=""])
 
     dnl Check for presence of header files
     dnl if not user-specified, try the first include dir (Ubuntu), then
@@ -78,7 +81,6 @@
             else
                 dnl otherwise, qwt.h wasn't found, so set the flag to no
                 libqwt_ok=no
-                AC_MSG_RESULT([cannot find usable qwt headers])
             fi
         fi
     else
@@ -87,36 +89,47 @@
         AC_CHECK_HEADER(
             [$qwt_incdir/qwt.h],
            [],
-           [libqwt_ok=no;AC_MSG_RESULT([cannot find usable qwt headers])]
-        )
+           [libqwt_ok=no])
     fi
 
-    dnl Check for QWT library (qwt or qwt-qt4)
+    dnl Don't bother going on if we can't find the headers
+    if test "$libqwt_ok" = "yes" ; then
 
-    dnl User-defined QWT library path
-    if test "$qwt_libdir" != "" ; then
-        QWT_LIBS="-L$qwt_libdir $QWT_LIBS"
-    fi
-    
-    dnl temporarily set these so the AC_CHECK_LIB works
-    CPPFLAGS="$CPPFLAGS $QWT_CFLAGS"
-    LIBS="$qwt_save_LIBS $QT_LIBS $QWT_LIBS -lqwt"
+        dnl Check for QWT library (qwt or qwt-qt4)
 
-    dnl Check for 'main' in libqwt (Fedora)
-    AC_CHECK_LIB([qwt], [main], [libqwt_ok=yes], [libqwt_ok=no])
+        dnl User-defined QWT library path
+        if test "$qwt_libdir" != "" ; then
+            QWT_LIBS="-L$qwt_libdir $QWT_LIBS"
+        fi
 
-    dnl If library found properly, set the flag and move on
-    if test "$libqwt_ok" = "yes" ; then
-        QWT_LIBS="$QWT_LIBS -lqwt"
+        dnl temporarily set these so the AC_CHECK_LIB works
+        CPPFLAGS="$CPPFLAGS $QWT_CFLAGS"
+        LIBS="$qwt_save_LIBS $QT_LIBS $QWT_LIBS -lqwt"
+
+        dnl If the user specified a qwt library name, use it here
+        if test "$qwt_lib" != "" ; then
+            AC_CHECK_LIB([$qwt_lib], [main], [libqwt_ok=yes], [libqwt_ok=no])
+
+        else            
+            dnl Check for 'main' in libqwt (Fedora)
+            AC_CHECK_LIB([qwt], [main], [libqwt_ok=yes], [libqwt_ok=no])
+
+            dnl If library found properly, set the flag and move on
+            if test "$libqwt_ok" = "yes" ; then
+                QWT_LIBS="$QWT_LIBS -lqwt"
+            else
+                dnl Otherwise, check for 'main' in libqwt-qt4 (Ubuntu)
+                LIBS="$qwt_save_LIBS $QT_LIBS $QWT_LIBS -lqwt-qt4"
+                AC_CHECK_LIB([qwt-qt4], [main], [libqwt_ok=yes], 
[libqwt_ok=no])
+                if test "$libqwt_ok" = "yes" ; then
+                    QWT_LIBS="$QWT_LIBS -lqwt-qt4"
+                else
+                    AC_MSG_RESULT([Could not link to libqwt.so])
+                fi
+            fi
+        fi
     else
-        dnl Otherwise, check for 'main' in libqwt-qt4 (Ubuntu)
-        LIBS="$qwt_save_LIBS $QT_LIBS $QWT_LIBS -lqwt-qt4"
-         AC_CHECK_LIB([qwt-qt4], [main], [libqwt_ok=yes], [libqwt_ok=no])
-        if test "$libqwt_ok" = "yes" ; then
-            QWT_LIBS="$QWT_LIBS -lqwt-qt4"
-        else
-            AC_MSG_ERROR([Could not link to libqwt.so])
-        fi
+        AC_MSG_RESULT([Could not find qwt headers])
     fi
 
     dnl Restore saved variables