Re: Emacs with GNUstep

[A. Arias]

El sáb, 29-12-2012 a las 09:22 +0100, Andreas Schwab escribió:
> This should fix it.
> 
> Andreas.
> 
> diff --git a/configure.ac b/configure.ac
> index 429443c..2f1124d 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1475,8 +1475,8 @@ tmp_CPPFLAGS="$CPPFLAGS"
>  tmp_CFLAGS="$CFLAGS"
>  CPPFLAGS="$CPPFLAGS -x objective-c"
>  CFLAGS="$CFLAGS -x objective-c"
> -TEMACS_LDFLAGS2="\${LDFLAGS}"
>  GNU_OBJC_CFLAGS=
> +LIBS_GNUSTEP=
>  if test "${with_ns}" != no; then
>    if test "${opsys}" = darwin; then
>       NS_IMPL_COCOA=yes
> @@ -1503,9 +1503,9 @@ if test "${with_ns}" != no; then
>       CPPFLAGS="$CPPFLAGS -I${GNUSTEP_SYSTEM_HEADERS} 
> ${GNUSTEP_LOCAL_HEADERS}"
>       CFLAGS="$CFLAGS -I${GNUSTEP_SYSTEM_HEADERS} ${GNUSTEP_LOCAL_HEADERS}"
>       LDFLAGS="$LDFLAGS -L${GNUSTEP_SYSTEM_LIBRARIES} 
> ${GNUSTEP_LOCAL_LIBRARIES}"
> +     LIBS_GNUSTEP="-lgnustep-gui -lgnustep-base -lobjc -lpthread"
>       LIB_STANDARD=
>       START_FILES=
> -     TEMACS_LDFLAGS2=
>       dnl GNUstep defines BASE_NATIVE_OBJC_EXCEPTIONS to 0 or 1.
>       dnl If they had chosen to either define it or not, we could have
>       dnl just used AC_CHECK_DECL here.
> @@ -1556,7 +1556,7 @@ fail;
>    fi
>  fi
>  
> -AC_SUBST(TEMACS_LDFLAGS2)
> +AC_SUBST(LIBS_GNUSTEP)
>  
>  INSTALL_ARCH_INDEP_EXTRA=install-etc
>  ns_self_contained=no
> @@ -4287,10 +4287,6 @@ case "$opsys" in
>    *) 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)
>  
> 
> diff --git a/src/Makefile.in b/src/Makefile.in
> index 0e91eae..96b1d6d 100644
> --- a/src/Makefile.in
> +++ b/src/Makefile.in
> @@ -111,9 +111,6 @@ address@hidden@
>  ## Flags to pass to ld only for temacs.
>  TEMACS_LDFLAGS = $(LD_SWITCH_SYSTEM) $(LD_SWITCH_SYSTEM_TEMACS)
>  
> -## $LDFLAGS or empty if NS_IMPL_GNUSTEP (for some reason).
> -TEMACS_LDFLAGS2 = @TEMACS_LDFLAGS2@
> -
>  ## If available, the full path to the paxctl program.
>  ## On grsecurity/PaX systems, unexec will fail due to a gap between
>  ## the bss section and the heap.  This can be prevented by disabling
> @@ -230,6 +227,9 @@ address@hidden@
>  ## configure, which should set it to nil in non-X builds.
>  LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
>  
> +## Only used for GNUstep
> address@hidden@
> +
>  LIBSOUND= @LIBSOUND@
>  CFLAGS_SOUND= @CFLAGS_SOUND@
>  
> @@ -400,7 +400,7 @@ otherobj= $(TERMCAP_OBJ) $(PRE_ALLOC_OBJ) $(GMALLOC_OBJ) 
> $(RALLOC_OBJ) \
>  ## Note that SunOS needs -lm to come before -lc; otherwise, you get
>  ## duplicated symbols.  If the standard libraries were compiled
>  ## with GCC, we might need LIB_GCC again after them.
> -LIBES = $(LIBS) $(W32_LIBS) $(LIBX_BASE) $(LIBIMAGE) \
> +LIBES = $(LIBS) $(W32_LIBS) $(LIBS_GNUSTEP) $(LIBX_BASE) $(LIBIMAGE) \
>     $(LIBX_OTHER) $(LIBSOUND) \
>     $(RSVG_LIBS) $(IMAGEMAGICK_LIBS) $(LIB_CLOCK_GETTIME) \
>     $(LIB_EACCESS) $(LIB_TIMER_TIME) $(DBUS_LIBS) \
> @@ -475,7 +475,7 @@ $(lib)/libgnu.a: $(config_h)
>  
>  temacs$(EXEEXT): $(START_FILES) stamp-oldxmenu $(obj) $(otherobj) \
>                $(lib)/libgnu.a $(W32_RES)
> -     $(CC) $(LD_FIRSTFLAG) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) 
> $(TEMACS_LDFLAGS2) \
> +     $(CC) $(LD_FIRSTFLAG) $(ALL_CFLAGS) $(TEMACS_LDFLAGS) $(LDFLAGS) \
>         -o temacs $(START_FILES) $(obj) $(otherobj) $(lib)/libgnu.a $(LIBES) \
>         $(W32_RES_LINK)
>       test "$(CANNOT_DUMP)" = "yes" || \
> 

This solve the problem. Thanks.