pidgin: 7ec23b3c: Add a --disable-missing-dependencies opt...
nosnilmot at pidgin.im
nosnilmot at pidgin.im
Fri Jul 4 14:05:45 EDT 2008
-----------------------------------------------------------------
Revision: 7ec23b3c9d370cf8f0c74580e751ca38fe000d3f
Ancestor: 2b2d7fb52eaac7e43d63ed70c894d57c7943ed32
Author: nosnilmot at pidgin.im
Date: 2008-07-04T17:59:25
Branch: im.pidgin.pidgin
URL: http://d.pidgin.im/viewmtn/revision/info/7ec23b3c9d370cf8f0c74580e751ca38fe000d3f
Modified files:
configure.ac
ChangeLog:
Add a --disable-missing-dependencies option to configure for people who
know what they are doing to avoid having to add (possibly lots of) other
--disable arguments when you don't want everything supported.
Fixes <20080704191200.e6364554.linux at partysoke.de>
-------------- next part --------------
============================================================
--- configure.ac cf6da194f49d03d660e37a960d52b03dd2d815da
+++ configure.ac d6aeed47ecc3319aaf11f7c06fdee0f1bc87444c
@@ -336,6 +336,10 @@ fi
AC_DEFINE_UNQUOTED(DISPLAY_VERSION, "$VERSION", [display version info])
fi
+AC_ARG_ENABLE(missing-dependencies, [AC_HELP_STRING([--disable-missing-dependencies],
+ [skip missing dependencies instead of aborting configure])],
+ force_deps="$enableval", force_deps="yes")
+
AC_ARG_WITH(x, [],
with_x="$withval", with_x="yes")
AC_ARG_ENABLE(gtkui, [AC_HELP_STRING([--disable-gtkui],
@@ -419,10 +423,12 @@ If you want to build only Finch then spe
X11_LIBS="$x_libpath_add"
X11_CFLAGS="$x_incpath_add"
else
- AC_MSG_ERROR([
+ if test "x$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
X11 development headers not found.
Use --without-x if you do not need X11 support.
])
+ fi
fi
])
AC_SUBST(X11_LIBS)
@@ -461,11 +467,13 @@ Use --without-x if you do not need X11 s
AC_DEFINE(USE_SCREENSAVER, 1, [Define if we're using XScreenSaver.])
AC_SUBST(XSS_LIBS)
else
- AC_MSG_ERROR([
+ if test "x$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
XScreenSaver extension development headers not found.
Use --disable-screensaver if you do not need XScreenSaver extension support,
this is required for detecting idle time by mouse and keyboard usage.
])
+ fi
fi
else
AC_MSG_ERROR([X support is required to build with XScreenSaver extensions])
@@ -490,10 +498,12 @@ this is required for detecting idle time
AC_DEFINE(USE_SM, 1, [Define if we're using X Session Management.])
AC_SUBST(SM_LIBS)
else
- AC_MSG_ERROR([
+ if test "x$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
X session management development headers not found.
Use --disable-sm if you do not need session management support.
])
+ fi
fi
else
AC_MSG_ERROR([X support is required to build with X session management support])
@@ -515,10 +525,12 @@ Use --disable-sm if you do not need sess
if test "x$enable_startup_notification" = "xyes"; then
PKG_CHECK_MODULES(STARTUP_NOTIFICATION, [libstartup-notification-1.0 >= 0.5], , [
AC_MSG_RESULT(no)
- AC_MSG_ERROR([
+ if test "x$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
Startup notification development headers not found.
Use --disable-startup-notification if you do not need it.
-])])
+])
+ fi])
if test "x$enable_startup_notification" = "xyes"; then
AC_DEFINE(HAVE_STARTUP_NOTIFICATION, 1, [Define if we're using libstartup-notification.])
@@ -533,10 +545,12 @@ Use --disable-startup-notification if yo
if test "x$enable_gtkspell" = "xyes" ; then
PKG_CHECK_MODULES(GTKSPELL, gtkspell-2.0 >= 2.0.2, , [
AC_MSG_RESULT(no)
- AC_MSG_ERROR([
+ if test "x$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
GtkSpell development headers not found.
Use --disable-gtkspell if you do not need it.
-])])
+])
+ fi])
if test "x$enable_gtkspell" = "xyes" ; then
AC_DEFINE(USE_GTKSPELL, 1, [Define if we're using GtkSpell])
AC_SUBST(GTKSPELL_CFLAGS)
@@ -566,10 +580,12 @@ Use --disable-gtkspell if you do not nee
AC_SUBST(EVOLUTION_ADDRESSBOOK_CFLAGS)
AC_SUBST(EVOLUTION_ADDRESSBOOK_LIBS)
else
- AC_MSG_ERROR([
+ if test "x$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
Evolution development headers not found.
Use --disable-gevolution if you do not need it.
])
+ fi
fi
fi
@@ -579,10 +595,12 @@ Use --disable-gevolution if you do not n
if test "x$enable_cap" = "xyes"; then
PKG_CHECK_MODULES(SQLITE3, sqlite3 >= 3.3,,[
AC_MSG_RESULT(no)
- AC_MSG_ERROR([
+ if test "x$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
sqlite3 development headers not found.
Use --disable-cap if you do not need the Contact Availability Prediction plugin.
-])])
+])
+ fi])
fi
@@ -719,10 +737,12 @@ if test "x$enable_gst" != "xno"; then
[], [$GSTREAMER_LIBS])
], [
AC_MSG_RESULT(no)
- AC_MSG_ERROR([
+ if test "x$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
GStreamer development headers not found.
Use --disable-gstreamer if you do not need GStreamer (sound) support.
-])])
+])
+ fi])
fi
dnl #######################################################################
@@ -737,10 +757,12 @@ if test "x$enable_meanwhile" = "xyes"; t
have_meanwhile="yes"
], [
have_meanwhile="no"
- AC_MSG_ERROR([
+ if test "x$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
Meanwhile development headers not found.
Use --disable-meanwhile if you do not need meanwhile (Sametime) support.
-])])
+])
+ fi])
fi
AC_SUBST(MEANWHILE_CFLAGS)
AC_SUBST(MEANWHILE_LIBS)
@@ -783,7 +805,7 @@ AC_CHECK_LIB(avahi-client, avahi_client_
fi
AC_CHECK_LIB(avahi-client, avahi_client_new, [avahilibs=yes], [avahilibs=no], $AVAHI_LIBS)
-if test "x$enable_avahi" = "xyes" -a \( "x$avahiincludes" = "xno" -o "x$avahilibs" = "xno" \); then
+if test "x$enable_avahi" = "xyes" -a "x$force_deps" = "xyes" -a \( "x$avahiincludes" = "xno" -o "x$avahilibs" = "xno" \); then
AC_MSG_ERROR([
avahi development headers not found.
Use --disable-avahi if you do not need avahi (Bonjour) support.
@@ -1155,7 +1177,6 @@ if test "x$GCC" = "xyes"; then
"-Wmissing-declarations" \
"-Wmissing-noreturn" \
"-Wmissing-prototypes" \
- "-Wnested-externs" \
"-Wpointer-arith" \
"-Wundef" \
; do
@@ -1220,10 +1241,12 @@ if test "x$enable_dbus" = "xyes" ; then
AC_SUBST(DBUS_LIBS)
enable_dbus=yes
], [
+ if test "x$force_deps" = "xyes" ; then
AC_MSG_ERROR([
D-Bus development headers not found.
Use --disable-dbus if you do not need D-Bus support.
-])])
+])
+ fi])
dnl Check for NetworkManager.h; if we don't have it, oh well
if test "x$enable_nm" = "xyes" ; then
@@ -1232,10 +1255,12 @@ dnl Check for NetworkManager.h; if we do
AC_SUBST(NETWORKMANAGER_LIBS)
AC_DEFINE(HAVE_NETWORKMANAGER, 1, [Define if we have NetworkManager.])
], [
- AC_MSG_ERROR([
+ if test "x$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
NetworkManager development headers not found.
Use --disable-nm if you do not need NetworkManager support.
-])])
+])
+ fi])
fi
else
enable_nm=no
@@ -1548,7 +1573,7 @@ fi
AM_CONDITIONAL(USE_PERL, false)
fi
-if test "x$looked_for_perl" = "xyes" -a "x$enable_perl" = "xno"; then
+if test "x$looked_for_perl" = "xyes" -a "x$enable_perl" = "xno" -a "x$force_deps" = "xyes"; then
AC_MSG_ERROR([
Perl development headers not found.
Use --disable-perl if you do not need Perl scripting support.
@@ -1959,19 +1984,19 @@ elif test "x$msg_gnutls" != "x"; then
msg_ssl=$msg_nss
elif test "x$msg_gnutls" != "x"; then
msg_ssl=$msg_gnutls
-elif test "x$looked_for_gnutls" = "xyes" -a "x$looked_for_nss" = "xyes"; then
+elif test "x$looked_for_gnutls" = "xyes" -a "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
AC_MSG_ERROR([
Neither GnuTLS or NSS SSL development headers found.
Use --disable-nss --disable-gnutls if you do not need SSL support.
MSN, Novell Groupwise and Google Talk will not work without GnuTLS or NSS. OpenSSL is NOT usable!
])
-elif test "x$looked_for_gnutls" = "xyes"; then
+elif test "x$looked_for_gnutls" = "xyes" -a "x$force_deps" = "xyes" ; then
AC_MSG_ERROR([
GnuTLS SSL development headers not found.
Use --disable-gnutls if you do not need SSL support.
MSN, Novell Groupwise and Google Talk will not work without SSL support.
])
-elif test "x$looked_for_nss" = "xyes"; then
+elif test "x$looked_for_nss" = "xyes" -a "x$force_deps" = "xyes" ; then
AC_MSG_ERROR([
NSS SSL development headers not found.
Use --disable-nss if you do not need SSL support.
@@ -2010,10 +2035,12 @@ if test "$enable_tcl" = yes; then
if test "$TCLCONFIG" = "no"; then
AC_MSG_RESULT([no])
enable_tcl=no
- AC_MSG_ERROR([
+ if test "x$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
Tcl development headers not found.
Use --disable-tcl if you do not need Tcl scripting support.
])
+ fi
else
. $TCLCONFIG
AC_MSG_CHECKING([Tcl version compatability])
@@ -2078,10 +2105,12 @@ if test "$enable_tcl" = yes -a "$enable_
if test "$TKCONFIG" = "no"; then
AC_MSG_RESULT([no])
enable_tk=no
- AC_MSG_ERROR([
+ if test "x$force_deps" = "xyes" ; then
+ AC_MSG_ERROR([
Tk development headers not found.
Use --disable-tk if you do not need Tk scripting support.
])
+ fi
else
. $TKCONFIG
eval "TK_LIB_SPEC=\"$TK_LIB_SPEC\""
More information about the Commits
mailing list