← Back to branch summary

~ubuntu-branches/debian/sid/freeciv/sid

« back to all changes in this revision

Viewing changes to m4/ggz.m4

  • Committer: Bazaar Package Importer
  • Author(s): Clint Adams, Karl Goetz, Clint Adams
  • Date: 2009-11-27 23:24:00 UTC
  • mfrom: (7.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20091127232400-nmoil1yvvskugn1h
http://bugs.debian.org/553758
http://bugs.debian.org/470978
https://launchpad.net/bugs/190555
[ Karl Goetz ]
* New upstream release
* Bump standards-version to 3.8.3
* Update watch file
  - Now version 3
  - Switched to gna.org instead of sf.net
* Switch readline dev dependency to libreadline-dev instead of
libreadline5-dev. Closes: #553758
* Changed compat to 5
* Relaxed dependencies on freeciv-server for sdl and gtk clients,
freeciv-server is now a recommends
* Stop d/rules trying to gzip scenarios - upstream does this.
* Remove export of datarootdir in d/rules, upstream seems to handle
this correctly now.
* Deleted 01_configure_ac_localedir.diff from d/patches/ and from series.
* Create per-client .desktop files. Closes: #470978, LP: #190555
* Desktop files mention which client they are (sdl/gtk/xaw3d).
* Add myself to uploaders on Clint's suggestion.

[ Clint Adams ]
* Change watch file to grab bz2 tarballs.
* Switch to 3.0 (quilt) source format.
* Remove quilt code from debian/rules.

Show diffs side-by-side

added added

removed removed

Lines of Context:
m4/ggz.m4
139
139
    [  ac_ggz_prefix="$withval"
140
140
    ])
141
141
 
142
 
if test "x$ac_ggz_prefix" != "xno" ; then
143
 
  if test "x${prefix}" = "xNONE"; then
144
 
    ac_ggz_prefix_incdir="${ac_default_prefix}/include"
145
 
    ac_ggz_prefix_libdir="${ac_default_prefix}/lib"
146
 
    ac_ggz_prefix_bindir="${ac_default_prefix}/bin"
147
 
    ac_ggz_prefix_etcdir="${ac_default_prefix}/etc"
148
 
  else
149
 
    unq_includedir="${includedir}"
150
 
    unq_libdir="${libdir}"
151
 
    unq_bindir="${bindir}"
152
 
    unq_sysconfdir="${sysconfdir}"
153
 
 
154
 
    eval unq_includedir=`echo $unq_includedir`
155
 
    eval unq_includedir=`echo $unq_includedir`
156
 
    eval unq_libdir=`echo $unq_libdir`
157
 
    eval unq_libdir=`echo $unq_libdir`
158
 
    eval unq_bindir=`echo $unq_bindir`
159
 
    eval unq_bindir=`echo $unq_bindir`
160
 
    eval unq_sysconfdir=`echo $unq_sysconfdir`
161
 
    eval unq_sysconfdir=`echo $unq_sysconfdir`
162
 
 
163
 
    ac_ggz_prefix_incdir="${unq_includedir}"
164
 
    ac_ggz_prefix_libdir="${unq_libdir}"
165
 
    ac_ggz_prefix_bindir="${unq_bindir}"
166
 
    ac_ggz_prefix_etcdir="${unq_sysconfdir}"
167
 
  fi
168
 
  ac_ggz_stdinc="$ac_ggz_prefix_incdir"
169
 
  ac_ggz_stdlib="$ac_ggz_prefix_libdir"
170
 
  ac_ggz_stdbin="$ac_ggz_prefix_bindir"
171
 
  ac_ggz_stdetc="$ac_ggz_prefix_etcdir/ggzd"
172
 
  if test "x$ac_ggz_prefix" != "x"; then
173
 
    ac_ggz_stdinc="$ac_ggz_stdinc $ac_ggz_prefix/include"
174
 
    ac_ggz_stdlib="$ac_ggz_stdlib $ac_ggz_prefix/lib $ac_ggz_prefix/lib64"
175
 
    ac_ggz_stdbin="$ac_ggz_stdbin $ac_ggz_prefix/bin"
176
 
    ac_ggz_stdetc="$ac_ggz_stdetc $ac_ggz_prefix/etc/ggzd"
177
 
  fi
178
 
  if test "x$1" = "xdefaults" || test "x$2" = "xdefaults"; then
179
 
    ac_ggz_stdinc="$ac_ggz_stdinc /usr/local/include /usr/include"
180
 
    ac_ggz_stdlib="$ac_ggz_stdlib /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64"
181
 
    ac_ggz_stdbin="$ac_ggz_stdbin /usr/local/bin /usr/bin"
182
 
    ac_ggz_stdetc="$ac_ggz_stdetc /usr/local/etc/ggzd /etc/ggzd"
183
 
  fi
184
 
  if test "x$1" = "xexport" || test "x$2" = "xexport"; then
185
 
    CPPFLAGS="$CPPFLAGS -I ${ac_ggz_prefix_incdir} -I /usr/local/include"
186
 
    LDFLAGS="$LDFLAGS -L${ac_ggz_prefix_libdir} -L/usr/local/lib"
187
 
  fi
188
 
 
189
 
  save_cflags=$CFLAGS
190
 
  save_cxxflags=$CXXFLAGS
191
 
  if test "x$GCC" = xyes; then
 
142
if test "x${prefix}" = "xNONE"; then
 
143
   ac_ggz_prefix_incdir="${ac_default_prefix}/include"
 
144
   ac_ggz_prefix_libdir="${ac_default_prefix}/lib"
 
145
   ac_ggz_prefix_bindir="${ac_default_prefix}/bin"
 
146
   ac_ggz_prefix_etcdir="${ac_default_prefix}/etc"
 
147
else
 
148
   unq_includedir="${includedir}"
 
149
   unq_libdir="${libdir}"
 
150
   unq_bindir="${bindir}"
 
151
   unq_sysconfdir="${sysconfdir}"
 
152
 
 
153
   eval unq_includedir=`echo $unq_includedir`
 
154
   eval unq_includedir=`echo $unq_includedir`
 
155
   eval unq_libdir=`echo $unq_libdir`
 
156
   eval unq_libdir=`echo $unq_libdir`
 
157
   eval unq_bindir=`echo $unq_bindir`
 
158
   eval unq_bindir=`echo $unq_bindir`
 
159
   eval unq_sysconfdir=`echo $unq_sysconfdir`
 
160
   eval unq_sysconfdir=`echo $unq_sysconfdir`
 
161
 
 
162
   ac_ggz_prefix_incdir="${unq_includedir}"
 
163
   ac_ggz_prefix_libdir="${unq_libdir}"
 
164
   ac_ggz_prefix_bindir="${unq_bindir}"
 
165
   ac_ggz_prefix_etcdir="${unq_sysconfdir}"
 
166
fi
 
167
ac_ggz_stdinc="$ac_ggz_prefix_incdir"
 
168
ac_ggz_stdlib="$ac_ggz_prefix_libdir"
 
169
ac_ggz_stdbin="$ac_ggz_prefix_bindir"
 
170
ac_ggz_stdetc="$ac_ggz_prefix_etcdir/ggzd"
 
171
if test "x$ac_ggz_prefix" != "x"; then
 
172
  ac_ggz_stdinc="$ac_ggz_stdinc $ac_ggz_prefix/include"
 
173
  ac_ggz_stdlib="$ac_ggz_stdlib $ac_ggz_prefix/lib $ac_ggz_prefix/lib64"
 
174
  ac_ggz_stdbin="$ac_ggz_stdbin $ac_ggz_prefix/bin"
 
175
  ac_ggz_stdetc="$ac_ggz_stdetc $ac_ggz_prefix/etc/ggzd"
 
176
fi
 
177
if test "x$1" = "xdefaults" || test "x$2" = "xdefaults"; then
 
178
  ac_ggz_stdinc="$ac_ggz_stdinc /usr/local/include /usr/include"
 
179
  ac_ggz_stdlib="$ac_ggz_stdlib /usr/local/lib /usr/local/lib64 /usr/lib /usr/lib64"
 
180
  ac_ggz_stdbin="$ac_ggz_stdbin /usr/local/bin /usr/bin"
 
181
  ac_ggz_stdetc="$ac_ggz_stdetc /usr/local/etc/ggzd /etc/ggzd"
 
182
fi
 
183
if test "x$1" = "xexport" || test "x$2" = "xexport"; then
 
184
  CPPFLAGS="$CPPFLAGS -I ${ac_ggz_prefix_incdir} -I /usr/local/include"
 
185
  LDFLAGS="$LDFLAGS -L${ac_ggz_prefix_libdir} -L/usr/local/lib"
 
186
fi
 
187
 
 
188
save_cflags=$CFLAGS
 
189
save_cxxflags=$CXXFLAGS
 
190
if test "x$GCC" = xyes; then
192
191
        CFLAGS="-Wall -Werror"
193
192
        AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
194
193
                [[void signedness(void){char c;if(c==-1)c=0;}]])],
195
194
                [],
196
195
                [save_cflags="$save_cflags -fsigned-char"
197
196
                 save_cxxflags="$save_cxxflags -fsigned-char"])
198
 
  else
 
197
else
199
198
        AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
200
199
                [[#if defined(__SUNPRO_C) || (__SUNPRO_C >= 0x550)
201
200
                #else
205
204
                 save_cxxflags="$save_cxxflags -xchar=signed"],
206
205
                [])
207
206
 
208
 
  fi
209
 
  CFLAGS=$save_cflags
210
 
  CXXFLAGS=$save_cxxflags
211
207
fi
 
208
CFLAGS=$save_cflags
 
209
CXXFLAGS=$save_cxxflags
212
210
])
213
211
 
214
212
dnl ------------------------------------------------------------------------
536
534
    AC_SUBST(GGZ_CONFIG)
537
535
    AC_SUBST(ggzexecmoddir)
538
536
    AC_SUBST(ggzdatadir)
539
 
    AC_DEFINE_UNQUOTED(GGZMODULECONFDIR, "${prefix}/etc", [Path where the game registry is located])
 
537
    AC_DEFINE_UNQUOTED(GGZMODULECONFDIR, "${sysconfdir}", [Path where the game registry is located])
540
538
    AC_DEFINE_UNQUOTED(GAMEDIR, "${libdir}/ggz", [Path where to install the games])
541
539
    AC_DEFINE_UNQUOTED(GGZDATADIR, "${datadir}/ggz", [Path where the games should look for their data files])
542
540
  else
928
926
          AC_MSG_RESULT([$have_ggzdconf (intentionally ignored)])
929
927
        elif test "x$2" = "xforce"; then
930
928
          if test "x$ac_ggzd_confdir" = "x"; then
931
 
            ggzdconfdir="\${prefix}/etc/ggzd"
 
929
            ggzdconfdir="\${sysconfdir}/ggzd"
932
930
          else
933
931
            ggzdconfdir=$ac_ggzd_confdir
934
932
          fi
949
947
                        prefixed=1
950
948
                fi
951
949
        fi
952
 
        if test "x$ggzdconfdir" != "x${prefix}/etc/ggzd" && test "x$prefixed" = "x1"; then
953
 
                AC_MSG_RESULT([$have_ggzdconf ($ggzdconfdir, but using ${prefix}/etc/ggzd nevertheless)])
954
 
                ggzdconfdir="\${prefix}/etc/ggzd"
 
950
        if test "x$ggzdconfdir" != "x${sysconfdir}/ggzd" && test "x$prefixed" = "x1"; then
 
951
                AC_MSG_RESULT([$have_ggzdconf ($ggzdconfdir, but using ${sysconfdir}/ggzd nevertheless)])
 
952
                ggzdconfdir="\${sysconfdir}/ggzd"
955
953
        else
956
954
                AC_MSG_RESULT([$have_ggzdconf ($ggzdconfdir)])
957
955
        fi
961
959
        AC_SUBST(ggzdconfdir)
962
960
 
963
961
        ggzddatadir=${datadir}/${PACKAGE}
964
 
        AC_DEFINE_UNQUOTED(GGZDDATADIR, "${ggzddatadir}", [Game server data directory])
965
962
        AC_SUBST(ggzddatadir)
966
963
 
967
964
        if test "x${libdir}" = 'x${exec_prefix}/lib'; then
1019
1016
      AC_GGZ_GGZDMOD([ggz_server="yes"], [ggz_server="no"])
1020
1017
    fi
1021
1018
    if test "$ggz_server" = "yes"; then
1022
 
      AC_GGZ_SERVER
 
1019
      AC_GGZ_SERVER([force],[force])
1023
1020
      AC_DEFINE(GGZ_SERVER, 1, [Server support for GGZ])
1024
1021
    else
1025
1022
      if test "$try_ggz_server" = "yes"; then
1046
1043
AC_DEFUN([AC_GGZ_CHECK],
1047
1044
[
1048
1045
  AC_GGZ_INIT([defaults])
1049
 
 
1050
 
  if test x$ac_ggz_prefix != xno ; then
1051
 
    AC_GGZ_LIBGGZ([try_ggz="yes"], [try_ggz="no"])
1052
 
  else
1053
 
    try_ggz=no
1054
 
  fi
 
1046
  AC_GGZ_LIBGGZ([try_ggz="yes"], [try_ggz="no"])
1055
1047
 
1056
1048
  if test "$try_ggz" = "yes"; then
1057
1049
    # For now, version 0.0.14 is required.  This could be an additional