[GNUnet-SVN] r7956 - in libmicrohttpd: . src/daemon

[gnunet]

Author: holindho
Date: 2008-11-20 05:14:51 -0700 (Thu, 20 Nov 2008)
New Revision: 7956

Added:
   libmicrohttpd/src/daemon/EXPORT.sym
Modified:
   libmicrohttpd/configure.ac
   libmicrohttpd/src/daemon/Makefile.am
Log:
move LDFLAGS and version info to configure.ac


Modified: libmicrohttpd/configure.ac
===================================================================
--- libmicrohttpd/configure.ac  2008-11-20 11:14:52 UTC (rev 7955)
+++ libmicrohttpd/configure.ac  2008-11-20 12:14:51 UTC (rev 7956)
@@ -27,6 +27,13 @@
 
 AH_TOP([#define _GNU_SOURCE  1])
 
+LIB_VERSION_CURRENT=4
+LIB_VERSION_REVISION=3
+LIB_VERSION_AGE=0
+AC_SUBST(LIB_VERSION_CURRENT)
+AC_SUBST(LIB_VERSION_REVISION)
+AC_SUBST(LIB_VERSION_AGE)
+
 if test `uname -s` = "OS/390"
 then
 # configure binaries for z/OS
@@ -183,7 +190,7 @@
 AC_FUNC_FSEEKO
 
 # optional: have error messages ?
-AC_MSG_CHECKING(--enable-messages argument)
+AC_MSG_CHECKING(whether to enable error messages)
 AC_ARG_ENABLE(messages,
    [AS_HELP_STRING([--enable-messages],
                [enable MHD error messages])],
@@ -265,6 +272,9 @@
 AM_CONDITIONAL([USE_COVERAGE], [test "x$use_gcov" = "xyes"])
 
 
+MHD_LIB_LDFLAGS="-export-dynamic -no-undefined"
+MHD_LIB_LDFLAGS="$MHD_LIB_LDFLAGS -export-symbols \$(srcdir)/EXPORT.sym"
+AC_SUBST(MHD_LIB_LDFLAGS)
 
 
 AC_SUBST(CPPFLAGS)

Copied: libmicrohttpd/src/daemon/EXPORT.sym (from rev 7947, 
libmicrohttpd/src/daemon/SYMBOLS)
===================================================================
--- libmicrohttpd/src/daemon/EXPORT.sym                         (rev 0)
+++ libmicrohttpd/src/daemon/EXPORT.sym 2008-11-20 12:14:51 UTC (rev 7956)
@@ -0,0 +1,21 @@
+MHD_start_daemon
+MHD_stop_daemon
+MHD_get_fdset
+MHD_get_timeout
+MHD_run
+MHD_get_connection_values
+MHD_set_connection_value
+MHD_lookup_connection_value
+MHD_queue_response
+MHD_create_response_from_callback
+MHD_create_response_from_data
+MHD_destroy_response
+MHD_add_response_header
+MHD_del_response_header
+MHD_get_response_headers
+MHD_get_response_header
+MHD_create_post_processor
+MHD_post_process
+MHD_destroy_post_processor
+MHD_get_daemon_info
+MHD_get_connection_info

Modified: libmicrohttpd/src/daemon/Makefile.am
===================================================================
--- libmicrohttpd/src/daemon/Makefile.am        2008-11-20 11:14:52 UTC (rev 
7955)
+++ libmicrohttpd/src/daemon/Makefile.am        2008-11-20 12:14:51 UTC (rev 
7956)
@@ -8,13 +8,8 @@
   -I$(top_srcdir)/src/daemon/https \
   @LIBGCRYPT_CFLAGS@ 
 
-if HAVE_GNU_LD
-#  If you want to debug with gdb, comment out this line:
-  retaincommand=-Wl,--retain-symbols-file -Wl,$(srcdir)/SYMBOLS
-endif
+EXTRA_DIST = EXPORT.sym
 
-EXTRA_DIST = SYMBOLS
-
 lib_LTLIBRARIES = \
   libmicrohttpd.la
 
@@ -27,8 +22,8 @@
   postprocessor.c \
   response.c response.h
 libmicrohttpd_la_LDFLAGS = \
-  -version-info 4:3:0 \
-  -export-dynamic $(retaincommand)
+  $(MHD_LIB_LDFLAGS) \
+  -version-info @LIB_VERSION_CURRENT@:@LIB_VERSION_REVISION@:@LIB_VERSION_AGE@
 
 if USE_COVERAGE
   AM_CFLAGS = --coverage