[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[GNUnet-SVN] r2820 - in gnunet-gtk: . src/common
From: |
grothoff |
Subject: |
[GNUnet-SVN] r2820 - in gnunet-gtk: . src/common |
Date: |
Sun, 14 May 2006 12:25:51 -0700 (PDT) |
Author: grothoff
Date: 2006-05-14 12:25:48 -0700 (Sun, 14 May 2006)
New Revision: 2820
Modified:
gnunet-gtk/Makefile.am
gnunet-gtk/configure.ac
gnunet-gtk/src/common/helper.c
Log:
libnotify
Modified: gnunet-gtk/Makefile.am
===================================================================
--- gnunet-gtk/Makefile.am 2006-05-14 19:16:19 UTC (rev 2819)
+++ gnunet-gtk/Makefile.am 2006-05-14 19:25:48 UTC (rev 2820)
@@ -14,7 +14,6 @@
$(mkinstalldirs) $(DESTDIR)$(pkgdatadir)
$(INSTALL_DATA) gnunet-gtk.glade $(DESTDIR)$(pkgdatadir)
@$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(pkgdatadir); \
for pixmap in $(srcdir)/pixmaps/*; do \
if test -f $$pixmap; then \
$(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir); \
Modified: gnunet-gtk/configure.ac
===================================================================
--- gnunet-gtk/configure.ac 2006-05-14 19:16:19 UTC (rev 2819)
+++ gnunet-gtk/configure.ac 2006-05-14 19:25:48 UTC (rev 2820)
@@ -228,19 +228,53 @@
AC_MSG_ERROR([gnunet-gtk requires libextractor headers])
fi
-# libnotify
+# Is libnotify available?
LIBNOTIFY_REQUIRED=0.3.2
-PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= $LIBNOTIFY_REQUIRED],
libnotify=yes, libnotify=no)
-AC_SUBST([LIBNOTIFY_CFLAGS])
-AC_SUBST([LIBNOTIFY_LIBS])
-AM_CONDITIONAL([ENABLE_LIBNOTIFY],[test "x$libnotify" = "xyes"])
-if test "x$libnotify" != "xyes"; then
- AC_MSG_WARN([Library requirements (libnotify >= $LIBNOTIFY_REQUIRED) not
met; consider adjusting the PKG_CONFIG_PATH environment variable if your
libraries are in a nonstandard prefix so pkg-config can find them.])
+AC_ARG_ENABLE(libnotify,
+ [AC_HELP_STRING([--enable-libnotify],
+ [build with libnotify support [default=no]])],,
+ [enable_libnotify=no])
+if test x$enable_libnotify = xno ; then
+ have_libnotify=no;
else
- AC_MSG_NOTICE([** libnotify integration enabled])
- AC_DEFINE(WITH_LIBNOTIFY, 1, [Define if libnotify is enabled])
+ # See if we have sufficiently new libnotify library
+ PKG_CHECK_MODULES(LIBNOTIFY, libnotify >= $LIBNOTIFY_REQUIRED,
have_libnotify=yes, have_libnotify=no)
+ if test x$enable_libnotify = xauto ; then
+ if test x$have_libnotify = xno ; then
+ AC_MSG_WARN([Sufficiently new libnotify library not found])
+ fi
+ else
+ if test x$have_libnotify = xno ; then
+ AC_MSG_ERROR([libnotify explicitly required, and sufficiently
new libnotify library not found])
+ fi
+ fi
fi
+AM_CONDITIONAL(HAVE_LIBNOTIFY, test x$have_libnotify = xyes)
+if test x$have_libnotify = xyes ; then
+ # Find out the version of LIBNOTIFY we're using
+ libnotify_version=`pkg-config --modversion libnotify`
+ LIBNOTIFY_VERSION_MAJOR=`echo $libnotify_version | awk -F. '{print $1}'`
+ LIBNOTIFY_VERSION_MINOR=`echo $libnotify_version | awk -F. '{print $2}'`
+ LIBNOTIFY_VERSION_MICRO=`echo $libnotify_version | awk -F. '{print $3}'`
+ if test "z$LIBNOTIFY_VERSION_MAJOR" = "z"; then
+ LIBNOTIFY_VERSION_MAJOR="0"
+ fi
+ if test "z$LIBNOTIFY_VERSION_MINOR" = "z"; then
+ LIBNOTIFY_VERSION_MINOR="0"
+ fi
+ if test "z$LIBNOTIFY_VERSION_MICRO" = "z"; then
+ LIBNOTIFY_VERSION_MICRO="0"
+ fi
+ echo "Your libnotify version is
$LIBNOTIFY_VERSION_MAJOR.$LIBNOTIFY_VERSION_MINOR.$LIBNOTIFY_VERSION_MICRO."
+ LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS
-DLIBNOTIFY_VERSION_MAJOR=$LIBNOTIFY_VERSION_MAJOR"
+ LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS
-DLIBNOTIFY_VERSION_MINOR=$LIBNOTIFY_VERSION_MINOR"
+ LIBNOTIFY_CFLAGS="$LIBNOTIFY_CFLAGS
-DLIBNOTIFY_VERSION_MICRO=$LIBNOTIFY_VERSION_MICRO"
+ AC_SUBST([LIBNOTIFY_CFLAGS])
+ AC_SUBST([LIBNOTIFY_LIBS])
+ AC_DEFINE(WITH_LIBNOTIFY,1,[Define if libnotify is enabled])
+fi
+
# We define the paths here, because MinGW/GCC expands paths
# passed through the command line ("-DDATADIR=..."). This would
# lead to hard-coded paths ("C:\mingw\mingw\bin...") that do
@@ -277,3 +311,10 @@
gnunet-gtk.desktop
])
+
+
+if test x$have_libnotify = xyes ; then
+ AC_MSG_NOTICE([libnotify support is enabled (experimental)])
+else
+ AC_MSG_NOTICE([libnotify support disabled (this is ok)])
+fi
\ No newline at end of file
Modified: gnunet-gtk/src/common/helper.c
===================================================================
--- gnunet-gtk/src/common/helper.c 2006-05-14 19:16:19 UTC (rev 2819)
+++ gnunet-gtk/src/common/helper.c 2006-05-14 19:25:48 UTC (rev 2820)
@@ -29,11 +29,6 @@
#define HELPER_DEBUG NO
-/* libnotify is still too unstable -- causes crashes on
- my system. If you really want it, enable it here;
- but not by default or even configure option at this
- time */
-#undef WITH_LIBNOTIFY
#ifdef WITH_LIBNOTIFY
#include <libnotify/notify.h>
#endif
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [GNUnet-SVN] r2820 - in gnunet-gtk: . src/common,
grothoff <=