5 files changed, 8 insertions, 12 deletions

diff --git a/apps/Makefile b/apps/Makefile
index 5913faf3bf..07b093eb40 100644
--- a/apps/Makefile
+++ b/apps/Makefile
@@ -41,9 +41,6 @@ ifeq ($(TARGET),-DARCHOS_RECORDER)
    SRC += $(wildcard recorder/*.c)
    CFLAGS += -Irecorder
    OUTNAME = ajbrec.ajz
-ifneq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(CFLAGS)))
-   CFLAGS += -DLCD_PROPFONTS
-endif
 else
    OUTNAME = archos.mod
 endif
diff --git a/firmware/Makefile b/firmware/Makefile
index 252b1ea70b..24f5b46614 100644
--- a/firmware/Makefile
+++ b/firmware/Makefile
@@ -41,10 +41,6 @@ OUTPUT = $(OBJDIR)/librockbox.a
 
 ifeq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(CFLAGS)))
         EXTRA_TARGETS = $(OBJDIR)/system.ajf
-else
-ifeq ($(TARGET),-DARCHOS_RECORDER)
-        CFLAGS += -DLCD_PROPFONTS
-endif
 endif
 
 all: $(OUTPUT) $(EXTRA_TARGETS)
diff --git a/tools/configure b/tools/configure
index cc13e94268..d57723eff9 100755
--- a/tools/configure
+++ b/tools/configure
@@ -190,7 +190,15 @@ if [ "-" = "$extra_defines" ]; then
      extra_defines="-DLOADABLE_FONTS"
      echo "*** Remember to copy the 'system.ajf' file to the root of your Archos!"
   else
+   echo "Proportional font support? (N)"
+ 
+   getit=`input`;
+ 
+   if [ "y" = "$getit" -o "Y" = "$getit"  ] ; then
+     extra_defines="-DLCD_PROPFONTS"
+   else
      extra_defines=""
+   fi
   fi
  else
     extra_defines=""
diff --git a/uisimulator/win32/Makefile b/uisimulator/win32/Makefile
index a45a4a6be6..92fdf2184b 100644
--- a/uisimulator/win32/Makefile
+++ b/uisimulator/win32/Makefile
@@ -62,7 +62,6 @@ APPS = main.c tree.c menu.c credits.c main_menu.c\
 MENUS = games_menu.c screensavers_menu.c settings_menu.c sound_menu.c
 
 ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
-   DEFINES += -DLCD_PROPFONTS
    APPS += tetris.c sokoban.c blank.c bounce.c boxes.c icons.c bmp.c \
         widgets.c wormlet.c
 endif
diff --git a/uisimulator/x11/Makefile b/uisimulator/x11/Makefile
index f5856aa65b..6b778f4212 100644
--- a/uisimulator/x11/Makefile
+++ b/uisimulator/x11/Makefile
@@ -75,10 +75,6 @@ ifeq (LOADABLE_FONTS,$(findstring LOADABLE_FONTS, $(DEFINES)))
         FIRMSRCS += unicode.c ajf.c panic.c
         EXTRA_TARGETS = $(OBJDIR)/archos/system.ajf
         SYSTEM_FONT = $(FIRMWAREDIR)/fonts/alt6x10.bdf
-else
-ifeq ($(DISPLAY),-DHAVE_LCD_BITMAP)
-   DEFINES += -DLCD_PROPFONTS
-endif
 endif
 
 APPS = main.c tree.c menu.c credits.c main_menu.c\