]> git.pld-linux.org Git - packages/lgeneral.git/blob - lgeneral-configure_fix.patch
- fix for configure.in which contains one Makefile two times
[packages/lgeneral.git] / lgeneral-configure_fix.patch
1 diff -durN lgeneral-1.1.orig/configure.in lgeneral-1.1/configure.in
2 --- lgeneral-1.1.orig/configure.in      Tue Oct 15 13:55:35 2002
3 +++ lgeneral-1.1/configure.in   Tue Oct 15 13:56:43 2002
4 @@ -53,4 +53,4 @@
5  AC_SUBST(inst_dir)
6  AC_SUBST(dis_flag)
7  
8 -AC_OUTPUT(Makefile src/Makefile src/nations/Makefile src/scenarios/Makefile src/units/Makefile src/sounds/Makefile src/music/Makefile src/maps/Makefile src/gfx/Makefile  src/gfx/flags/Makefile src/gfx/terrain/Makefile src/gfx/units/Makefile src/ai_modules/Makefile src/campaigns/Makefile src/gfx/Makefile src/themes/Makefile src/themes/default/Makefile)
9 +AC_OUTPUT(Makefile src/Makefile src/nations/Makefile src/scenarios/Makefile src/units/Makefile src/sounds/Makefile src/music/Makefile src/maps/Makefile src/gfx/Makefile  src/gfx/flags/Makefile src/gfx/terrain/Makefile src/gfx/units/Makefile src/ai_modules/Makefile src/campaigns/Makefile src/themes/Makefile src/themes/default/Makefile)
10 diff -durN lgeneral-1.1.orig/configure.in~ lgeneral-1.1/configure.in~
11 --- lgeneral-1.1.orig/configure.in~     Thu Jan  1 00:00:00 1970
12 +++ lgeneral-1.1/configure.in~  Tue Oct 15 13:55:35 2002
13 @@ -0,0 +1,56 @@
14 +dnl Process this file with autoconf to produce a configure script.
15 +AC_INIT(Makefile.am)
16 +
17 +AM_CONFIG_HEADER(config.h)
18 +
19 +AM_INIT_AUTOMAKE(lgeneral,1.1)
20 +
21 +dnl Checks for programs.
22 +AC_PROG_CC
23 +AC_PROG_RANLIB
24 +
25 +dnl various CFLAGS
26 +CFLAGS="-g"
27 +CFLAGS="$CFLAGS -Wall"
28 +
29 +dnl Checks for libraries.
30 +
31 +dnl check SDL version
32 +AM_PATH_SDL(1.1.4,, AC_MSG_ERROR(lib SDL >=1.1.4 is needed))
33 +CFLAGS="$CFLAGS $SDL_CFLAGS"
34 +LIBS="$LIBS $SDL_LIBS"
35 +
36 +dnl check sound
37 +sound_flag="-DWITH_SOUND"
38 +mixer_flag="-lSDL_mixer"
39 +AC_ARG_ENABLE( sound,
40 +[  --disable-sound         Disables sound], sound_flag=""; mixer_flag="")
41 +
42 +dnl check if SDL_mixer's installed
43 +dnl if not: clear sound_flag and mixer_flag
44 +AC_CHECK_LIB(SDL_mixer, main,
45 +AC_MSG_RESULT("SDL_Mixer found"), 
46 +AC_MSG_RESULT("SDL_Mixer NOT found \(get it at http://libsdl.org\): Audio disabled"); sound_flag=""; mixer_flag="")
47 +
48 +AC_SUBST(sound_flag)
49 +AC_SUBST(mixer_flag)
50 +
51 +dnl check use of dynamic libraries
52 +dl_flag="-DUSE_DL"
53 +AC_ARG_ENABLE( dl,
54 +[  --disable-dl         Disable use of dynamic AI modules], dl_flag="")
55 +AC_SUBST(dl_flag)
56 +
57 +dnl installation path
58 +inst_dir=$datadir/lgeneral
59 +inst_flag="-DSRC_DIR=\\\"$inst_dir\\\""
60 +
61 +AC_ARG_ENABLE( install,
62 +[  --disable-install       No installation. Played from the source directory.], 
63 +inst_dir=. inst_flag="-DSRC_DIR=\\\".\\\"" dis_flag="-DDISABLE_INSTALL")
64 +
65 +AC_SUBST(inst_flag)
66 +AC_SUBST(inst_dir)
67 +AC_SUBST(dis_flag)
68 +
69 +AC_OUTPUT(Makefile src/Makefile src/nations/Makefile src/scenarios/Makefile src/units/Makefile src/sounds/Makefile src/music/Makefile src/maps/Makefile src/gfx/Makefile  src/gfx/flags/Makefile src/gfx/terrain/Makefile src/gfx/units/Makefile src/ai_modules/Makefile src/campaigns/Makefile src/gfx/Makefile src/themes/Makefile src/themes/default/Makefile)
This page took 0.054887 seconds and 3 git commands to generate.