From 3eb28d3994e0c4e0492bafed33f6e39368ccea19 Mon Sep 17 00:00:00 2001 From: Linas Vepstas Date: Sat, 19 Dec 1998 08:16:22 +0000 Subject: [PATCH] gnome patches from Prakash Kailasa git-svn-id: svn+ssh://svn.gnucash.org/repo/gnucash/trunk@1451 57a11ea4-9604-0410-9ed3-97b8803252fd --- README | 2 ++ configure.in | 2 +- src/engine/Makefile.in | 2 +- src/gnome/FileBox.c | 2 ++ src/gnome/Makefile.in | 8 +++++--- src/gnome/RecnWindow.c | 3 +++ src/gnome/RegWindow.c | 3 +++ src/gnome/top-level.c | 2 +- 8 files changed, 18 insertions(+), 6 deletions(-) diff --git a/README b/README index 04124c1116..6397e7a64b 100644 --- a/README +++ b/README @@ -120,6 +120,7 @@ packages: nana -- Used to provide a debuggin infrastructure. Any version should work. http://www.fsf.org/software/nana/nana.html + http://www.cs.ntu.edu.au/homepages/pjm/nana-home/ SWIG -- Used to autogenerate perl, tcl, guile wrappers. available at www.swig.org need 1.1p5 or later ... guile -- Provides main extension language infrastructure. @@ -359,6 +360,7 @@ Ron Forrester for gnome patches Dave Freese for leap-year fix Otto Hammersmith for RedHat RPM version Jon K}re Hellan misc core dump fixes +Prakash Kailasa for gnome build fixes Tom Kludy for SGI Irix port Ted Lemon for NetBSD port Yannick Le Ny pour la traduction en francais diff --git a/configure.in b/configure.in index dafac561ba..b3f96ac119 100644 --- a/configure.in +++ b/configure.in @@ -34,7 +34,7 @@ MOTIF_LIBS="-lXm" # Let the user specify gnome paths: AC_ARG_WITH( gnome-config, [ --with-gnome-config=executable which gnome-config to use to find gnome ], - GNOME_CONFIG_BIN="$with_gnome/bin/") + GNOME_CONFIG_BIN="$with_gnome_config") AC_SUBST(GNOME_CONFIG_BIN) # Let the user specify imlib paths: diff --git a/src/engine/Makefile.in b/src/engine/Makefile.in index 4643e0ac38..e8c6ace384 100644 --- a/src/engine/Makefile.in +++ b/src/engine/Makefile.in @@ -24,7 +24,7 @@ include @top_srcdir@/Makefile.init -INCLPATH = -I@srcdir@/../../include -I@srcdir@/../.. +INCLPATH = -I@srcdir@/../../include -I@srcdir@/../.. -I@prefix@/include CFLAGS = @CFLAGS@ ${INCLPATH} ###################################################################### diff --git a/src/gnome/FileBox.c b/src/gnome/FileBox.c index 2626898996..d5561094e4 100644 --- a/src/gnome/FileBox.c +++ b/src/gnome/FileBox.c @@ -39,6 +39,8 @@ static GtkWidget *filebox = NULL; static gint filebox_quit; +/* This static indicates the debugging module that this .o belongs to. */ +static short module MOD_GUI; /** PROTOTYPES ******************************************************/ void fileBoxCB( GtkWidget mw, gpointer *data ); diff --git a/src/gnome/Makefile.in b/src/gnome/Makefile.in index d3c8a16bff..ad67da0a2e 100644 --- a/src/gnome/Makefile.in +++ b/src/gnome/Makefile.in @@ -33,14 +33,16 @@ INCLPATH = -I.. \ -I@srcdir@/../../include \ -I$(includedir) -CFLAGS = @CFLAGS@ @X_CFLAGS@ ${INCLPATH} $(shell @GTK_CONFIG_BIN@ --cflags) +CFLAGS = @CFLAGS@ @X_CFLAGS@ ${INCLPATH} \ + $(shell @GNOME_CONFIG_BIN@ --cflags gnome) + LDFLAGS = @LDFLAGS@ GUILELIBS = @GUILELIBS@ LIBS = -L$(prefix)/lib @LIBS@ @X_PRE_LIBS@ @X_LIBS@ \ - $(shell @GTK_CONFIG_BIN@ --libs) @X_EXTRA_LIBS@ -lgnomeui \ + $(shell @GNOME_CONFIG_BIN@ --libs gtk) @X_EXTRA_LIBS@ -lgnomeui \ $(shell @GNOME_CONFIG_BIN@ --libs gnome gnomeui ) \ - $(GUILELIBS) -lintl + $(GUILELIBS) # -lintl GNOMELIBS = @GNOMELIBS@ GTKLIBS = @GTKLIBS@ diff --git a/src/gnome/RecnWindow.c b/src/gnome/RecnWindow.c index a967e80fbe..bd451c0256 100644 --- a/src/gnome/RecnWindow.c +++ b/src/gnome/RecnWindow.c @@ -65,6 +65,9 @@ static void recnCB(GtkWidget *w, gpointer data); static RecnWindow **recnList = NULL; +/* This static indicates the debugging module that this .o belongs to. */ +static short module MOD_GUI; + /********************************************************************/ /********************************************************************\ diff --git a/src/gnome/RegWindow.c b/src/gnome/RegWindow.c index ea5ab2c538..e8eca89f9f 100644 --- a/src/gnome/RegWindow.c +++ b/src/gnome/RegWindow.c @@ -69,6 +69,9 @@ struct _RegWindow { /** GLOBALS *********************************************************/ extern GtkWidget * toplevel; +/* This static indicates the debugging module that this .o belongs to. */ +static short module MOD_GUI; + /** PROTOTYPES ******************************************************/ RegWindow *regWindowLedger( xaccLedgerDisplay *ledger); static void regRefresh (xaccLedgerDisplay *ledger); diff --git a/src/gnome/top-level.c b/src/gnome/top-level.c index 26cbd19cd6..194547b72c 100644 --- a/src/gnome/top-level.c +++ b/src/gnome/top-level.c @@ -79,7 +79,7 @@ gnucash_lowlev_app_init() For now, use fake_argv and fake_argc... */ - gnome_init("GnuCash", NULL, fake_argc, fake_argv); + gnome_init("GnuCash", NULL, fake_argc, fake_argv, 0, NULL); app = gnome_app_new ( "gnucash", "GnuCash" ); {