frontline-shared.patch

   1 diff -Nur frontline-0.5.4.orig/configure.in frontline-0.5.4/configure.in
   2 --- frontline-0.5.4.orig/configure.in   Tue Nov 12 06:28:53 2002
   3 +++ frontline-0.5.4/configure.in        Thu Dec 19 00:40:21 2002
   4 @@ -13,7 +13,7 @@
   5  AM_SANITY_CHECK
   6  AC_PROG_INSTALL
   7  AC_PROG_AWK
   8 -AC_PROG_RANLIB
   9 +AC_PROG_LIBTOOL
  10
  11  # Checks for header files.
  12  AC_HEADER_STDC
  13 @@ -66,7 +66,7 @@
  14  dnl
  15  dnl popt
  16  dnl
  17 -AC_CHECK_LIB(popt,poptPrintHelp,,AC_MSG_ERROR(*** Cannot find popt))
  18 +AC_CHECK_LIB(popt,poptPrintHelp,[AC_DEFINE(HAVE_LIBPOPT)],AC_MSG_ERROR(*** Cannot find popt))
  19
  20  dnl
  21  dnl Imlib
  22 @@ -80,4 +80,4 @@
  23  frontline.spec
  24  frontline/Makefile
  25  gundo/Makefile
  26 -gimp/Makefile],[chmod a+x frontline-config])
  27 \ No newline at end of file
  28 +gimp/Makefile],[chmod a+x frontline-config])
  29 diff -Nur frontline-0.5.4.orig/frontline/Makefile.am frontline-0.5.4/frontline/Makefile.am
  30 --- frontline-0.5.4.orig/frontline/Makefile.am  Thu Oct 24 19:06:07 2002
  31 +++ frontline-0.5.4/frontline/Makefile.am       Thu Dec 19 00:40:03 2002
  32 @@ -9,9 +9,9 @@
  33         -DLOCALEDIR=\""$(datadir)/locale"\"             \
  34          -DGNOME_ICONDIR=\""$(datadir)/pixmaps"\"
  35
  36 -AM_CFLAGS=-g -Wall
  37 +AM_CFLAGS=-Wall
  38
  39 -lib_LIBRARIES=libfrontline.a
  40 +lib_LTLIBRARIES=libfrontline.la
  41  bin_PROGRAMS= frontline
  42
  43  frontlineincludedir=$(includedir)/frontline
  44 @@ -26,7 +26,7 @@
  45         fl_fsel.h                               \
  46         fl_ask.h
  47
  48 -libfrontline_a_SOURCES=                                \
  49 +libfrontline_la_SOURCES=                               \
  50         fl_dialog.c                             \
  51         fl_utils.c                              \
  52         fl_opt.c                                \
  53 @@ -48,14 +48,12 @@
  54
  55  # Don't use popt in gnome. Instead use libpop directly
  56  # because popt in gnome-1.4 doesn't support FLOAT args.
  57 -frontline_LDADD= $(LIBART2_LIBS)                               \
  58 -                 $(top_builddir)/frontline/libfrontline.a      \
  59 +libfrontline_la_LIBADD= $(LIBART2_LIBS)                                \
  60                  $(INTLLIBS)                                    \
  61 -                 $(top_builddir)/gundo/libgundo.a              \
  62 +                 $(top_builddir)/gundo/libgundo.la             \
  63                   -lpopt                                                \
  64                   $(GNOME_LIBDIR)                               \
  65                   $(GNOMEUI_LIBS)                               \
  66 -                 $(AUTOTRACE_LIBS)
  67 -# /home/jet/src/popt-1.6.3/.libs/libpopt.a \
  68 -#-lpopt \
  69 -
  70 +                 $(AUTOTRACE_LIBS)
  71 +
  72 +frontline_LDADD= $(top_builddir)/frontline/libfrontline.la
  73 diff -Nur frontline-0.5.4.orig/gimp/Makefile.am frontline-0.5.4/gimp/Makefile.am
  74 --- frontline-0.5.4.orig/gimp/Makefile.am       Fri Oct 25 06:36:40 2002
  75 +++ frontline-0.5.4/gimp/Makefile.am    Thu Dec 19 00:40:03 2002
  76 @@ -10,18 +10,12 @@
  77  AM_CPPFLAGS = -DG_LOG_DOMAIN=\"trace-plugin\"          \
  78               -DLOCALEDIR=\""$(datadir)/locale"\"
  79
  80 -AM_CFLAGS   = -g -Wall
  81 +AM_CFLAGS   = -Wall
  82
  83 -libexecdir = $(GIMP_PLUGIN_DIR)/plug-ins
  84 -libexec_PROGRAMS = trace
  85 +plugindir = $(GIMP_PLUGIN_DIR)/plug-ins
  86 +plugin_PROGRAMS = trace
  87  trace_SOURCES    = trace.c
  88 -trace_LDADD      = $(LIBART2_LIBS)\
  89 -       $(top_builddir)/frontline/libfrontline.a        \
  90 -       $(INTLLIBS)                                     \
  91 -       $(top_builddir)/gundo/libgundo.a                \
  92 -       -lpopt                                          \
  93 -       $(GNOME_LIBDIR)                                 \
  94 -       $(GNOMEUI_LIBS)                                 \
  95 -       $(GIMP_LIBS)                                    \
  96 -       $(AUTOTRACE_LIBS)
  97 +trace_LDADD      = \
  98 +       $(top_builddir)/frontline/libfrontline.la       \
  99 +       $(GIMP_LIBS)
 100  endif
 101 diff -Nur frontline-0.5.4.orig/gundo/Makefile.am frontline-0.5.4/gundo/Makefile.am
 102 --- frontline-0.5.4.orig/gundo/Makefile.am      Fri Oct 11 00:47:03 2002
 103 +++ frontline-0.5.4/gundo/Makefile.am   Thu Dec 19 00:40:03 2002
 104 @@ -1,6 +1,7 @@
 105  EXTRA_DIST=CHANGES
 106  INCLUDES = $(GNOME_INCLUDEDIR) -I$(top_srcidr)/gundo
 107 -lib_LIBRARIES = libgundo.a
 108 +lib_LTLIBRARIES = libgundo.la
 109  gundoincludedir=$(includedir)/gundo
 110  gundoinclude_HEADERS=gundo.h gundo_ui.h
 111 -libgundo_a_SOURCES = gundo.c gundo_ui.c
 112 +libgundo_la_SOURCES = gundo.c gundo_ui.c
 113 +libgundo_la_LIBADD = -L/usr/X11R6/lib -lgtk