captive-popt_link.patch

   1 --- captive-1.1.6.1/src/client/cmdline/Makefile.am.orig 2006-01-25 19:06:11.657593000 +0100
   2 +++ captive-1.1.6.1/src/client/cmdline/Makefile.am      2006-01-25 19:06:30.497593000 +0100
   3 @@ -64,7 +64,7 @@
   4                 utf8.c \
   5                 utf8.h
   6  captive_cmdline_CFLAGS=                   $(GNOME_VFS_CFLAGS) $(LIBXML_CFLAGS)
   7 -captive_cmdline_LDADD =$(captive_library) $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(READLINE_LIBS) $(INTLLIBS)
   8 +captive_cmdline_LDADD =$(captive_library) $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(READLINE_LIBS) $(INTLLIBS) $(POPT_LIBS)
   9  captive_cmdline_LDFLAGS=$(READLINE_LDFLAGS)
  10  bin_PROGRAMS+=captive-cmdline
  11
  12 --- captive-1.1.6.1/src/client/sandbox-server/Makefile.am.orig  2006-01-25 19:06:58.687593000 +0100
  13 +++ captive-1.1.6.1/src/client/sandbox-server/Makefile.am       2006-01-25 19:07:08.547593000 +0100
  14 @@ -21,7 +21,7 @@
  15  captive_sandbox_server_SOURCES= \
  16                 main.c
  17  captive_sandbox_server_CFLAGS=$(ORBIT_CFLAGS) $(LINC_CFLAGS) $(GNOME_VFS_CFLAGS) $(LIBXML_CFLAGS)
  18 -captive_sandbox_server_LDADD =$(ORBIT_LIBS)   $(LINC_LIBS)   $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(captive_library) $(INTLLIBS)
  19 +captive_sandbox_server_LDADD =$(ORBIT_LIBS)   $(LINC_LIBS)   $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(captive_library) $(INTLLIBS) $(POPT_LIBS)
  20  libexec_PROGRAMS=captive-sandbox-server
  21  libexecPROGRAMS_INSTALL=${INSTALL}
  22  EXTRA_DIST+=.gdbinit
  23 --- captive-1.1.6.1/src/client/fuse/Makefile.am.orig    2006-01-26 12:16:41.567593000 +0100
  24 +++ captive-1.1.6.1/src/client/fuse/Makefile.am 2006-01-26 12:16:58.597593000 +0100
  25 @@ -65,7 +65,7 @@
  26                 main.c \
  27                 main.h
  28  mount_captive_CFLAGS=                   $(GNOME_VFS_CFLAGS) $(LIBXML_CFLAGS) $(FUSE_CFLAGS)
  29 -mount_captive_LDADD =$(captive_library) $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(FUSE_LIBS)   $(INTLLIBS)
  30 +mount_captive_LDADD =$(captive_library) $(GNOME_VFS_LIBS)   $(LIBXML_LIBS)   $(FUSE_LIBS)   $(INTLLIBS) $(POPT_LIBS)
  31  mount_captive_LDFLAGS=$(READLINE_LDFLAGS)
  32
  33  mount_captive_CFLAGS+=-DLIBEXECDIR="$(libexecdir)"