|
Line
Link Here
|
| 0 |
-- configure.ac |
0 |
++ configure.ac |
|
Lines 47-53
Link Here
|
| 47 |
AC_SUBST(LW6_CODENAME) |
47 |
AC_SUBST(LW6_CODENAME) |
| 48 |
|
48 |
|
| 49 |
dnl Headers, some are optional |
49 |
dnl Headers, some are optional |
| 50 |
AC_CHECK_HEADERS(arpa/inet.h ctype.h dirent.h errno.h execinfo.h expat.h fcntl.h gmp.h GL/gl.h GL/glu.h iconv.h ifaddrs.h jpeglib.h langinfo.h libintl.h libpng12/png.h libpng13/png.h libpng14/png.h libpng15/png.h lmcons.h limits.h locale.h ltdl.h mach/vm_statistics.h mach/mach_types.h mach/mach_init.h mach/mach_host.h math.h netdb.h netinet/in.h omp.h pthread.h readline/history.h readline/readline.h SDL/SDL.h SDL/SDL_image.h SDL/SDL_mixer.h SDL/SDL_ttf.h signal.h stdarg.h stdio.h stdlib.h string.h syslog.h sys/select.h sys/signal.h sys/socket.h sys/stat.h sys/sysinfo.h sys/time.h sys/types.h sys/utsname.h time.h unistd.h winbase.h windows.h winsock2.h) |
50 |
AC_CHECK_HEADERS(arpa/inet.h ctype.h dirent.h errno.h execinfo.h expat.h fcntl.h gmp.h GL/gl.h GL/glu.h iconv.h ifaddrs.h jpeglib.h langinfo.h libintl.h libpng12/png.h libpng13/png.h libpng14/png.h libpng15/png.h libpng16/png.h lmcons.h limits.h locale.h ltdl.h mach/vm_statistics.h mach/mach_types.h mach/mach_init.h mach/mach_host.h math.h netdb.h netinet/in.h omp.h pthread.h readline/history.h readline/readline.h SDL/SDL.h SDL/SDL_image.h SDL/SDL_mixer.h SDL/SDL_ttf.h signal.h stdarg.h stdio.h stdlib.h string.h syslog.h sys/select.h sys/signal.h sys/socket.h sys/stat.h sys/sysinfo.h sys/time.h sys/types.h sys/utsname.h time.h unistd.h winbase.h windows.h winsock2.h) |
| 51 |
|
51 |
|
| 52 |
AM_MISSING_PROG(PERL, perl, ${missing_dir}) |
52 |
AM_MISSING_PROG(PERL, perl, ${missing_dir}) |
| 53 |
AM_MISSING_PROG(AWK, awk, ${missing_dir}) |
53 |
AM_MISSING_PROG(AWK, awk, ${missing_dir}) |
|
Lines 319-324
Link Here
|
| 319 |
AC_CHECK_HEADER(libpng13/png.h, HAVE_LIBPNG13_PNG_H=1) |
319 |
AC_CHECK_HEADER(libpng13/png.h, HAVE_LIBPNG13_PNG_H=1) |
| 320 |
AC_CHECK_HEADER(libpng14/png.h, HAVE_LIBPNG14_PNG_H=1) |
320 |
AC_CHECK_HEADER(libpng14/png.h, HAVE_LIBPNG14_PNG_H=1) |
| 321 |
AC_CHECK_HEADER(libpng15/png.h, HAVE_LIBPNG15_PNG_H=1) |
321 |
AC_CHECK_HEADER(libpng15/png.h, HAVE_LIBPNG15_PNG_H=1) |
|
|
322 |
AC_CHECK_HEADER(libpng16/png.h, HAVE_LIBPNG16_PNG_H=1) |
| 322 |
if test x${HAVE_LIBPNG12_PNG_H} = x1 || test x${HAVE_LIBPNG13_PNG_H} = x1 || test x${HAVE_LIBPNG14_PNG_H} = x1 || test x${HAVE_LIBPNG15_PNG_H} = x1; then |
323 |
if test x${HAVE_LIBPNG12_PNG_H} = x1 || test x${HAVE_LIBPNG13_PNG_H} = x1 || test x${HAVE_LIBPNG14_PNG_H} = x1 || test x${HAVE_LIBPNG15_PNG_H} = x1; then |
| 323 |
if test x${HAVE_LIBPNG12_PNG_H} = x1; then |
324 |
if test x${HAVE_LIBPNG12_PNG_H} = x1; then |
| 324 |
LIBPNG_1X_H=libpng12/png.h |
325 |
LIBPNG_1X_H=libpng12/png.h |
|
Lines 332-337
Link Here
|
| 332 |
if test x${HAVE_LIBPNG15_PNG_H} = x1; then |
333 |
if test x${HAVE_LIBPNG15_PNG_H} = x1; then |
| 333 |
LIBPNG_1X_H=libpng15/png.h |
334 |
LIBPNG_1X_H=libpng15/png.h |
| 334 |
fi |
335 |
fi |
|
|
336 |
if test x${HAVE_LIBPNG16_PNG_H} = x1; then |
| 337 |
LIBPNG_1X_H=libpng16/png.h |
| 338 |
fi |
| 335 |
else |
339 |
else |
| 336 |
AC_MSG_ERROR([ |
340 |
AC_MSG_ERROR([ |
| 337 |
*** Liquid War 6 needs libpng 1.2 1.3 1.4 or 1.5 (http://www.libpng.org/pub/png/libpng.html) |
341 |
*** Liquid War 6 needs libpng 1.2 1.3 1.4 or 1.5 (http://www.libpng.org/pub/png/libpng.html) |
| 338 |
-- src/Makefile.am |
342 |
++ src/Makefile.am |
|
Lines 55-61
Link Here
|
| 55 |
SUBDIRS = lib |
55 |
SUBDIRS = lib |
| 56 |
|
56 |
|
| 57 |
install-exec-local: |
57 |
install-exec-local: |
| 58 |
if which id && which ldconfig && test `id -u` -eq 0 && test "$(prefix)" != "/usr"; then ldconfig; fi # Run ldconfig automatically if we're root |
|
|
| 59 |
if test -x $(DESTDIR)$(bindir)/liquidwar6; then mv $(DESTDIR)$(bindir)/liquidwar6 $(DESTDIR)$(bindir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@; ln -s @PACKAGE_TARNAME@-@PACKAGE_VERSION@ $(DESTDIR)$(bindir)/liquidwar6; fi |
58 |
if test -x $(DESTDIR)$(bindir)/liquidwar6; then mv $(DESTDIR)$(bindir)/liquidwar6 $(DESTDIR)$(bindir)/@PACKAGE_TARNAME@-@PACKAGE_VERSION@; ln -s @PACKAGE_TARNAME@-@PACKAGE_VERSION@ $(DESTDIR)$(bindir)/liquidwar6; fi |
| 60 |
|
59 |
|
| 61 |
uninstall-local: |
60 |
uninstall-local: |
