diff options
| author | Rod Whitby <rod@whitby.id.au> | 2007-05-09 05:44:30 +0000 |
|---|---|---|
| committer | Rod Whitby <rod@whitby.id.au> | 2007-05-09 05:44:30 +0000 |
| commit | fb1bf22bf1f99bf39062a414dc95b783af24e0eb (patch) | |
| tree | 9de3ace3c9bb1605e6306e9c2fba8febfcc52ccb /packages/gaim/pidgin/sanitize-configure.ac.patch | |
| parent | 0af1290e79f6d482be943cadb292c1f3c44c3aab (diff) | |
| parent | a1da152a12837b54328d9f6bae672c23815df67c (diff) | |
merge of '8cf0ade6025c07f6fb2d8dcb863a8e6b345dddaa'
and 'e7a885c65fac678637bdc0153d73dafaa9bb1608'
Diffstat (limited to 'packages/gaim/pidgin/sanitize-configure.ac.patch')
| -rw-r--r-- | packages/gaim/pidgin/sanitize-configure.ac.patch | 33 |
1 files changed, 33 insertions, 0 deletions
diff --git a/packages/gaim/pidgin/sanitize-configure.ac.patch b/packages/gaim/pidgin/sanitize-configure.ac.patch new file mode 100644 index 0000000000..a77d64f40b --- /dev/null +++ b/packages/gaim/pidgin/sanitize-configure.ac.patch @@ -0,0 +1,33 @@ +--- /tmp/configure.ac 2007-05-08 17:29:02.000000000 +0200 ++++ pidgin-2.0.0/configure.ac 2007-05-08 17:30:30.325251000 +0200 +@@ -472,7 +472,7 @@ + if test "x$enable_consoleui" = "xyes"; then + dnl # Some distros put the headers in ncursesw/, some don't + found_ncurses_h=no +- for location in $ac_ncurses_includes $NCURSES_HEADERS /usr/include/ncursesw /usr/include ++ for location in $ac_ncurses_includes $NCURSES_HEADERS + do + f="$location/ncurses.h" + AC_CHECK_HEADER($f,[ +@@ -1860,10 +1860,6 @@ + KRB4_CFLAGS="$KRB4_CFLAGS -I${kerberos}/include/kerberosIV" + fi + KRB4_LDFLAGS="-L${kerberos}/lib" +- elif test -d /usr/local/include/kerberosIV ; then +- KRB4_CFLAGS="-I/usr/local/include/kerberosIV" +- elif test -d /usr/include/kerberosIV ; then +- KRB4_CFLAGS="-I/usr/include/kerberosIV" + fi + AC_DEFINE(ZEPHYR_USES_KERBEROS, 1, [Define if kerberos should be used in Zephyr.]) + +@@ -1896,10 +1892,6 @@ + ZEPHYR_LDFLAGS="-L${zephyr}/lib" + elif test -d /usr/athena/include/zephyr ; then + ZEPHYR_CFLAGS="-I/usr/athena/include" +- elif test -d /usr/include/zephyr ; then +- ZEPHYR_CFLAGS="-I/usr/include" +- elif test -d /usr/local/include/zephyr ; then +- ZEPHYR_CFLAGS="-I/usr/local/include" + fi + AC_DEFINE(LIBZEPHYR_EXT, 1 , [Define if external libzephyr should be used.]) + AM_CONDITIONAL(EXTERNAL_LIBZEPHYR, test "x$zephyr" != "xno") |