GpgFrontend/gpgme
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

2006-07-29 Marcus Brinkmann <marcus@g10code.de>

Browse Source 
* configure.ac: Check for network libraries and set NETLIBS.

gpgme/
2006-07-29  Marcus Brinkmann  <marcus@g10code.de>

	* 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.
This commit is contained in:
Marcus Brinkmann 2006-07-29 14:40:16 +00:00
parent f3285b5609
commit 426fd0cc08
5 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,3 +1,7 @@
2006-07-29 Marcus Brinkmann <marcus@g10code.de>
* configure.ac: Check for network libraries and set NETLIBS.
2006-07-06 Marcus Brinkmann <marcus@g10code.de>
* lang, lang/cl: New subdirectories.

6
configure.ac
View File

@ -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

4
gpgme/ChangeLog
View File

@ -1,5 +1,9 @@
2006-07-29 Marcus Brinkmann <marcus@g10code.de>
* 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.

8
gpgme/Makefile.am
View File

@ -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

5
gpgme/gpgme-config.in
View File

@ -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