diff options
| -rw-r--r-- | cfg.mk | 2 | ||||
| -rw-r--r-- | configure.in | 14 | ||||
| -rw-r--r-- | includes/gnutls/gnutls.h.in | 2 | ||||
| -rw-r--r-- | lib/Makefile.am | 2 | ||||
| -rw-r--r-- | lib/configure.ac | 1 | ||||
| -rw-r--r-- | lib/m4/hooks.m4 | 12 | ||||
| -rw-r--r-- | lib/openpgp/Makefile.am | 6 | ||||
| -rw-r--r-- | lib/x509/Makefile.am | 4 |
8 files changed, 21 insertions, 22 deletions
@@ -32,7 +32,9 @@ autoreconf: for f in $(PODIR)/*.po.in; do \ cp $$f `echo $$f | sed 's/.in//'`; \ done + mv lib/build-aux/config.rpath lib/build-aux/config.rpath- test -f ./configure || autoreconf --install + mv lib/build-aux/config.rpath- lib/build-aux/config.rpath update-po: refresh-po for f in `ls $(PODIR)/*.po | grep -v quot.po`; do \ diff --git a/configure.in b/configure.in index 970210f302..57e30d584d 100644 --- a/configure.in +++ b/configure.in @@ -29,18 +29,6 @@ AC_CONFIG_MACRO_DIR([m4]) AM_INIT_AUTOMAKE([1.10 dist-bzip2 -Wall -Werror -Wno-override]) AM_CONFIG_HEADER(config.h) -# Library code modified: REVISION++ -# Interfaces changed/added/removed: CURRENT++ REVISION=0 -# Interfaces added: AGE++ -# Interfaces removed: AGE=0 -AC_SUBST(LT_CURRENT, 38) -AC_SUBST(LT_REVISION, 1) -AC_SUBST(LT_AGE, 12) - -# Used when creating the Windows libgnutls-XX.def files. -SOVERSION=`expr ${LT_CURRENT} - ${LT_AGE}` -AC_SUBST(SOVERSION) - # Compute numeric versions, used in includes/gnutls/gnutls.h.in. AC_SUBST(MAJOR_VERSION, `echo $PACKAGE_VERSION | sed 's/\(.*\)\..*\..*/\1/g'`) AC_SUBST(MINOR_VERSION, `echo $PACKAGE_VERSION | sed 's/.*\.\(.*\)\..*/\1/g'`) @@ -371,7 +359,7 @@ AC_SUBST(AM_CFLAGS) AC_CONFIG_SUBDIRS([lib]) AC_CONFIG_SUBDIRS([libextra]) -AC_CONFIG_FILES([Makefile po/Makefile.in \ +AC_CONFIG_FILES([Makefile \ doc/Makefile doc/examples/Makefile doc/scripts/Makefile \ doc/manpages/Makefile doc/reference/Makefile doc/doxygen/Doxyfile \ doc/credentials/Makefile doc/credentials/x509/Makefile \ diff --git a/includes/gnutls/gnutls.h.in b/includes/gnutls/gnutls.h.in index 34dd1c88c0..709d7929a7 100644 --- a/includes/gnutls/gnutls.h.in +++ b/includes/gnutls/gnutls.h.in @@ -49,8 +49,6 @@ extern "C" #define LIBGNUTLS_VERSION_NUMBER @NUMBER_VERSION@ -@POSSIBLY_WARN_ABOUT_MISSING_FEATURES@ - /* Get size_t. */ #include <stddef.h> /* Get ssize_t. */ diff --git a/lib/Makefile.am b/lib/Makefile.am index 8f930ab0bf..5c41eb3ec7 100644 --- a/lib/Makefile.am +++ b/lib/Makefile.am @@ -108,7 +108,7 @@ libgnutls_la_SOURCES = $(HFILES) $(COBJECTS) $(SRP_COBJECTS) \ libgnutls_la_LDFLAGS = -no-undefined \ -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -libgnutls_la_LIBADD = ../lgl/liblgnu.la x509/libgnutls_x509.la \ +libgnutls_la_LIBADD = gl/liblgnu.la x509/libgnutls_x509.la \ $(LTLIBZ) $(LTLIBGCRYPT) $(LTLIBINTL) if ENABLE_OPENPGP diff --git a/lib/configure.ac b/lib/configure.ac index e1524866cc..d894405670 100644 --- a/lib/configure.ac +++ b/lib/configure.ac @@ -69,6 +69,7 @@ AC_CONFIG_FILES([ \ x509/Makefile \ openpgp/Makefile \ opencdk/Makefile \ + po/Makefile.in \ gnutls.pc \ gl/Makefile \ gl/tests/Makefile \ diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4 index 637755b432..90822a5560 100644 --- a/lib/m4/hooks.m4 +++ b/lib/m4/hooks.m4 @@ -22,6 +22,18 @@ AC_DEFUN([LIBGNUTLS_HOOKS], [ + # Library code modified: REVISION++ + # Interfaces changed/added/removed: CURRENT++ REVISION=0 + # Interfaces added: AGE++ + # Interfaces removed: AGE=0 + AC_SUBST(LT_CURRENT, 38) + AC_SUBST(LT_REVISION, 1) + AC_SUBST(LT_AGE, 12) + + # Used when creating the Windows libgnutls-XX.def files. + SOVERSION=`expr ${LT_CURRENT} - ${LT_AGE}` + AC_SUBST(SOVERSION) + AC_PROG_CXX AC_ARG_ENABLE(cxx, diff --git a/lib/openpgp/Makefile.am b/lib/openpgp/Makefile.am index 56a0b667ae..a9447aa69a 100644 --- a/lib/openpgp/Makefile.am +++ b/lib/openpgp/Makefile.am @@ -20,9 +20,9 @@ # Software Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, # MA 02110-1301, USA -AM_CPPFLAGS = -I$(top_srcdir)/lgl -I$(top_builddir)/lgl \ - -I$(top_srcdir)/lib -I$(top_srcdir)/includes -I../../includes \ - -I$(top_srcdir)/lib/opencdk +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../gl -I$(builddir)/../gl \ + -I$(top_srcdir)/includes -I$(top_builddir)/includes \ + -I$(srcdir)/../opencdk if ENABLE_MINITASN1 AM_CPPFLAGS += -I$(top_srcdir)/lib/minitasn1 diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am index 5d022e4223..f7d7a128a8 100644 --- a/lib/x509/Makefile.am +++ b/lib/x509/Makefile.am @@ -18,9 +18,7 @@ # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, # USA -AM_CPPFLAGS = \ - -I$(top_srcdir)/lgl -I$(top_builddir)/lgl \ - -I$(top_srcdir)/lib \ +AM_CPPFLAGS = -I$(srcdir)/.. -I$(srcdir)/../gl -I$(builddir)/../gl \ -I$(top_srcdir)/includes -I$(top_builddir)/includes \ $(LIBOPENCDK_CFLAGS) |