1.1 --- a/configure	Sun Jun 28 09:22:43 2009 +0000
     1.2 +++ b/configure	Sun Jun 28 10:29:01 2009 +0000
     1.3 @@ -654,6 +654,7 @@
     1.4  MSGFMT
     1.5  USE_NLS
     1.6  GETTEXT_PACKAGE
     1.7 +LXDREAM_LIBS
     1.8  BUILD_ARMTEST_FALSE
     1.9  BUILD_ARMTEST_TRUE
    1.10  BUILD_SYSTEST_FALSE
    1.11 @@ -11821,6 +11822,9 @@
    1.12  CFLAGS="$CFLAGS $STDCFLAG"
    1.13  
    1.14  GETTEXT_PACKAGE=lxdream
    1.15 +LXDREAM_LIBS="$LIBS"
    1.16 +LIBS=""
    1.17 +
    1.18  
    1.19  
    1.20  cat >>confdefs.h <<_ACEOF

     2.1 --- a/configure.in	Sun Jun 28 09:22:43 2009 +0000
     2.2 +++ b/configure.in	Sun Jun 28 10:29:01 2009 +0000
     2.3 @@ -403,6 +403,9 @@
     2.4  
     2.5  dnl ----------------------- All done, finish up -----------------------
     2.6  GETTEXT_PACKAGE=lxdream
     2.7 +LXDREAM_LIBS="$LIBS"
     2.8 +LIBS=""
     2.9 +AC_SUBST(LXDREAM_LIBS)
    2.10  AC_SUBST(GETTEXT_PACKAGE)
    2.11  AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[translation domain])
    2.12  

     3.1 --- a/src/Makefile.am	Sun Jun 28 09:22:43 2009 +0000
     3.2 +++ b/src/Makefile.am	Sun Jun 28 10:29:01 2009 +0000
     3.3 @@ -38,7 +38,7 @@
     3.4  gendec_SOURCES = tools/gendec.c tools/gendec.h tools/insparse.c tools/actparse.c
     3.5  genglsl_SOURCES = tools/genglsl.c
     3.6  lxdream_LINK = $(LINK) @LXDREAMLDFLAGS@
     3.7 -lxdream_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ $(INTLLIBS)
     3.8 +lxdream_LDADD = @LXDREAM_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ $(INTLLIBS)
     3.9  lxdream_SOURCES = \
    3.10          main.c version.c config.c config.h lxdream.h dream.h gui.h cpu.h hook.h \
    3.11          gettext.h mem.c mem.h sdram.c mmio.h watch.c \

     4.1 --- a/src/Makefile.in	Sun Jun 28 09:22:43 2009 +0000
     4.2 +++ b/src/Makefile.in	Sun Jun 28 10:29:01 2009 +0000
     4.3 @@ -417,6 +417,7 @@
     4.4  LTLIBOBJS = @LTLIBOBJS@
     4.5  LXDREAMCPPFLAGS = @LXDREAMCPPFLAGS@
     4.6  LXDREAMLDFLAGS = @LXDREAMLDFLAGS@
     4.7 +LXDREAM_LIBS = @LXDREAM_LIBS@
     4.8  MAINT = @MAINT@
     4.9  MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
    4.10  MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
    4.11 @@ -536,8 +537,8 @@
    4.12  gendec_SOURCES = tools/gendec.c tools/gendec.h tools/insparse.c tools/actparse.c
    4.13  genglsl_SOURCES = tools/genglsl.c
    4.14  lxdream_LINK = $(LINK) @LXDREAMLDFLAGS@
    4.15 -lxdream_LDADD = @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ $(INTLLIBS) \
    4.16 -	$(am__append_18) $(am__append_20) $(am__append_22) \
    4.17 +lxdream_LDADD = @LXDREAM_LIBS@ @GLIB_LIBS@ @GTK_LIBS@ @LIBPNG_LIBS@ \
    4.18 +	$(INTLLIBS) $(am__append_18) $(am__append_20) $(am__append_22) \
    4.19  	$(am__append_24) $(am__append_26)
    4.20  lxdream_SOURCES = main.c version.c config.c config.h lxdream.h dream.h \
    4.21  	gui.h cpu.h hook.h gettext.h mem.c mem.h sdram.c mmio.h \