gnome-games-deprecated r735 - in trunk: . gturing

[chpe svn gnome org]

Author: chpe
Date: Thu Oct 30 14:36:52 2008
New Revision: 735
URL: http://svn.gnome.org/viewvc/gnome-games-deprecated?rev=735&view=rev

Log:
Make this configure again.

Modified:
   trunk/Makefile.am
   trunk/autogen.sh
   trunk/configure.in
   trunk/gturing/Makefile.am

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Thu Oct 30 14:36:52 2008
@@ -1,21 +1,9 @@
-SUBDIRS = intl po macros \
-	  scottfree gturing \
-	  xbill \
-	  omf-install
+SUBDIRS = scottfree gturing  xbill po
 
 EXTRA_DIST = \
-	gnome-games.spec.in \
-	COPYING-DOCS \
-	sgmldocs.make \
-	game-docs.make \
+	autogen.sh	\
+	COPYING-DOCS	\
+	sgmldocs.make	\
+	game-docs.make	\
 	MAINTAINERS	\
 	HACKING
-
-dist-hook:
-	cp gnome-games.spec $(distdir)
-
-## to automatically rebuild aclocal.m4 if any of the macros in
-## `macros/' change
- MAINT@include macros/macros.dep
- MAINT@macros/macros.dep: macros/Makefile.am
- MAINT@	cd macros && $(MAKE) macros.dep

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Thu Oct 30 14:36:52 2008
@@ -14,4 +14,4 @@
     exit 1
 }
 
-. $srcdir/macros/autogen.sh
+REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Thu Oct 30 14:36:52 2008
@@ -1,86 +1,77 @@
-AC_INIT(gturing)
+AC_PREREQ([2.59])
+
+AC_INIT([Deprecated GNOME Games],[1.4.0.3],[bugs?],[gnome-games-deprecated])
+
+AC_CONFIG_HEADERS([config.h])
+
+AM_INIT_AUTOMAKE([1.9 no-dist-gzip dist-bzip2 foreign])
 
-AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gnome-games-deprecated, 1.4.0.2)
 AM_MAINTAINER_MODE
-AM_ACLOCAL_INCLUDE(macros)
-GNOME_INIT
 
-SCROLLKEEPER_REQUIRED=0.1.4
-AC_SUBST(SCROLLKEEPER_REQUIRED)
+GNOME_COMMON_INIT
+GNOME_COMPILE_WARNINGS([maximum])
+GNOME_MAINTAINER_MODE_DEFINES
+
+AC_ENABLE_SHARED([yes])
+AC_ENABLE_STATIC([no])
+
+AC_LIBTOOL_DLOPEN
+AC_PROG_LIBTOOL
 
 AC_ISC_POSIX
 AC_PROG_CC
-AC_STDC_HEADERS
-AC_ARG_PROGRAM
-AM_PROG_LIBTOOL
-
-## this should come after `AC_PROG_CC'
-GNOME_X_CHECKS
-
-dnl Check for new enough gnome-libs
-CFLAGS_save=$CFLAGS
-LIBS_save=$LIBS
-CFLAGS=`gnome-config --cflags gnomeui`
-LIBS=`gnome-config --libs gnomeui`
+AC_PROG_CC_STDC
+AC_HEADER_STDC
+AC_PROG_CXX
 
-AC_CHECK_LIB(gnomeui, gnome_window_icon_set_default_from_file, ,[
-AC_MSG_ERROR(gnome-libs 1.0.59 or higher is required.)])
-
-CFLAGS=$CFLAGS_save
-LIBS=$LIBS_save
+PKG_CHECK_MODULES([DEPENDENCIES],[gtk+-2.0 libgnomeui-2.0])
 
 ## look for some version of curses (keeping AM_'s out of curses.m4)
-AC_CHECK_CURSES
-AM_CONDITIONAL(HAS_CURSES, test "$has_curses" = true)
+#AC_CHECK_CURSES
+#AM_CONDITIONAL(HAS_CURSES, test "$has_curses" = true)
+
 
-ALL_LINGUAS="cs da de el en_GB es et fi fr ga gl hu it ja ko lt nl no pl pt pt_BR ro ru sk sl sv tr uk wa zh_CN zh_TW"
-AM_GNOME_GETTEXT
+#AM_CONDITIONAL(HAVE_JADE, false)
 
-AC_SUBST(CFLAGS)
-AC_SUBST(CPPFLAGS)
-AC_SUBST(LDFLAGS)
 
-AM_CONDITIONAL(HAVE_JADE, false)
+#ZVT_LIBS=`$GNOME_CONFIG --libs zvt`
+#AC_SUBST(ZVT_LIBS)
 
-gnome_cv_use_gnome=yes
+#AC_DEFINE_UNQUOTED(GNOME_ICONDIR, "${prefix}/share/pixmaps")
 
-## Begin tests for scrollkeeper
-AC_PATH_PROG(SCROLLKEEPER_CONFIG, scrollkeeper-config,no)
-if test x$SCROLLKEEPER_CONFIG = xno; then
-  AC_MSG_ERROR(Couldn't find scrollkeeper-config, please install the scrollkeeper packaga)
-fi
+# ****
+# i18n
+# ****
 
-oLIBS="$LIBS"
-LIBS="$LIBS $GTK_LIBS"
-AC_CHECK_FUNCS(gtk_spin_button_set_snap_to_ticks)
-LIBS="$oLIBS"
+IT_PROG_INTLTOOL([0.35.0])
 
-AC_CHECK_FUNCS(rename)
+GETTEXT_PACKAGE=gnome-games-deprecated
+AC_SUBST([GETTEXT_PACKAGE])
+AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package])
+AM_GLIB_GNU_GETTEXT
 
-dnl
-dnl ScottFree check
-dnl
-ZVT_LIBS=`$GNOME_CONFIG --libs zvt`
-AC_SUBST(ZVT_LIBS)
+# *****************************************************************************
+# *****************************************************************************
 
-AC_DEFINE_UNQUOTED(GNOME_ICONDIR, "${prefix}/share/pixmaps")
+AC_SUBST([AM_CPPFLAGS])
+AC_SUBST([AM_CFLAGS])
+AC_SUBST([AM_CXXFLAGS])
+AC_SUBST([AM_LDFLAGS])
 
-AC_OUTPUT([
-gnome-games.spec
+AC_CONFIG_FILES([
 Makefile
 po/Makefile.in
-macros/Makefile
-intl/Makefile
 scottfree/Makefile
 gturing/Makefile
-gturing/help/Makefile
-gturing/help/C/Makefile
-gturing/help/it/Makefile
 xbill/Makefile
-xbill/help/Makefile
-xbill/help/C/Makefile
 xbill/pixmaps/Makefile
 xbill/cursors/Makefile
-omf-install/Makefile
 ])
+
+#gturing/help/Makefile
+#gturing/help/C/Makefile
+#gturing/help/it/Makefile
+#xbill/help/Makefile
+#xbill/help/C/Makefile
+
+AC_OUTPUT

Modified: trunk/gturing/Makefile.am
==============================================================================
--- trunk/gturing/Makefile.am	(original)
+++ trunk/gturing/Makefile.am	Thu Oct 30 14:36:52 2008
@@ -1,37 +1,65 @@
-SUBDIRS = help
+# SUBDIRS = help
 
-Gamesdir = $(datadir)/gnome/apps/Games
-examplesdir = $(datadir)/gturing/examples
-icondir=$(datadir)/pixmaps
-
-INCLUDES = 			\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
-	-I$(includedir)				 \
-	$(GNOME_INCLUDEDIR)			 \
-	-DVERSION=\""$(VERSION)"\" \
-	-DGTURING_EXAMPLES_DIR=\""$(examplesdir)/"\"
+NULL =
 
-bin_PROGRAMS = gturing
+examplesdir = $(pkgdatadir)/gturing/examples
+examples_DATA = \
+	3ones2zeroes.tur	\
+	add.tur			\
+	addbin.tur		\
+	bin2dec.tur		\
+	dec2bin.tur		\
+	subst.tur		\
+	dashnumbers.tur		\
+	bb2.tur			\
+	bb3.tur			\
+	bb5.tur			\
+	$(NULL)
+
+icondir = $(datadir)/pixmaps
+icon_DATA = \
+	gnome-gturing.png	\
+	$(NULL)
+
+gamesdir = $(datadir)/gnome/apps/games
+games_DATA = \
+	gturing.desktop	\
+	$(NULL)
 
-icon_DATA = gnome-gturing.png
+bin_PROGRAMS = gturing
 
 gturing_SOURCES =	\
 	gturing.c	\
 	turing.h	\
 	turing.c
 
-gturing_LDADD = \
-	$(GNOME_LIBDIR) \
-	$(GNOMEUI_LIBS)	\
-	$(INTLLIBS)
+gturing_CPPFLAGS = \
+	-DGNOMELOCALEDIR="\"$(datadir)/locale\""	\
+	-DGTURING_EXAMPLES_DIR="\"$(examplesdir)\""	\
+	$(AM_CPPFLAGS)
+
+gturing_CFLAGS = \
+	$(DEPENDENCIES_CFLAGS)	\
+	$(WARN_CFLAGS)		\
+	$(AM_CFLAGS)
 
-examples_DATA = 3ones2zeroes.tur add.tur addbin.tur bin2dec.tur dec2bin.tur \
-	subst.tur dashnumbers.tur bb2.tur bb3.tur bb5.tur
+gturing_LDFLAGS = \
+	$(AM_LDFLAGS)
 
-Games_DATA = gturing.desktop
+gturing_LDADD = \
+	$(DEPENDENCIES_LIBS)	\
+	$(INTLLIBS)
 
-EXTRA_DIST = play.xpm power.xpm step.xpm stop.xpm \
-	README CREDITS $(examples_DATA) $(Games_DATA) $(icon_DATA)
+EXTRA_DIST = \
+	play.xpm	\
+	power.xpm	\
+	step.xpm	\
+	stop.xpm	\
+	README		\
+	CREDITS		\
+	$(examples_DATA)\
+	$(games_DATA)	\
+	$(icon_DATA)
 
 install-data-local:
 	-chgrp games $(DESTDIR)$(bindir)/gturing && chmod 2111 $(DESTDIR)$(bindir)/gturing