rpms/raidem/devel raidem-0.3.1-syslibs.patch,NONE,1.1

[Hans de Goede (jwrdegoede)]

Author: jwrdegoede

Update of /cvs/extras/rpms/raidem/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv1650

Added Files:
	raidem-0.3.1-syslibs.patch 
Log Message:
raidem-0.3.1 WIP

raidem-0.3.1-syslibs.patch:

--- NEW FILE raidem-0.3.1-syslibs.patch ---
diff -ur raidem-0.3.1-src.orig/Makefile raidem-0.3.1-src/Makefile
--- raidem-0.3.1-src.orig/Makefile	2006-04-08 06:54:03.000000000 +0200
+++ raidem-0.3.1-src/Makefile	2006-04-09 20:46:18.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
 
diff -ur raidem-0.3.1-src.orig/configure.ac raidem-0.3.1-src/configure.ac
--- raidem-0.3.1-src.orig/configure.ac	2006-04-08 10:48:00.000000000 +0200
+++ raidem-0.3.1-src/configure.ac	2006-04-11 22:06:03.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
 
@@ -124,7 +125,8 @@
                 AC_SUBST(HAVE_ALLEGROOGG, 1),
                 AC_CHECK_FILE([lib/allegroogg/Makefile],
                               AC_MSG_NOTICE([===== Using lib/allegroogg =====]),
-                              AC_SUBST(NO_OGG, 1)))
+                              AC_SUBST(NO_OGG, 1)),
+                [`$alcfg --libs`])
 else
 AC_SUBST(NO_OGG, 1)
 fi
diff -ur raidem-0.3.1-src.orig/misc/Makefile.all raidem-0.3.1-src/misc/Makefile.all
--- raidem-0.3.1-src.orig/misc/Makefile.all	2006-04-08 09:12:44.000000000 +0200
+++ raidem-0.3.1-src/misc/Makefile.all	2006-04-09 21:06:03.000000000 +0200
@@ -56,11 +56,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
 
diff -ur raidem-0.3.1-src.orig/src/map-editor/map-proc.m raidem-0.3.1-src/src/map-editor/map-proc.m
--- raidem-0.3.1-src.orig/src/map-editor/map-proc.m	2006-01-20 03:33:33.000000000 +0100
+++ raidem-0.3.1-src/src/map-editor/map-proc.m	2006-04-09 20:47:00.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"