From 0664031824a973137e264c1d764a8309cc6a806a Mon Sep 17 00:00:00 2001
From: mdb <mdb@6335cc39-0255-0410-8fd6-9bcaacd3b74c>
Date: Thu, 16 Aug 2001 00:12:11 +0000
Subject: [PATCH] Modifications to build lookuplet like a GNOME app rather than
 an applet.

git-svn-id: https://samskivert.googlecode.com/svn/trunk@281 6335cc39-0255-0410-8fd6-9bcaacd3b74c
---
 projects/lookuplet/.cvsignore      |  7 ++++
 projects/lookuplet/Makefile.am     |  4 +-
 projects/lookuplet/acconfig.h      |  5 +++
 projects/lookuplet/configure.in    | 60 ++++++++++++++++++++++--------
 projects/lookuplet/src/Makefile.am | 17 ++++-----
 5 files changed, 66 insertions(+), 27 deletions(-)

diff --git a/projects/lookuplet/.cvsignore b/projects/lookuplet/.cvsignore
index dc871229..ca73ee9f 100644
--- a/projects/lookuplet/.cvsignore
+++ b/projects/lookuplet/.cvsignore
@@ -9,3 +9,10 @@ config.status
 configure
 stamp-h
 stamp-h.in
+ABOUT-NLS
+config.guess
+config.sub
+intl
+libtool
+ltmain.sh
+po
diff --git a/projects/lookuplet/Makefile.am b/projects/lookuplet/Makefile.am
index d6ef333d..be1cd8fe 100644
--- a/projects/lookuplet/Makefile.am
+++ b/projects/lookuplet/Makefile.am
@@ -1,4 +1,4 @@
 #
-# $Id: Makefile.am,v 1.2 2001/02/24 02:35:20 mdb Exp $
+# $Id: Makefile.am,v 1.3 2001/08/16 00:12:11 mdb Exp $
 
-SUBDIRS = src
+SUBDIRS = macros intl src
diff --git a/projects/lookuplet/acconfig.h b/projects/lookuplet/acconfig.h
index e0f44d28..58c90459 100644
--- a/projects/lookuplet/acconfig.h
+++ b/projects/lookuplet/acconfig.h
@@ -1 +1,6 @@
+#undef ENABLE_NLS
+#undef HAVE_GETTEXT
+#undef HAVE_LC_MESSAGES
 #undef HAVE_LIBSM
+#undef HAVE_LIBINTL_H
+#undef VERSION
diff --git a/projects/lookuplet/configure.in b/projects/lookuplet/configure.in
index 8b922148..24c6a862 100644
--- a/projects/lookuplet/configure.in
+++ b/projects/lookuplet/configure.in
@@ -1,30 +1,55 @@
-dnl $Id: configure.in,v 1.1 2000/12/10 23:38:39 mdb Exp $
+dnl $Id: configure.in,v 1.2 2001/08/16 00:12:11 mdb Exp $
 dnl
 dnl Process this file with autoconf to produce a configure script.
 
 AC_INIT(configure.in)
-AM_INIT_AUTOMAKE(lookuplet, 0.1)
 AM_CONFIG_HEADER(config.h)
 
-dnl Pick up the Gnome macros.
-AM_ACLOCAL_INCLUDE(macros)
+dnl Version definitions
+LKP_MAJOR=1
+LKP_REVISION=0
+LKP_PATCHLEVEL=fcs
+LKP_RELEASE=1
+use_release=no
 
-GNOME_INIT
+dnl LKP_RELEASE must be specified (1 if nothing else), but
+dnl change use_release depending on whether we want it to be
+dnl appended to our official version. (no usually, yes for
+dnl something like 'pre1' or 'beta4')
+
+if test x"$use_release" = xno ; then
+	brsffx=
+else
+	brsffx="-${LKP_RELEASE}"
+fi
+
+LKP_SHORT_VERSION="$LKP_MAJOR.$LKP_REVISION.${LKP_PATCHLEVEL}"
+LKP_VERSION="$LKP_MAJOR.$LKP_REVISION.${LKP_PATCHLEVEL}${brsffx}"
+VERSION="$LKP_VERSION"
+
+dnl Now that we have a version
+AM_INIT_AUTOMAKE(lookuplet, [$VERSION])
+
+AM_MAINTAINER_MODE
+AM_ACLOCAL_INCLUDE(macros)
 AC_ISC_POSIX
 
-dnl Checks for programs.
+GNOME_INIT
+
+dnl Check for programs
 AC_PROG_CC
 AM_PROG_CC_STDC
-dnl AC_PROG_MAKE_SET
-dnl AC_PROG_INSTALL
+AC_ARG_PROGRAM
+AM_PROG_LIBTOOL
 
+dnl this should come after `AC_PROG_CC'
 GNOME_COMPILE_WARNINGS
 GNOME_X_CHECKS
 
 dnl Checks for libraries.
 
 dnl Checks for header files.
-AC_HEADER_STDC
+AC_STDC_HEADERS
 AC_CHECK_HEADERS(fcntl.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.
@@ -34,11 +59,14 @@ AC_TYPE_SIZE_T
 dnl Checks for library functions.
 AC_CHECK_FUNCS(strcspn strstr)
 
-dnl main thing goes here
-AC_PATH_PROG(sedpath, sed)
+dnl All the linguas, all the time.
+ALL_LINGUAS="az ca cs da de en_GB el es et fi fr ga hu it ja ko lt nl no nn pl pt pt_BR ro ru sk sl sv tr uk wa zh_CN.GB2312"
+LINGUAS="$ALL_LINGUAS"
+AM_GNOME_GETTEXT
 
-if test "_$sedpath" = _; then
-  AC_MSG_ERROR("Cannot find sed: I need it\!")
-fi
-
-AC_OUTPUT(Makefile src/Makefile)
+dnl Create files.
+AC_OUTPUT([
+Makefile
+intl/Makefile
+src/Makefile
+])
diff --git a/projects/lookuplet/src/Makefile.am b/projects/lookuplet/src/Makefile.am
index 53dbf65f..03869307 100644
--- a/projects/lookuplet/src/Makefile.am
+++ b/projects/lookuplet/src/Makefile.am
@@ -1,12 +1,5 @@
 #
-# $Id: Makefile.am,v 1.2 2001/02/24 02:35:20 mdb Exp $
-
-INCLUDES = 						\
-	-I.						\
-	-I$(srcdir)					\
-	-I$(top_srcdir)/intl -I$(top_builddir)/intl	\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
-	-I$(includedir) $(GNOME_INCLUDEDIR)
+# $Id: Makefile.am,v 1.3 2001/08/16 00:12:11 mdb Exp $
 
 bin_PROGRAMS = lookuplet
 
@@ -18,9 +11,15 @@ lookuplet_SOURCES = \
 	binding.c \
 	keysym-util.c
 
+INCLUDES = 						\
+	-I.						\
+	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"	\
+	-I$(top_srcdir)					\
+	$(GNOME_INCLUDEDIR)
+
 lookuplet_LDADD = \
 	$(GNOME_LIBDIR) \
-	$(GNOME_APPLETS_LIBS) \
+	$(GNOMEUI_LIBS) \
 	$(INTLLIBS) 
 
 # currently the installation of these bitmaps wouldn't be necessary