[Xfce4-commits] <orage:master> 4.7.5.19: Added check for libpopt (bug 6287)

[Juha Kautto]

Updating branch refs/heads/master
         to 5ee670e686d7a6d724146b25c546afc617ee9275 (commit)
       from c445ea18d96c593e065cf7bdbfcd3b1a259cd40a (commit)

commit 5ee670e686d7a6d724146b25c546afc617ee9275
Author: Juha Kautto <juha at xfce.org>
Date:   Sat Mar 13 13:29:51 2010 +0200

    4.7.5.19: Added check for libpopt (bug 6287)
    
    Now checking libpopt and compiling tz_convert only if it is available.
    tz_convert is not needed if using systems libical and is not mandatory
    even if using local libical, so it is safe to leave it out.

 configure.in.in        |   15 ++++++++++++++-
 tz_convert/Makefile.am |    2 ++
 2 files changed, 16 insertions(+), 1 deletions(-)

diff --git a/configure.in.in b/configure.in.in
index 1e89f5c..20af4ca 100644
--- a/configure.in.in
+++ b/configure.in.in
@@ -9,7 +9,7 @@ dnl Written for Xfce by Juha Kautto <juha at xfce.org>
 dnl
 
 dnl Version information
-m4_define([orage_version], [4.7.5.18-git])
+m4_define([orage_version], [4.7.5.19-git])
 
 m4_define([gtk_minimum_version], [2.10.0])
 m4_define([xfce_minimum_version], [4.6.0])
@@ -232,6 +232,14 @@ XDT_CHECK_OPTIONAL_PACKAGE([NOTIFY], [libnotify],
                            [notify_minimum_version], [libnotify],
                            [LIBNOTIFY support])
 
+dnl **************************************
+dnl *** Check support for libpopt      ***
+dnl **************************************
+AC_CHECK_LIB([popt], [poptGetContext], 
+        [have_popt="yes"
+         AC_DEFINE([HAVE_LIBPOTPT], [1], [Define if we have popt])
+        ])
+AM_CONDITIONAL([HAVE_LIBPOTPT], [test x"$have_popt" = x"yes"])
 
 dnl ************************************************
 dnl *** Optional support for automatic archiving ***
@@ -308,4 +316,9 @@ else
 echo "* LIBICAL support:           Orage local"
 fi
 echo "* Automatic archiving:       $have_archive"
+if test x"$have_popt" = x"yes"; then
+echo "* libpopt available:         building tz_convert"
+else
+echo "* libpopt not available:     not building tz_convert"
+fi
 echo
diff --git a/tz_convert/Makefile.am b/tz_convert/Makefile.am
index a71dd5b..ebb4613 100644
--- a/tz_convert/Makefile.am
+++ b/tz_convert/Makefile.am
@@ -1,4 +1,6 @@
+if HAVE_LIBPOTPT
 bin_PROGRAMS = tz_convert
+endif
 
 man_MANS =                             		 \
 	tz_convert.1