--- np2/x11/Attic/Imakefile	2004/07/26 15:53:26	1.25
+++ np2/x11/Attic/Imakefile	2004/08/04 11:57:05	1.26
@@ -18,7 +18,7 @@ XCOMM
 XCOMM GUI Toolkit
 XCOMM
 
-#if defined(USE_GTK2)
+#if defined(USE_GTK2) && !defined(USE_GTK2_GTK1)
 GTK_CONFIG?= pkg-config gtk+-2.0
 CFLAGS+= -DGTK_DISABLE_DEPRECATED
 GTK_DEFINE= -DUSE_GTK2=1
@@ -30,8 +30,12 @@ GTKDEPOBJS=	gtk2/dialog_about.o gtk2/dia
 		gtk2/gtk_drawmng.o gtk2/gtk_screen.o gtk2/gtk_font.o \
 		gtk2/gtk_keyboard.o gtk2/gtk_menu.o gtk2/gtk_mouse.o \
 		gtk2/gtk_main.o gtk2/gtk_wrapper.o
+#else	/* !(USE_GTK2 && !USE_GTK2_GTK1) */
+#if defined(USE_GTK2_GTK1)
+GTK_CONFIG?= pkg-config gtk+-2.0
 #else
 GTK_CONFIG?= gtk-config
+#endif
 GTK_DEFINE= -DUSE_GTK=1
 
 GTKDEPOBJS=	gtk/dialog_about.o gtk/dialog_calendar.o gtk/dialog_config.o \
@@ -42,7 +46,7 @@ GTKDEPOBJS=	gtk/dialog_about.o gtk/dialo
 		gtk/gtk_drawmng.o gtk/gtk_screen.o gtk/gtk_font.o \
 		gtk/gtk_keyboard.o gtk/gtk_menu.o gtk/gtk_mouse.o \
 		gtk/gtk_main.o gtk/gtk_wrapper.o
-#endif
+#endif	/* USE_GTK2 && !USE_GTK2_GTK1 */
 GTK_INCLUDE= `$(GTK_CONFIG) --cflags`
 GTK_LIB= `$(GTK_CONFIG) --libs`