pidgin.win32.autotools: 6f4ab698: Tweaks to configure.ac to make it cleane...
datallah at pidgin.im
datallah at pidgin.im
Fri Dec 30 14:25:41 EST 2011
----------------------------------------------------------------------
Revision: 6f4ab698badbd9bc2f15176510e560163dc06c00
Parent: 0e6495184307f5692b03e51f8643caf89f62e5c3
Author: datallah at pidgin.im
Date: 12/30/11 14:19:58
Branch: im.pidgin.pidgin.win32.autotools
URL: http://d.pidgin.im/viewmtn/revision/info/6f4ab698badbd9bc2f15176510e560163dc06c00
Changelog:
Tweaks to configure.ac to make it cleaner on win32
Changes against parent 0e6495184307f5692b03e51f8643caf89f62e5c3
patched configure.ac
-------------- next part --------------
============================================================
--- configure.ac 8e5ee51a8cc9af907f70ff7964853b51e5d4da31
+++ configure.ac a6c69f44b96d1977d946a83b4dc57462e41f39be
@@ -150,6 +150,13 @@ AC_SUBST(PIDGIN_LIBS)
AC_SUBST(PURPLE_LIBS)
AC_SUBST(PIDGIN_LIBS)
+if test "$os_win32" = "yes"; then
+ AC_CHECK_TOOL(WINDRES, windres, no)
+ if test "$WINDRES" = no; then
+ AC_MSG_ERROR([*** Could not find an implementation of windres in your PATH.])
+ fi
+fi
+
dnl Checks for header files.
AC_HEADER_STDC
AC_HEADER_SYS_WAIT
@@ -408,7 +415,7 @@ AC_ARG_WITH(x, [],
force_deps="$enableval", force_deps="yes")
AC_ARG_WITH(x, [],
- with_x="$withval", with_x="yes")
+ with_x="$withval", with_x="$not_os_win32")
AC_ARG_ENABLE(gtkui, [AC_HELP_STRING([--disable-gtkui],
[compile without GTK+ user interface])],
enable_gtkui="$enableval", enable_gtkui="yes")
@@ -928,7 +935,7 @@ AC_ARG_ENABLE(avahi,
AC_ARG_ENABLE(avahi,
[AC_HELP_STRING([--disable-avahi],
[compile without avahi (required for Bonjour support)])],
- enable_avahi="$enableval", enable_avahi="yes")
+ enable_avahi="$enableval", enable_avahi="$not_os_win32")
if test "x$enable_avahi" = "xyes"; then
AC_ARG_WITH(avahi-client-includes, [AC_HELP_STRING([--with-avahi-client-includes=DIR], [compile the Bonjour plugin against the Avahi Client includes in DIR])], [ac_avahi_client_includes="$withval"], [ac_avahi_client_includes="no"])
More information about the Commits
mailing list