From 426fd0cc08f579c5478bc5fbf13456814685a739 Mon Sep 17 00:00:00 2001 From: Marcus Brinkmann Date: Sat, 29 Jul 2006 14:40:16 +0000 Subject: [PATCH] 2006-07-29 Marcus Brinkmann * configure.ac: Check for network libraries and set NETLIBS. gpgme/ 2006-07-29 Marcus Brinkmann * gpgme-config.in (Options): Add NETLIBS. * Makefile.am (libgpgme_la_LIBADD, libgpgme_pthread_la_LIBADD, libgpgme_pth_la_LIBADD, libgpgme_glib_la_LIBADD): Add NETLIBS. --- ChangeLog | 4 ++++ configure.ac | 6 ++++++ gpgme/ChangeLog | 4 ++++ gpgme/Makefile.am | 8 ++++---- gpgme/gpgme-config.in | 5 ++++- 5 files changed, 22 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 79eba54c..1e9c68b1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2006-07-29 Marcus Brinkmann + + * configure.ac: Check for network libraries and set NETLIBS. + 2006-07-06 Marcus Brinkmann * lang, lang/cl: New subdirectories. diff --git a/configure.ac b/configure.ac index bcbf4847..d40fc320 100644 --- a/configure.ac +++ b/configure.ac @@ -192,6 +192,12 @@ if test "$GCC" = yes; then fi fi +# Network library fun. +AC_CHECK_FUNC(gethostbyname, , AC_CHECK_LIB(nsl, gethostbyname, + [NETLIBS="-lnsl $NETLIBS"])) +AC_CHECK_FUNC(setsockopt, , AC_CHECK_LIB(socket, setsockopt, + [NETLIBS="-lsocket $NETLIBS"])) +AC_SUBST(NETLIBS) # Checks for library functions. AC_FUNC_FSEEKO diff --git a/gpgme/ChangeLog b/gpgme/ChangeLog index e09335a9..ab66d81f 100644 --- a/gpgme/ChangeLog +++ b/gpgme/ChangeLog @@ -1,5 +1,9 @@ 2006-07-29 Marcus Brinkmann + * gpgme-config.in (Options): Add NETLIBS. + * Makefile.am (libgpgme_la_LIBADD, libgpgme_pthread_la_LIBADD, + libgpgme_pth_la_LIBADD, libgpgme_glib_la_LIBADD): Add NETLIBS. + * rungpg.c (read_status): Fix comparison disguising as an assignment. diff --git a/gpgme/Makefile.am b/gpgme/Makefile.am index 404ebd91..9c32d897 100644 --- a/gpgme/Makefile.am +++ b/gpgme/Makefile.am @@ -144,14 +144,14 @@ libgpgme_la_LDFLAGS = $(gpgme_res_ldflag) $(no_undefined) $(export_symbols) \ libgpgme_la_DEPENDENCIES = libgpgme-real.la $(assuan_libobjs) \ @LTLIBOBJS@ $(srcdir)/libgpgme.vers $(gpgme_deps) libgpgme_la_LIBADD = libgpgme-real.la $(assuan_libobjs) @LTLIBOBJS@ \ - @GPG_ERROR_LIBS@ + @GPG_ERROR_LIBS@ @NETLIBS@ libgpgme_pthread_la_LDFLAGS = $(libgpgme_version_script_cmd) -version-info \ @LIBGPGME_LT_CURRENT@:@LIBGPGME_LT_REVISION@:@LIBGPGME_LT_AGE@ libgpgme_pthread_la_DEPENDENCIES = libgpgme-real.la $(assuan_libobjs) \ @LTLIBOBJS@ $(srcdir)/libgpgme.vers libgpgme_pthread_la_LIBADD = libgpgme-real.la $(assuan_libobjs) @LTLIBOBJS@ \ - -lpthread @GPG_ERROR_LIBS@ + -lpthread @GPG_ERROR_LIBS@ @NETLIBS@ libgpgme_pth_la_CFLAGS = $(AM_CFLAGS) @PTH_CFLAGS@ libgpgme_pth_la_CPPFLAGS = $(AM_CPPFLAGS) @PTH_CPPFLAGS@ @@ -161,7 +161,7 @@ libgpgme_pth_la_LDFLAGS = @PTH_LDFLAGS@ \ libgpgme_pth_la_DEPENDENCIES = libgpgme-real.la $(assuan_libobjs) \ @LTLIBOBJS@ $(srcdir)/libgpgme.vers libgpgme_pth_la_LIBADD = libgpgme-real.la $(assuan_libobjs) @LTLIBOBJS@ \ - @PTH_LIBS@ @GPG_ERROR_LIBS@ + @PTH_LIBS@ @GPG_ERROR_LIBS@ @NETLIBS@ if BUILD_W32_GLIB libgpgme_glib_la_LDFLAGS = $(gpgme_res_ldflag) $(no_undefined) \ @@ -171,7 +171,7 @@ libgpgme_glib_la_CFLAGS = $(AM_CFLAGS) @GLIB_CFLAGS@ libgpgme_glib_la_DEPENDENCIES = libgpgme-real.la $(assuan_libobjs) \ @LTLIBOBJS@ $(srcdir)/libgpgme.vers $(gpgme_deps) libgpgme_glib_la_LIBADD = libgpgme-real.la $(assuan_libobjs) @LTLIBOBJS@ \ - @GPG_ERROR_LIBS@ @GLIB_LIBS@ + @GPG_ERROR_LIBS@ @GLIB_LIBS@ @NETLIBS@ endif status-table.h : gpgme.h diff --git a/gpgme/gpgme-config.in b/gpgme/gpgme-config.in index 4415fed4..4b6ddb39 100644 --- a/gpgme/gpgme-config.in +++ b/gpgme/gpgme-config.in @@ -14,6 +14,9 @@ exec_prefix=@exec_prefix@ includedir=@includedir@ libdir=@libdir@ +# Network libraries. +netlibs="@NETLIBS@" + # Configure libgpg-error. gpg_error_cflags="@GPG_ERROR_CFLAGS@" gpg_error_libs="@GPG_ERROR_LIBS@" @@ -126,7 +129,7 @@ while test $# -gt 0; do fi ;; esac - output="$output $gpg_error_libs" + output="$output $gpg_error_libs $netlibs" if test "x$with_glib" = "xyes"; then output="$output $glib_cflags" fi