Mercurial > pidgin

comparison configure.ac @ 13818:ec7848583492

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[gaim-migrate @ 16250] Some cosmetic cleanups that have been sitting in my tree for a while. I wouldn't be committing this now, except SVN is being a real pain. Apparently having changes in your tree when someone else commits changes is a conflict, even when they're in totally different parts of the file? committer: Tailor Script <tailor@pidgin.im>
author Richard Laager <rlaager@wiktel.com>
date Sun, 11 Jun 2006 00:06:02 +0000
parents e0e8959d92a0
children f3d4a9902ead
comparison
equal deleted inserted replaced
13817:ad8ddfa756ad 13818:ec7848583492
316 316
317 317
318 dnl ####################################################################### 318 dnl #######################################################################
319 dnl # Check for Gadu-Gadu client includes and libraries 319 dnl # Check for Gadu-Gadu client includes and libraries
320 dnl ####################################################################### 320 dnl #######################################################################
321 AC_ARG_WITH(gadu-includes, [AC_HELP_STRING([--with-gadu-includes=DIR], [compile the GaduGadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"]) 321 AC_ARG_WITH(gadu-includes, [AC_HELP_STRING([--with-gadu-includes=DIR], [compile the Gadu-Gadu plugin against includes in DIR])], [ac_gadu_includes="$withval"], [ac_gadu_includes="no"])
322 AC_ARG_WITH(gadu-libs, [AC_HELP_STRING([--with-gadu-libs=DIR], [compile the GaduGadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"]) 322 AC_ARG_WITH(gadu-libs, [AC_HELP_STRING([--with-gadu-libs=DIR], [compile the Gadu-Gadu plugin against the libs in DIR])], [ac_gadu_libs="$withval"], [ac_gadu_libs="no"])
323 GADU_CFLAGS="" 323 GADU_CFLAGS=""
324 GADU_LIBS="" 324 GADU_LIBS=""
325 if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then 325 if test -n "$with_gadu_includes" || test -n "$with_gadu_libs"; then
326 gadu_manual_check="yes" 326 gadu_manual_check="yes"
327 else 327 else
1070 dnl ####################################################################### 1070 dnl #######################################################################
1071 1071
1072 dnl These two are inverses of each other <-- stolen from evolution! 1072 dnl These two are inverses of each other <-- stolen from evolution!
1073 1073
1074 AC_ARG_ENABLE(gnutls, 1074 AC_ARG_ENABLE(gnutls,
1075 [ --enable-gnutls=[yes,no] attempt to use GNUTLS for SSL support (preferred) [default=yes]], 1075 [ --enable-gnutls=[yes,no] attempt to use GnuTLS for SSL support (preferred) [default=yes]],
1076 [enable_gnutls="$enableval"], 1076 [enable_gnutls="$enableval"],
1077 [enable_gnutls="yes"]) 1077 [enable_gnutls="yes"])
1078 1078
1079 AC_ARG_ENABLE(nss, 1079 AC_ARG_ENABLE(nss,
1080 [ --enable-nss=[yes,no,static] attempt to use Mozilla libnss for SSL support [default=yes]], 1080 [ --enable-nss=[yes,no,static] attempt to use Mozilla libnss for SSL support [default=yes]],
1082 [enable_nss="yes"]) 1082 [enable_nss="yes"])
1083 1083
1084 msg_ssl="None (MSN will not work without SSL!)" 1084 msg_ssl="None (MSN will not work without SSL!)"
1085 1085
1086 dnl # 1086 dnl #
1087 dnl # Check for GNUTLS if it's specified. 1087 dnl # Check for GnuTLS if it's specified.
1088 dnl # 1088 dnl #
1089 if test "x$enable_gnutls" != "xno"; then 1089 if test "x$enable_gnutls" != "xno"; then
1090 enable_gnutls="no" 1090 enable_gnutls="no"
1091 prefix=`eval echo $prefix` 1091 prefix=`eval echo $prefix`
1092 1092
1093 AC_ARG_WITH(gnutls-includes, 1093 AC_ARG_WITH(gnutls-includes,
1094 [ --with-gnutls-includes=PREFIX location of GNUTLS includes.], 1094 [ --with-gnutls-includes=PREFIX location of GnuTLS includes.],
1095 [ with_gnutls_includes="$withval" ], 1095 [ with_gnutls_includes="$withval" ],
1096 [ with_gnutls_includes="$prefix/include" ]) 1096 [ with_gnutls_includes="$prefix/include" ])
1097 1097
1098 have_gnutls_includes="no" 1098 have_gnutls_includes="no"
1099 1099
1100 if test "x$with_gnutls_includes" != "xno"; then 1100 if test "x$with_gnutls_includes" != "xno"; then
1101 CPPFLAGS_save="$CPPFLAGS" 1101 CPPFLAGS_save="$CPPFLAGS"
1102 1102
1103 AC_MSG_CHECKING(for GNUTLS includes) 1103 AC_MSG_CHECKING(for GnuTLS includes)
1104 AC_MSG_RESULT("") 1104 AC_MSG_RESULT("")
1105 1105
1106 CPPFLAGS="$CPPFLAGS -I$with_gnutls_includes" 1106 CPPFLAGS="$CPPFLAGS -I$with_gnutls_includes"
1107 AC_CHECK_HEADERS(gnutls/gnutls.h, [ gnutls_includes="yes" ]) 1107 AC_CHECK_HEADERS(gnutls/gnutls.h, [ gnutls_includes="yes" ])
1108 CPPFLAGS="$CPPFLAGS_save" 1108 CPPFLAGS="$CPPFLAGS_save"
1114 GNUTLS_CFLAGS="-I$with_gnutls_includes" 1114 GNUTLS_CFLAGS="-I$with_gnutls_includes"
1115 else 1115 else
1116 GNUTLS_CFLAGS="" 1116 GNUTLS_CFLAGS=""
1117 fi 1117 fi
1118 else 1118 else
1119 AC_MSG_CHECKING(for GNUTLS includes) 1119 AC_MSG_CHECKING(for GnuTLS includes)
1120 AC_MSG_RESULT(no) 1120 AC_MSG_RESULT(no)
1121 fi 1121 fi
1122 1122
1123 AC_ARG_WITH(gnutls-libs, 1123 AC_ARG_WITH(gnutls-libs,
1124 [ --with-gnutls-libs=PREFIX location of GNUTLS libraries.], 1124 [ --with-gnutls-libs=PREFIX location of GnuTLS libraries.],
1125 [ with_gnutls_libs="$withval" ]) 1125 [ with_gnutls_libs="$withval" ])
1126 1126
1127 if test "x$with_gnutls_libs" != "xno" -a \ 1127 if test "x$with_gnutls_libs" != "xno" -a \
1128 "x$have_gnutls_includes" != "xno"; then 1128 "x$have_gnutls_includes" != "xno"; then
1129 1129
1132 case $with_gnutls_libs in 1132 case $with_gnutls_libs in
1133 ""|-L*) ;; 1133 ""|-L*) ;;
1134 *) with_gnutls_libs="-L$with_gnutls_libs" ;; 1134 *) with_gnutls_libs="-L$with_gnutls_libs" ;;
1135 esac 1135 esac
1136 1136
1137 AC_CACHE_CHECK([for GNUTLS libraries], gnutls_libs, 1137 AC_CACHE_CHECK([for GnuTLS libraries], gnutls_libs,
1138 [ 1138 [
1139 LDFLAGS="$LDFLAGS $with_gnutls_libs -lgnutls -lgcrypt" 1139 LDFLAGS="$LDFLAGS $with_gnutls_libs -lgnutls -lgcrypt"
1140 AC_TRY_LINK_FUNC(gnutls_init, gnutls_libs="yes", gnutls_libs="no") 1140 AC_TRY_LINK_FUNC(gnutls_init, gnutls_libs="yes", gnutls_libs="no")
1141 LDFLAGS="$LDFLAGS_save" 1141 LDFLAGS="$LDFLAGS_save"
1142 ]) 1142 ])
1143 1143
1144 if test "x$gnutls_libs" != "xno"; then 1144 if test "x$gnutls_libs" != "xno"; then
1145 AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have GNUTLS]) 1145 AC_DEFINE(HAVE_GNUTLS, 1, [Define if you have GnuTLS])
1146 AC_DEFINE(HAVE_SSL) 1146 AC_DEFINE(HAVE_SSL)
1147 msg_gnutls="GNUTLS" 1147 msg_gnutls="GnuTLS"
1148 GNUTLS_LIBS="$with_gnutls_libs -lgnutls -lgcrypt" 1148 GNUTLS_LIBS="$with_gnutls_libs -lgnutls -lgcrypt"
1149 1149
1150 enable_gnutls="yes" 1150 enable_gnutls="yes"
1151 else 1151 else
1152 GNUTLS_CFLAGS="" 1152 GNUTLS_CFLAGS=""
1153 GNUTLS_LIBS="" 1153 GNUTLS_LIBS=""
1154 fi 1154 fi
1155 else 1155 else
1156 AC_MSG_CHECKING(for GNUTLS libraries) 1156 AC_MSG_CHECKING(for GnuTLS libraries)
1157 AC_MSG_RESULT(no) 1157 AC_MSG_RESULT(no)
1158 fi 1158 fi
1159 else 1159 else
1160 GNUTLS_CFLAGS="" 1160 GNUTLS_CFLAGS=""
1161 GNUTLS_LIBS="" 1161 GNUTLS_LIBS=""
1166 1166
1167 AM_CONDITIONAL(USE_GNUTLS, test "x$enable_gnutls" = "xyes") 1167 AM_CONDITIONAL(USE_GNUTLS, test "x$enable_gnutls" = "xyes")
1168 1168
1169 1169
1170 dnl # 1170 dnl #
1171 dnl # Check for NSS if it's specified, or if GNUTLS checks failed. 1171 dnl # Check for NSS if it's specified, or if GnuTLS checks failed.
1172 dnl # 1172 dnl #
1173 if test "x$enable_nss" != "xno"; then 1173 if test "x$enable_nss" != "xno"; then
1174 1174
1175 AC_ARG_WITH(nspr-includes, 1175 AC_ARG_WITH(nspr-includes,
1176 [ --with-nspr-includes=PREFIX specify location of Mozilla nspr4 includes.], 1176 [ --with-nspr-includes=PREFIX specify location of Mozilla nspr4 includes.],