Fix build on FreeBSD, thanks to Guy Yur.
authorRoy Marples <roy@marples.name>
Mon, 9 Feb 2015 13:35:09 +0000 (13:35 +0000)
committerRoy Marples <roy@marples.name>
Mon, 9 Feb 2015 13:35:09 +0000 (13:35 +0000)
configure
mk/lib.mk

index 1de774916dbc5b54c956cee19599df8470d2db8f..002a78bc27bd561b646eebaa4b616f63c5ca87f6 100755 (executable)
--- a/configure
+++ b/configure
@@ -391,7 +391,7 @@ if [ -n "$WITH_GTK" -a "$WITH_GTK" != no ]; then
        if [ "$NOTIFY" = yes -o -z "$NOTIFY" ]; then
                if ! pkg-config --cflags libnotify >/dev/null 2>&3; then
                        echo "libnotify not found" >&2
-                       [ "$NOTIFY" = yes -n "$_WITH_GTK" ] && exit 1
+                       [ "$NOTIFY" = yes -a -n "$_WITH_GTK" ] && exit 1
                fi
                NOTIFY=yes
        fi
@@ -429,7 +429,7 @@ fi
 
 NOTIFY="$_NOTIFY"
 if $DHCPCD_QT && [ -z "$NOTFY" -o "$NOTIFY" = yes ]; then
-       if type knotify4 >/dev/null 2>&3; then
+       if kde4-config --path lib --locate libkdeui.so >/dev/null 2>&3; then
                QMAKE_CONFIG="$QMAKE_CONFIG CONFIG+=has_libkdeui"
                echo "Building dhcpcd-qt with notification support"
        elif [ "$NOTIFY" = yes ]; then
index 544ee071ef52bee76aae5911beae6bf600696d70..c2db4f2aa524be4b699764250c452e23327875ef 100644 (file)
--- a/mk/lib.mk
+++ b/mk/lib.mk
@@ -7,7 +7,7 @@ SONAME?=                ${SHLIB}
 
 OBJS+=                 ${SRCS:.c=.o}
 SOBJS+=                        ${OBJS:.o=.So}
-LIBS?=                 ${LIBNAME} ${SHLIB}
+LIBS                 ${LIBNAME} ${SHLIB}
 
 CLEANFILES+=           ${OBJS} ${SOBJS} ${LIBS} ${SHLIB_LINK}