gistfile1

diff -Naur gwaei-1.0b1.orig/Makefile.am gwaei-1.0b1/Makefile.am
--- gwaei-1.0b1.orig/Makefile.am	2009-02-21 10:20:29.000000000 +0900
+++ gwaei-1.0b1/Makefile.am	2009-04-29 23:10:04.000000000 +0900
@@ -2,7 +2,7 @@
 
 SUBDIRS = docs src 
 
-if DISABLE_GNOME
+if WITHOUT_GNOME
 else
 SUBDIRS += src/schemas src/xml src/kpengine src/img src/desktop po
 endif
diff -Naur gwaei-1.0b1.orig/configure.ac gwaei-1.0b1/configure.ac
--- gwaei-1.0b1.orig/configure.ac	2009-04-24 18:15:03.000000000 +0900
+++ gwaei-1.0b1/configure.ac	2009-04-29 23:30:57.000000000 +0900
@@ -18,36 +18,28 @@
 GMODULE_EXPORT_REQUIRED_VERSION=2.16.0
 LIBSEXY_REQUIRED_VERSION=0.1.11
 
-PKG_CHECK_MODULES(DEPS, glib-2.0           >= $GLIB_REQUIRED_VERSION
-                        libcurl            >= $LIBCURL_REQUIRED_VERSION
+PKG_CHECK_MODULES(DEPS, glib-2.0    >= $GLIB_REQUIRED_VERSION
+                        libcurl     >= $LIBCURL_REQUIRED_VERSION
                         gmodule-2.0 >= $GMODULE_EXPORT_REQUIRED_VERSION 
-                        gthread-2.0        >= $GTHREAD_REQUIRED_VERSION       )
+                        gthread-2.0 >= $GTHREAD_REQUIRED_VERSION)
 AC_SUBST(DEPS_CFLAGS)
 AC_SUBST(DEPS_LIBS)
 
 
-PKG_CHECK_MODULES(GCONF, gconf-2.0 >= $GCONF_REQUIRED_VERSION
+PKG_CHECK_MODULES(WIN32, gtk+-2.0  >= $GTK2_REQUIRED_VERSION
                         ,,AM_CONDITIONAL([ENABLE_WIN32], false))
-AC_SUBST(GCONF_CFLAGS)
-AC_SUBST(GCONF_LIBS)
+AC_SUBST(WIN32_CFLAGS)
+AC_SUBST(WIN32_LIBS)
 
 
-PKG_CHECK_MODULES(SEXY, libsexy >= $LIBSEXY_REQUIRED_VERSION
-                        ,,AM_CONDITIONAL([DISABLE_SEXY], true))
-AC_SUBST(SEXY_CFLAGS)
-AC_SUBST(SEXY_LIBS)
-
-
-PKG_CHECK_MODULES(GNOME, gtk+-2.0           >= $GTK2_REQUIRED_VERSION
-                         libgnome-2.0       >= $LIBGNOME_REQUIRED_VERSION
-                          ,,AM_CONDITIONAL([DISABLE_GNOME], true))
+PKG_CHECK_MODULES(GNOME, gtk+-2.0     >= $GTK2_REQUIRED_VERSION
+                         gconf-2.0    >= $GCONF_REQUIRED_VERSION
+                         libgnome-2.0 >= $LIBGNOME_REQUIRED_VERSION
+                         libsexy      >= $LIBSEXY_REQUIRED_VERSION
+                        ,,AM_CONDITIONAL([WITHOUT_GNOME], true))
 AC_SUBST(GNOME_CFLAGS)
 AC_SUBST(GNOME_LIBS)
 
-PKG_CHECK_MODULES(GTK, gtk+-2.0           >= $GTK2_REQUIRED_VERSION
-                          ,,,)
-AC_SUBST(GTK_CFLAGS)
-AC_SUBST(GTK_LIBS)
 
 ENGLISH_DEFAULT_URI=ftp://ftp.monash.edu.au/pub/nihongo/edict.gz
 AC_SUBST(ENGLISH_DEFAULT_URI)
@@ -88,23 +80,14 @@
 esac],[win32=false])
 AM_CONDITIONAL([ENABLE_WIN32], [test x$win32 = xtrue])
 
-AC_ARG_ENABLE([libsexy],
-[  --disable-libsexy       turn off libsexy (no automatic spellcheck)],
-[case "${enableval}" in
-yes) libsexy=false ;;
-no)  libsexy=true ;;
-*) AC_MSG_ERROR([bad value ${enableval} for --disable-libsexy]) ;;
-esac],[libsexy=false])
-AM_CONDITIONAL([DISABLE_SEXY], [test x$libsexy = xtrue])
-
-AC_ARG_ENABLE([gnome],
-[  --disable-gnome         turn off the gnome gui interface],
-[case "${enableval}" in
+AC_ARG_WITH([gnome],
+[  --without-gnome         turn off the gnome gui interface],
+[case "${withval}" in
 yes) gnome=false ;;
 no)  gnome=true ;;
-*) AC_MSG_ERROR([bad value ${enableval} for --disable-gnome]) ;;
+*) AC_MSG_ERROR([bad value ${withval} for --without-gnome]) ;;
 esac],[gnome=false])
-AM_CONDITIONAL([DISABLE_GNOME], [test x$gnome = xtrue])
+AM_CONDITIONAL([WITHOUT_GNOME], [test x$gnome = xtrue])
 
 
 
diff -Naur gwaei-1.0b1.orig/src/Makefile.am gwaei-1.0b1/src/Makefile.am
--- gwaei-1.0b1.orig/src/Makefile.am	2009-04-23 23:45:56.000000000 +0900
+++ gwaei-1.0b1/src/Makefile.am	2009-04-29 23:10:22.000000000 +0900
@@ -34,8 +34,8 @@
 gwaei_SOURCES += sexy-disable.c
 gwaei_SOURCES += preferences-none.c
 gwaei_SOURCES += help-none.c
-gwaei_LDADD += $(GTK_LIBS)
-AM_CFLAGS += $(GTK_CFLAGS)
+gwaei_LDADD += $(WIN32_LIBS)
+AM_CFLAGS += $(WIN32_CFLAGS)
 DEFS += -DINTERFACE=\"GTK\"
 DEFS += -DLC_MESSAGES=\"C\"
 DEFS += -DDATADIR2=\"$(datadir)\"
@@ -49,27 +49,22 @@
 else
 DEFS += -DDATADIR2=\"$(datadir)\"
 
-if DISABLE_GNOME
+if WITHOUT_GNOME
 gwaei_SOURCES += preferences-none.c
 gwaei_SOURCES += include/gwaei/interface.h include/gwaei/callbacks.h main-interface-none.c sexy-disable.c
+gwaei_SOURCES += sexy-disable.c
 DEFS += -DINTERFACE=\"NONE\"
 
 else
 gwaei_SOURCES += preferences-gconf.c 
-gwaei_LDADD += $(GCONF_LIBS)
-AM_CFLAGS += $(GCONF_CFLAGS)
+gwaei_SOURCES += sexy-enable.c include/gwaei/sexy.h
+gwaei_LDADD += $(GNOME_LIBS)
+AM_CFLAGS += $(GNOME_CFLAGS)
 gwaei_SOURCES += main-callbacks-gtk.c main-interface-gtk.c settings.c settings-callbacks-gtk.c settings-interface-gtk.c radicals-interface-gtk.c radicals-callbacks-gtk.c printing-gtk.c include/gwaei/interface.h include/gwaei/callbacks.h include/gwaei/radicals.h include/gwaei/settings.h include/gwaei/printing.h include/gwaei/gtk.h kanjipad/callbacks.c kanjipad/callbacks.h  kanjipad/kanjipad.c kanjipad/kanjipad.h kanjipad/padarea.c kanjipad/padarea.h 
 gwaei_SOURCES += help-gtk.c
 gwaei_LDADD += $(GNOME_LIBS)
 AM_CFLAGS += $(GNOME_CFLAGS)
 DEFS += -DINTERFACE=\"GTK\"
 
-if DISABLE_SEXY
-gwaei_SOURCES += sexy-disable.c
-else
-gwaei_SOURCES += sexy-enable.c include/gwaei/sexy.h
-gwaei_LDADD += $(SEXY_LIBS)
-AM_CFLAGS += $(SEXY_CFLAGS)
-endif
 endif
 endif