* keyserver.c (curl_can_handle): New. Do a runtime check against libcurl
[gnupg.git] / g10 / Makefile.am
index 1c0551c..9e50eeb 100644 (file)
@@ -1,5 +1,5 @@
-# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003,
-#               2004 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004,
+#               2005 Free Software Foundation, Inc.
 #
 # This file is part of GnuPG.
 #
@@ -15,7 +15,7 @@
 # 
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
 
 ## Process this file with automake to produce Makefile.in
 
@@ -23,14 +23,13 @@ INCLUDES = -I$(top_srcdir)/include -I$(top_srcdir)/intl
 EXTRA_DIST = options.skel
 # it seems that we can't use this with automake 1.5
 #OMIT_DEPENDENCIES = zlib.h zconf.h
-libexecdir = @libexecdir@/@PACKAGE@
+
 if ! HAVE_DOSISH_SYSTEM
-AM_CFLAGS = -DGNUPG_LIBEXECDIR="\"$(libexecdir)\""
+AM_CFLAGS = -DGNUPG_LIBEXECDIR="\"$(libexecdir)/@PACKAGE@\""
 endif
 needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
 other_libs = $(LIBICONV) $(LIBINTL) $(CAPLIBS)
 
-#noinst_PROGRAMS = gpgd
 bin_PROGRAMS = gpg gpgv
 
 if ENABLE_BZIP2_SUPPORT
@@ -63,7 +62,6 @@ common_source =  \
              keyid.c           \
              packet.h          \
              parse-packet.c    \
-             comment.c         \
              status.c          \
              status.h          \
              plaintext.c       \
@@ -125,15 +123,9 @@ gpgv_SOURCES = gpgv.c           \
              $(common_source)  \
              verify.c          
 
-#gpgd_SOURCES = gpgd.c \
-#             ks-proto.h \
-#             ks-proto.c \
-#             ks-db.c \
-#             ks-db.h \
-#             $(common_source)
-
 LDADD =  $(needed_libs) $(other_libs) @ZLIBS@ @W32LIBS@ @LIBREADLINE@
-gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB@
+gpg_LDADD = $(LDADD) @DLLIBS@ @NETLIBS@ @LIBUSB@ @LIBCURL@
+##gpg_CPPFLAGS = @LIBCURL_CPPFLAGS@
 
 $(PROGRAMS): $(needed_libs)