← Back to branch summary

~ubuntu-branches/debian/squeeze/freeciv/squeeze

« back to all changes in this revision

Viewing changes to m4/xaw-client.m4

  • Committer: Bazaar Package Importer
  • Author(s): Clint Adams, Karl Goetz, Clint Adams
  • Date: 2010-02-23 22:09:02 UTC
  • mfrom: (1.2.13 upstream)
  • Revision ID: james.westby@ubuntu.com-20100223220902-kiyrmr9i4152cka5
Tags: 2.2.0-1
http://bugs.debian.org/523772
http://bugs.debian.org/517787
[ Karl Goetz ]
* Remove civserver files in /etc/ggzd/ (Closes: 523772, 517787)
* Adding ${misc:Depends} to all binary packages (lintian warnings)

[ Clint Adams ]
* New upstream version.
  - Drop data_dsc_use_bindir.diff (binary pathnames have changed).

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/xaw-client.m4
6
6
AC_DEFUN([FC_XAW_CLIENT],
7
7
[
8
8
  AC_REQUIRE([AC_PATH_XTRA])
9
 
  if test "$client" = yes ; then
10
 
    AC_MSG_WARN([Not checking for XAW; use --enable-client=xaw to enable])
11
 
  elif test "$client" = xaw ; then
 
9
  if test "x$gui_xaw" = "xyes" || test "x$client" = "xall" ||
 
10
     test "x$client" = "xauto" ; then
12
11
    dnl Checks for X:
13
12
    AC_PATH_XTRA
14
13
 
35
34
      [
36
35
        AC_CHECK_LIB([png], [png_read_image], [X_LIBS="$X_LIBS -lpng -lm"],
37
36
        [
38
 
          AC_MSG_ERROR([Could not find PNG library.])
 
37
          FC_NO_CLIENT([xaw], [Could not find PNG library.])
 
38
          no_png=yes
39
39
        ])
40
40
      ])
41
41
      AC_CHECK_HEADER([png.h],,
42
42
      [
43
 
        AC_MSG_ERROR([libpng found but not png.h.
 
43
        FC_NO_CLIENT([xaw], [libpng found but not png.h.
44
44
You may need to install a libpng \"development\" package.])
 
45
        no_png=yes
45
46
      ])
46
47
    ])
47
48
 
83
84
        dnl Xaw or Xaw3d:
84
85
        if test -n "$WITH_XAW3D"; then
85
86
          FC_CHECK_X_LIB(Xaw3d, main, , AC_MSG_ERROR(did not find Xaw3d library))
86
 
        elif test "$client" = "xaw"; then
 
87
        else
87
88
          FC_CHECK_X_LIB(Xaw, main, , AC_MSG_ERROR(did not find Xaw library))
88
 
        else
89
 
          FC_CHECK_X_LIB(Xaw3d, main, , noXaw3d=1)
90
 
          if test -n "$noXaw3d"; then
91
 
            FC_CHECK_X_LIB(Xaw, main, ,
92
 
              AC_MSG_ERROR(did not find either Xaw or Xaw3d library))
93
 
          fi
94
89
        fi
95
90
 
96
 
        CLIENT_CFLAGS="$X_CFLAGS"
97
 
        CLIENT_LIBS="$X_LIBS $X_EXTRA_LIBS"
 
91
        GUI_xaw_CFLAGS="$X_CFLAGS"
 
92
        GUI_xaw_LIBS="$X_LIBS $X_EXTRA_LIBS"
98
93
 
99
94
        found_client=yes
100
95
      fi
101
96
    fi
102
97
 
103
 
    if test "x$found_client" = "xyes"; then
104
 
      client=xaw
105
 
    elif test "$client" = "xaw"; then
 
98
    if test "x$found_client" = "xyes" && test "x$no_png" != "xyes"; then
 
99
      gui_xaw=yes
 
100
      if test "x$client" = "xauto" ; then
 
101
        client=yes
 
102
      fi
 
103
    elif test "x$gui_xaw" = "xyes"; then
106
104
      if test "x$haveXpm" = "xno"; then
107
105
        AC_MSG_ERROR(specified client 'xaw' not configurable -- need Xpm library and development headers; perhaps try/adjust --with-xpm-lib)
108
106
      else