loudmouth: comparison configure.ac

equal deleted inserted replaced

-:3697251ef911
+:f57b1b61e1fe
 AC_PREREQ(2.60)
 AC_INIT([Loudmouth], [1.5.0], [http://loudmouth.lighthouseapp.com/projects/17276-libloudmouth/tickets/new], [loudmouth])
 AC_COPYRIGHT([
-	Copyright (C) 2003-2008 Imendio AB
+Copyright (C) 2003-2008 Imendio AB
-	Copyright (C) 2007 Collabora Ltd
+Copyright (C) 2007 Collabora Ltd
-	Copyright (C) 2007 Nokia Corporation
+Copyright (C) 2007 Nokia Corporation
 ])
 AC_CONFIG_SRCDIR(loudmouth/loudmouth.h)
 AC_CONFIG_HEADERS(config.h)
 AC_CONFIG_AUX_DIR(build)
 AC_SUBST([LT_REVISION])
 AC_SUBST([LT_AGE])
 AM_PATH_GLIB_2_0
 AC_CHECK_HEADERS([arpa/inet.h fcntl.h memory.h netdb.h netinet/in.h netinet/in_systm.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
 AC_CHECK_HEADERS([winsock2.h arpa/nameser_compat.h])
 if test "$ac_cv_header_winsock2_h" = "yes"; then
 # If we have <winsock2.h>, assume we find the functions
 # in -lws2_32 (ws2_32 is winsock v2, wsock32 is v1.1)
 AC_SUBST(GNUTLS_REQUIRED)
 AC_SUBST(LIBTASN1_REQUIRED)
 LM_CHECK_TIMEZONE
 PKG_CHECK_MODULES(LOUDMOUTH,
 glib-2.0 >= $GLIB2_REQUIRED
 gobject-2.0 >= $GLIB2_REQUIRED)
 PKG_CHECK_MODULES(LOUDMOUTHTEST,
 glib-2.0 >= $GLIB2_TEST_REQUIRED
 gobject-2.0 >= $GLIB2_REQUIRED,
-		  enable_test=yes, enable_test=no)
+enable_test=yes, enable_test=no)
 if test "$enable_test" = yes; then
 TEST_DIRS=tests
 else
 TEST_DIRS=
 fi
 AC_SUBST([TEST_DIRS])
 PKG_CHECK_MODULES(LIBIDN, libidn, have_idn=yes, have_idn=no)
 if test "x$have_idn" = "xyes"; then
-	AC_DEFINE(HAVE_IDN, 1, [Define if IDN support is included])
+AC_DEFINE(HAVE_IDN, 1, [Define if IDN support is included])
 fi
 dnl Gtk doc
 GTK_DOC_CHECK(1.0)
 dnl +--------------------------------------------------------+
 AC_PATH_PROG(KRB5CONFIG, krb5-config, no)
 enable_gssapi=no
 if test "x$KRB5CONFIG" != "xno"
 then
-	AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h])
+AC_CHECK_HEADERS([gssapi.h gssapi/gssapi.h])
-	enable_gssapi=yes
+enable_gssapi=yes
-	AC_DEFINE(HAVE_GSSAPI, 1, [whether to use GSSAPI support.])
+AC_DEFINE(HAVE_GSSAPI, 1, [whether to use GSSAPI support.])
-	LIBS="$LIBS `$KRB5CONFIG --libs gssapi`"
+LIBS="$LIBS `$KRB5CONFIG --libs gssapi`"
 fi
 AM_CONDITIONAL(USE_GSSAPI, test x$enable_gssapi = xyes)
 dnl +--------------------------------------------------------+
 dnl | Checking for SSL support                               |-
 dnl +--------------------------------------------------------+
 AC_ARG_WITH(ssl,
-	    AS_HELP_STRING([--with-ssl=@<:@gnutls|openssl|no@:>@],
+AS_HELP_STRING([--with-ssl=@<:@gnutls|openssl|no@:>@],
-			   [Which SSL implementation to use [[default=gnutls]]]),
+[Which SSL implementation to use [[default=gnutls]]]),
-	    ac_ssl=$withval,
+ac_ssl=$withval,
-	    ac_ssl=gnutls)
+ac_ssl=gnutls)
 AC_ARG_WITH(openssl-includes,
-	    AC_HELP_STRING([--with-openssl-includes=DIR],[OpenSSL includes]),
+AC_HELP_STRING([--with-openssl-includes=DIR],[OpenSSL includes]),
-	    [ use_openssl=yes CPPFLAGS="$CPPFLAGS -I$withval" ]
+[ use_openssl=yes CPPFLAGS="$CPPFLAGS -I$withval" ]
-	    )
+)
 AC_ARG_WITH(openssl-libs,
-	    AC_HELP_STRING([--with-openssl-libs=DIR],[OpenSSL libraries]),
+AC_HELP_STRING([--with-openssl-libs=DIR],[OpenSSL libraries]),
-	    [ use_openssl=yes LDFLAGS="$LDFLAGS -L$withval" ]
+[ use_openssl=yes LDFLAGS="$LDFLAGS -L$withval" ]
-	    )
+)
 enable_ssl=no
 if test "x$ac_ssl" = "xgnutls"; then
 dnl Look for GnuTLS
 PKG_CHECK_EXISTS([gnutls >= $GNUTLS_REQUIRED], have_libgnutls=yes, have_libgnutls=no)
 LIBS="$LIBS $LIBGNUTLS_LIBS"
 AC_DEFINE(HAVE_GNUTLS, 1, [whether to use GnuTSL support.])
 enable_ssl=GnuTLS
 else
 AC_MSG_ERROR([GnuTLS was not found, use
-		--with-ssl=[[no|openssl]] to build without SSL support or
+--with-ssl=[[no|openssl]] to build without SSL support or
-		with OpenSSL])
+with OpenSSL])
 fi
 elif test "$ac_ssl" = "openssl"; then
 dnl Look for OpenSSL
 AC_CHECK_HEADERS([openssl/ssl.h])
 OLDLIBS="$LIBS"
 AC_CHECK_LIB(crypto,
-	       BIO_f_base64,
+BIO_f_base64,
-	       [AC_CHECK_LIB(ssl,
+[AC_CHECK_LIB(ssl,
-		             SSL_new,
+SSL_new,
 [SSL_LIB="-lssl -lcrypto"
-		             AC_DEFINE(HAVE_OPENSSL,
+AC_DEFINE(HAVE_OPENSSL,
-				       [],
+[],
-				       [Have OpenSSL])],
+[Have OpenSSL])],
-		             [have_openssl=no],
+[have_openssl=no],
-			     [-lcrypto])],
+[-lcrypto])],
-	       [have_openssl=no],
+[have_openssl=no],
-	       [])
+[])
 if test "x$have_openssl" = "xno"; then
 AC_MSG_ERROR([OpenSSL was not found, use --with-ssl=[[no|gnutls]] to
 build without SSL support or with GnuTLS])
 else
 LIBS="$OLDLIBS $SSL_LIB"
 enable_ssl=OpenSSL
 fi
 else
-	echo "Disabling SSL support"
+echo "Disabling SSL support"
 fi
 if test x$enable_ssl != xno; then
-	AC_DEFINE(HAVE_SSL, 1, [whether to use SSL support.])
+AC_DEFINE(HAVE_SSL, 1, [whether to use SSL support.])
 else
-	if test x$ac_ssl != xno; then
+if test x$ac_ssl != xno; then
-		AC_MSG_ERROR([No SSL implementation was found, if you do not want to build with SSL use --with-ssl=no])
+AC_MSG_ERROR([No SSL implementation was found, if you do not want to build with SSL use --with-ssl=no])
-	fi
+fi
 fi
 AM_CONDITIONAL(USE_OPENSSL, test x$enable_ssl = xOpenSSL)
 AM_CONDITIONAL(USE_GNUTLS, test x$enable_ssl = xGnuTLS)
 dnl +-------------------------------------------------------------------+
 dnl | Checking for libasyncns                                           |
 dnl +-------------------------------------------------------------------+
 AC_ARG_WITH(asyncns,
-	AS_HELP_STRING([--with-asyncns],
+AS_HELP_STRING([--with-asyncns],
-		[define whether to use libasyncns, @<:@default=no@:>@ (yes/no)]),
+[define whether to use libasyncns, @<:@default=no@:>@ (yes/no)]),
-	ac_asyncns=$withval,
+ac_asyncns=$withval,
-	ac_asyncns=no)
+ac_asyncns=no)
 enable_asyncns=no
 if test x$ac_asyncns != xno; then
-	PKG_CHECK_MODULES(ASYNCNS, [libasyncns >= 0.3],
+PKG_CHECK_MODULES(ASYNCNS, [libasyncns >= 0.3],
-			[enable_asyncns=yes],
+[enable_asyncns=yes],
-			[enable_asyncns=no])
+[enable_asyncns=no])
 fi
 if test "x$enable_asyncns" = "xyes"; then
-	AC_DEFINE(HAVE_ASYNCNS, 1, [Whether to use libasyncns])
+AC_DEFINE(HAVE_ASYNCNS, 1, [Whether to use libasyncns])
 else
-	echo "Not using asynchronous dns lookups"
+echo "Not using asynchronous dns lookups"
 fi
 AC_SUBST(ASYNCNS_CFLAGS)
 AC_SUBST(ASYNCNS_LIBS)
 #include <netinet/tcp.h>
 ])
 use_keepalives=no
 if test x$ac_use_keepalives != xno; then
-	use_keepalives=yes
+use_keepalives=yes
-	AC_DEFINE(USE_TCP_KEEPALIVES, 1, [Whether to use Linux TCP keepalives])
+AC_DEFINE(USE_TCP_KEEPALIVES, 1, [Whether to use Linux TCP keepalives])
 fi
 dnl +-------------+
 dnl | Build Flags |--------------------------------------------
 dnl +-------------+
 AS_HELP_STRING([--enable-debug=@<:@no/yes/auto@:>@],
 [Enable debugging [[default=yes]]]), ,
 enable_debug=yes)
 if test x$enable_debug = xno ; then
-	echo "Debugging disabled"
+echo "Debugging disabled"
-	LOUDMOUTH_CFLAGS="$LOUDMOUTH_CFLAGS -DLM_NO_DEBUG"
+LOUDMOUTH_CFLAGS="$LOUDMOUTH_CFLAGS -DLM_NO_DEBUG"
 else
-	echo "Debugging enabled"
+echo "Debugging enabled"
 fi
 AC_SUBST(LOUDMOUTH_CFLAGS)
 AC_SUBST(LOUDMOUTH_LIBS)
 loudmouth-1.0.pc])
 dnl ==========================================================================
 echo "
-	Loudmouth $VERSION
+Loudmouth $VERSION
-	==================
+==================
-	prefix:                   ${prefix}
+prefix:                   ${prefix}
-	compiler:                 ${CC}
+compiler:                 ${CC}
-	Have IDN support:         ${have_idn}
+Have IDN support:         ${have_idn}
-	Enable SSL:               ${enable_ssl}
+Enable SSL:               ${enable_ssl}
-	Asynchronous DNS:         ${enable_asyncns}
+Asynchronous DNS:         ${enable_asyncns}
-	Linux TCP keepalives:     ${use_keepalives}
+Linux TCP keepalives:     ${use_keepalives}
-	Enable Debug:             ${enable_debug}
+Enable Debug:             ${enable_debug}
-	Enable GSSAPI:            ${enable_gssapi}
+Enable GSSAPI:            ${enable_gssapi}
-	Enable Documentation:     ${enable_gtk_doc}
+Enable Documentation:     ${enable_gtk_doc}
-	Enable Tests:             ${enable_test}
+Enable Tests:             ${enable_test}
-	Now type 'make' to build Loudmouth
+Now type 'make' to build Loudmouth
 "

changeset 664	f57b1b61e1fe
parent 663	3697251ef911
child 671	4046345db060