=== modified file 'configure.ac'
--- configure.ac	2012-11-24 17:20:49 +0000
+++ configure.ac	2012-11-25 19:31:19 +0000
@@ -2741,6 +2741,7 @@
 AC_CHECK_HEADERS_ONCE(malloc/malloc.h)
 
 GNUSTEP_CFLAGS=
+GNUSTEP_LIBS=
 ### Use NeXTstep API to implement GUI.
 if test "${HAVE_NS}" = "yes"; then
   AC_DEFINE(HAVE_NS, 1, [Define to 1 if you are using the NeXTstep API, either GNUstep or Cocoa on Mac OS X.])
@@ -2754,12 +2755,15 @@
     GNUSTEP_CFLAGS="-D_REENTRANT -fPIC -fno-strict-aliasing -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
     ## Extra CFLAGS applied to src/*.m files.
     GNU_OBJC_CFLAGS="$GNU_OBJC_CFLAGS -fgnu-runtime -Wno-import -fconstant-string-class=NSConstantString -DGNUSTEP_BASE_LIBRARY=1 -DGNU_GUI_LIBRARY=1 -DGNU_RUNTIME=1 -DGSWARN -DGSDIAGNOSE"
+    GNUSTEP_LIBS="-lgnustep-gui -lgnustep-base -lobjc -lpthread"
   fi
   # We also have mouse menus.
   HAVE_MENUS=yes
   OTHER_FILES=ns-app
 fi
 
+AC_SUBST(GNUSTEP_LIBS)
+
 if test "${HAVE_W32}" = "yes"; then
   HAVE_MENUS=yes
 fi
@@ -4266,10 +4270,6 @@
   *) LD_SWITCH_SYSTEM_TEMACS= ;;
 esac
 
-if test "$NS_IMPL_GNUSTEP" = "yes"; then
-  LD_SWITCH_SYSTEM_TEMACS="${LD_SWITCH_SYSTEM_TEMACS} -L${GNUSTEP_SYSTEM_LIBRARIES} ${GNUSTEP_LOCAL_LIBRARIES} -lgnustep-gui -lgnustep-base -lobjc -lpthread"
-fi
-
 AC_SUBST(LD_SWITCH_SYSTEM_TEMACS)
 
 

=== modified file 'src/Makefile.in'
--- src/Makefile.in	2012-11-14 04:55:41 +0000
+++ src/Makefile.in	2012-11-25 19:38:27 +0000
@@ -76,6 +76,7 @@
 C_SWITCH_SYSTEM=@C_SWITCH_SYSTEM@
 
 GNUSTEP_CFLAGS=@GNUSTEP_CFLAGS@
+GNUSTEP_LIBS=@GNUSTEP_LIBS@
 
 ## Define C_SWITCH_X_SITE to contain any special flags your compiler
 ## may need to deal with X Windows.  For instance, if you've defined
@@ -398,6 +399,7 @@
    $(LIBXML2_LIBS) $(LIBGPM) $(LIBRESOLV) $(LIBS_SYSTEM) \
    $(LIBS_TERMCAP) $(GETLOADAVG_LIBS) $(SETTINGS_LIBS) $(LIBSELINUX_LIBS) \
    $(FREETYPE_LIBS) $(FONTCONFIG_LIBS) $(LIBOTF_LIBS) $(M17N_FLT_LIBS) \
+   $(GNUSTEP_LIBS) \
    $(LIBGNUTLS_LIBS) $(LIB_PTHREAD) $(LIB_PTHREAD_SIGMASK) \
    $(LIB_GCC) $(LIB_MATH) $(LIB_STANDARD) $(LIB_GCC)