--- raidem-0.3.1-src/configure.ac.syslibs 2006-04-08 10:48:00.000000000 +0200
+++ raidem-0.3.1-src/configure.ac 2006-04-29 15:01:51.000000000 +0200
@@ -53,7 +53,8 @@
AC_MSG_NOTICE([===== Using lib/adime =====]) &&
(cd lib/adime; sh fix.sh unix --quick) &&
AC_MSG_NOTICE([===== Configured adime =====]),
- AC_MSG_ERROR([cannot find adime])))
+ AC_MSG_ERROR([cannot find adime])),
+ [`$alcfg --libs`])
AC_HAVE_LIBRARY([glyph-alleg],
@@ -104,7 +105,7 @@
#----------------------------------------------------------------
# Optional
-if ! ${alrand}; then
+if [ "$alrand" != "true" ]; then
AC_SUBST(NO_ALRAND, 1)
fi
@@ -120,7 +121,7 @@
if ${ogg}; then
-AC_HAVE_LIBRARY([alogg],
+PKG_CHECK_MODULES(AllegroOGG, [AllegroOGG >= 1.0.0],
AC_SUBST(HAVE_ALLEGROOGG, 1),
AC_CHECK_FILE([lib/allegroogg/Makefile],
AC_MSG_NOTICE([===== Using lib/allegroogg =====]),
--- raidem-0.3.1-src/src/map-editor/map-proc.m.syslibs 2006-01-20 03:33:33.000000000 +0100
+++ raidem-0.3.1-src/src/map-editor/map-proc.m 2006-04-29 15:01:51.000000000 +0200
@@ -4,7 +4,7 @@
#include <allegro.h>
#include <assert.h>
#include <math.h>
-#include "adime/include/adime.h"
+#include <adime.h>
#include "common.h"
#include "group.h"
#include "gui/gui-clip.h"
--- raidem-0.3.1-src/Makefile.cfg.in.syslibs 2006-04-08 07:23:28.000000000 +0200
+++ raidem-0.3.1-src/Makefile.cfg.in 2006-04-29 15:01:51.000000000 +0200
@@ -8,6 +8,7 @@
INSTALL := install
alcfg := @alcfg@
ftcfg := @ftcfg@
+pkgcfg := @PKG_CONFIG@
# Install paths.
prefix := @prefix@
--- raidem-0.3.1-src/Makefile.syslibs 2006-04-08 06:54:03.000000000 +0200
+++ raidem-0.3.1-src/Makefile 2006-04-29 15:13:53.000000000 +0200
@@ -4,8 +4,8 @@
include Makefile.cfg
-CFLAGS += -W -Wall -Werror -Wno-deprecated-declarations \
- -fno-strict-aliasing \
+CFLAGS += -W -Wall -Wno-deprecated-declarations \
+ -fno-strict-aliasing \
-Iinclude -Ilib
#CFLAGS += -g3
--- raidem-0.3.1-src/misc/Makefile.all.syslibs 2006-04-08 09:12:44.000000000 +0200
+++ raidem-0.3.1-src/misc/Makefile.all 2006-04-29 15:01:51.000000000 +0200
@@ -30,7 +30,8 @@
CFLAGS += -DNO_OGG
else
ifdef HAVE_ALLEGROOGG
-LDLIBS += -lalogg
+LDLIBS += `$(pkgcfg) AllegroOGG --libs`
+CFLAGS += `$(pkgcfg) AllegroOGG --cflags`
else
CFLAGS += -Ilib/allegroogg/include
endif # HAVE_ALLEGROOGG
@@ -56,11 +57,14 @@
# Glyph-Keeper
ifdef HAVE_GLYPH_KEEPER
LDLIBS += -lglyph-alleg
+CFLAGS += -DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO
else
CFLAGS += -DGLYPH_TARGET=GLYPH_TARGET_ALLEGRO -Ilib/glyph-keeper/include
endif # HAVE_GLYPH_KEEPER
-ifndef HAVE_FREETYPE
+ifdef HAVE_FREETYPE
+LDLIBS += `$(ftcfg) --libs`
+else
CFLAGS += -Ilib/freetype/include
endif