[Freeciv-Dev] (PR#2793) GTK2 client detection

["Jason Short via RT" <rt@xxxxxxxxxxxxxx>]

The attached patch moves detection of GTK+-2.0 libs into a 
FC_GTK2_CLIENT macro, similarly to what has already been done for SDL, 
Win32, and GTK clients.

jason

Index: Makefile.am
===================================================================
RCS file: /home/freeciv/CVS/freeciv/Makefile.am,v
retrieving revision 1.28
diff -u -r1.28 Makefile.am
--- Makefile.am 2003/01/08 20:23:30     1.28
+++ Makefile.am 2003/01/11 00:25:10
@@ -76,6 +76,7 @@
                m4/gtk-2.0.m4                   \
                m4/gtk.m4                       \
                m4/gtk-client.m4                \
+               m4/gtk2-client.m4               \
                m4/iconv.m4                     \
                m4/imlib.m4                     \
                m4/isc-posix.m4                 \
Index: configure.ac
===================================================================
RCS file: /home/freeciv/CVS/freeciv/configure.ac,v
retrieving revision 1.33
diff -u -r1.33 configure.ac
--- configure.ac        2003/01/08 20:23:30     1.33
+++ configure.ac        2003/01/11 00:25:10
@@ -314,20 +314,7 @@
   FC_GTK_CLIENT
 
   dnl Gtk-2.0-specific overrides
-  if test "$client" = "gtk-2.0" || test "$client" = yes ; then
-    AM_PATH_GTK_2_0(2.0.0, gtk_2_0_found="yes", gtk2_0_found="")
-    if test "x$gtk_2_0_found" = "xyes"; then
-      CLIENT_CFLAGS="$GTK_CFLAGS"
-      CLIENT_LIBS="$GTK_LIBS"
-      found_client=yes
-    fi
-
-    if test "x$found_client" = "xyes"; then
-      client="gtk-2.0"
-    elif test "$client" = "gtk-2.0"; then
-      AC_MSG_ERROR(specified client 'gtk-2.0' not configurable)
-    fi
-  fi
+  FC_GTK2_CLIENT
 
   dnl SDL-specific overrides
   FC_SDL_CLIENT
Index: configure.in
===================================================================
RCS file: /home/freeciv/CVS/freeciv/configure.in,v
retrieving revision 1.211
diff -u -r1.211 configure.in
--- configure.in        2003/01/08 20:23:30     1.211
+++ configure.in        2003/01/11 00:25:10
@@ -308,20 +308,7 @@
   FC_GTK_CLIENT
 
   dnl Gtk-2.0-specific overrides
-  if test "$client" = "gtk-2.0" || test "$client" = yes ; then
-    AM_PATH_GTK_2_0(2.0.0, gtk_2_0_found="yes", gtk2_0_found="")
-    if test "x$gtk_2_0_found" = "xyes"; then
-      CLIENT_CFLAGS="$GTK_CFLAGS"
-      CLIENT_LIBS="$GTK_LIBS"
-      found_client=yes
-    fi
-
-    if test "x$found_client" = "xyes"; then
-      client="gtk-2.0"
-    elif test "$client" = "gtk-2.0"; then
-      AC_MSG_ERROR(specified client 'gtk-2.0' not configurable)
-    fi
-  fi
+  FC_GTK2_CLIENT
 
   dnl SDL-specific overrides
   FC_SDL_CLIENT

# Try to configure the GTK+-2.0 client (gui-gtk-2.0)

# FC_GTK_CLIENT
# Test for GTK+-2.0 libraries needed for gui-gtk-2.0

AC_DEFUN(FC_GTK2_CLIENT,
[
  if test "$client" = "gtk-2.0" || test "$client" = yes ; then
    AM_PATH_GTK_2_0(2.0.0,
      [
        client="gtk-2.0"
        CLIENT_CFLAGS="$GTK_CFLAGS"
        CLIENT_LIBS="$GTK_LIBS"
      ],
      [
        FC_NO_CLIENT([gtk-2.0], [GTK+-2.0 libraries not found])
      ])
  fi
])