Fix libtasn1 libs/cflags settings.

7 files changed, 18 insertions, 29 deletions

diff --git a/configure.in b/configure.in
index ca2dbe0e43..2f9aaf3b83 100644
--- a/configure.in
+++ b/configure.in
@@ -657,8 +657,8 @@ AC_MSG_RESULT([***
 AC_LIBTOOL_WIN32_DLL
 AC_PROG_LIBTOOL
 
-LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBTASN1_LIBS $LIBGCRYPT_LIBS $LIBS"
-LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS $LIBTASN1_CFLAGS -I${includedir}"
+LIBGNUTLS_LIBS="-L${libdir} -lgnutls $LIBGCRYPT_LIBS $LIBS"
+LIBGNUTLS_CFLAGS="$LIBGCRYPT_CFLAGS -I${includedir}"
 AC_SUBST(LIBGNUTLS_LIBS)
 AC_SUBST(LIBGNUTLS_CFLAGS)
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index dca2eced71..a1ecdc8c55 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
 #
 # Author: Nikos Mavrogiannopoulos
 #
@@ -41,8 +41,6 @@ endif
 
 if ENABLE_MINITASN1
 AM_CPPFLAGS += -I$(srcdir)/minitasn1
-else
-AM_CPPFLAGS += $(LIBTASN1_CFLAGS)
 endif
 
 # Make sure this comes after any -I's for internal headers.
@@ -132,7 +130,7 @@ endif
 if ENABLE_MINITASN1
 libgnutls_la_LIBADD += minitasn1/libminitasn1.la
 else
-libgnutls_la_LDFLAGS += $(LIBTASN1_LIBS) 
+libgnutls_la_LDFLAGS += $(LTLIBTASN1) 
 endif
 
 if HAVE_LD_OUTPUT_DEF
diff --git a/lib/opencdk/Makefile.am b/lib/opencdk/Makefile.am
index 60a99ac0d5..d709590ebf 100644
--- a/lib/opencdk/Makefile.am
+++ b/lib/opencdk/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+# Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
 #
 # Author: Nikos Mavroyanopoulos
 #
@@ -26,8 +26,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/lib \
 
 if ENABLE_MINITASN1
 AM_CPPFLAGS += -I$(top_srcdir)/lib/minitasn1
-else
-AM_CPPFLAGS += $(LIBTASN1_CFLAGS)
 endif
 
 noinst_LTLIBRARIES = libminiopencdk.la
diff --git a/lib/openpgp/Makefile.am b/lib/openpgp/Makefile.am
index 7e42430b15..848b55ba44 100644
--- a/lib/openpgp/Makefile.am
+++ b/lib/openpgp/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
 #
 # Author: Nikos Mavrogiannopoulos
 #
@@ -26,8 +26,6 @@ AM_CPPFLAGS = -I$(top_srcdir)/lgl -I$(top_builddir)/lgl	\
 
 if ENABLE_MINITASN1
 AM_CPPFLAGS += -I$(top_srcdir)/lib/minitasn1
-else
-AM_CPPFLAGS += $(LIBTASN1_CFLAGS)
 endif
 
 noinst_LTLIBRARIES = libgnutls_openpgp.la
diff --git a/lib/x509/Makefile.am b/lib/x509/Makefile.am
index 2f1b43c7e3..19f5182ace 100644
--- a/lib/x509/Makefile.am
+++ b/lib/x509/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+# Copyright (C) 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
 #
 # This file is part of GNUTLS.
 #
@@ -26,8 +26,6 @@ AM_CPPFLAGS = \
 
 if ENABLE_MINITASN1
 AM_CPPFLAGS += -I$(top_srcdir)/lib/minitasn1
-else
-AM_CPPFLAGS += $(LIBTASN1_CFLAGS)
 endif
 
 noinst_LTLIBRARIES = libgnutls_x509.la
diff --git a/libextra/Makefile.am b/libextra/Makefile.am
index 9c9376ceea..2b155c1bba 100644
--- a/libextra/Makefile.am
+++ b/libextra/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+# Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
 #
 # Author: Nikos Mavrogiannopoulos
 #
@@ -22,13 +22,10 @@
 
 AM_CPPFLAGS = -I$(srcdir)/gl -I$(top_srcdir)/lgl -I$(top_builddir)/lgl	\
 	-I$(top_srcdir)/lib -I../includes -I$(top_srcdir)/includes	\
-	-I$(top_srcdir)/lib/minitasn1 \
 	$(LIBGCRYPT_CFLAGS)
 
 if ENABLE_MINITASN1
 AM_CPPFLAGS += -I$(top_srcdir)/lib/minitasn1
-else
-AM_CPPFLAGS += $(LIBTASN1_CFLAGS)
 endif
 
 SUBDIRS = gl
@@ -69,7 +66,7 @@ libgnutls_openssl_la_LDFLAGS += -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_
 if ENABLE_MINITASN1
 libgnutls_openssl_la_LIBADD += ../lib/minitasn1/libminitasn1.la
 else
-libgnutls_openssl_la_LDFLAGS += $(LIBTASN1_LIBS) 
+libgnutls_openssl_la_LDFLAGS += $(LTLIBTASN1) 
 endif
 
 if HAVE_LD_OUTPUT_DEF
diff --git a/src/Makefile.am b/src/Makefile.am
index 1e66abbb6c..9e1584c49e 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
 ## Process this file with automake to produce Makefile.in
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008 Free Software Foundation
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation
 #
 # This file is part of GNUTLS.
 #
@@ -37,35 +37,35 @@ endif
 gnutls_serv_SOURCES = serv.gaa serv-gaa.h serv-gaa.c list.h serv.c	\
 	common.h common.c select.c
 gnutls_serv_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \
-	$(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la
+	$(LIBGCRYPT_LIBS) $(LTLIBTASN1) ../gl/libgnu.la
 
 if ENABLE_SRP
 srptool_SOURCES = crypt.gaa crypt-gaa.h crypt-gaa.c crypt.c
 srptool_LDADD = ../lib/libgnutls.la \
-	$(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS)				\
+	$(LIBGCRYPT_LIBS) $(LTLIBTASN1)				\
 	../gl/libgnu.la ../lgl/liblgnu.la
 endif
 
 psktool_SOURCES = psk.gaa psk-gaa.h psk-gaa.c psk.c
 psktool_LDADD = ../lib/libgnutls.la \
-	$(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) 				\
+	$(LIBGCRYPT_LIBS) $(LTLIBTASN1) 				\
 	../gl/libgnu.la ../lgl/liblgnu.la
 
 gnutls_cli_SOURCES = cli.gaa cli-gaa.h cli-gaa.c cli.c common.h	\
 	common.c select.c
 gnutls_cli_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \
-	$(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la
+	$(LIBGCRYPT_LIBS) $(LTLIBTASN1) ../gl/libgnu.la
 
 gnutls_cli_debug_SOURCES = tls_test.gaa tls_test-gaa.h tls_test-gaa.c	\
 	tls_test.c tests.h tests.c common.h common.c
 gnutls_cli_debug_LDADD = ../lib/libgnutls.la			\
 	$(LIBGCRYPT_LIBS)	\
-	$(LIBTASN1_LIBS) ../gl/libgnu.la
+	$(LTLIBTASN1) ../gl/libgnu.la
 
 certtool_SOURCES = certtool.gaa certtool-gaa.h certtool-cfg.h	\
 	certtool-gaa.c certtool.c prime.c certtool-cfg.c
 certtool_LDADD = ../lib/libgnutls.la ../libextra/libgnutls-extra.la \
-	$(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la @LTLIBREADLINE@
+	$(LIBGCRYPT_LIBS) $(LTLIBTASN1) ../gl/libgnu.la @LTLIBREADLINE@
 if HAVE_LIBCFG
 certtool_LDADD += -lcfg+
 else
@@ -77,12 +77,12 @@ endif
 
 noinst_PROGRAMS = errcodes printlist
 errcodes_SOURCES = errcodes.c
-errcodes_LDADD = ../lib/libgnutls.la $(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) \
+errcodes_LDADD = ../lib/libgnutls.la $(LIBGCRYPT_LIBS) $(LTLIBTASN1) \
 	../gl/libgnu.la ../lgl/liblgnu.la
 
 printlist_SOURCES = printlist.c
 printlist_LDADD = ../lib/libgnutls.la	\
-	$(LIBGCRYPT_LIBS) $(LIBTASN1_LIBS) ../gl/libgnu.la
+	$(LIBGCRYPT_LIBS) $(LTLIBTASN1) ../gl/libgnu.la
 
 
 psk-gaa.c: $(srcdir)/psk.gaa