qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-18 06:51:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

this /should/ fix CoolMoDee's autoconf 2.53 issues

Browse source
This commit is contained in:
Bill Currie 2002-04-29 19:19:26 +00:00
parent a1fef28b60
commit 08f12355c5
5 changed files with 39 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
configure.ac
View file

@ -1383,17 +1383,21 @@ fi
AS="$CC" AS="$CC"
if test "x$SYSTYPE" = "xWIN32"; then if test "x$SYSTYPE" = "xWIN32"; then
ASFLAGS="\$(DEFS) \$(CFLAGS) \$(CPPFLAGS) \$(DEFAULT_INCLUDES) \$(INCLUDES) -DWIN32" ASFLAGS="\$(DEFS) \$(CFLAGS) \$(CPPFLAGS) \$(DEFAULT_INCLUDES) \$(INCLUDES) -DWIN32"
plugin_LDFLAGS="-no-undefined" plugin_ldflags="-no-undefined"
plugin_LIBADD="-luser32 -lgdi32 -lwinmm" plugin_libadd="-luser32 -lgdi32 -lwinmm"
else else
ASFLAGS="\$(DEFS) \$(CFLAGS) \$(CPPFLAGS) \$(DEFAULT_INCLUDES) \$(INCLUDES)" ASFLAGS="\$(DEFS) \$(CFLAGS) \$(CPPFLAGS) \$(DEFAULT_INCLUDES) \$(INCLUDES)"
plugin_LDFLAGS= plugin_ldflags=
plugin_LIBADD= plugin_libadd=
fi fi
CCASFLAGS="$ASFLAGS"
CCAS="$AS"
AC_SUBST(AS) AC_SUBST(AS)
AC_SUBST(ASFLAGS) AC_SUBST(ASFLAGS)
AC_SUBST(plugin_LDFLAGS) AC_SUBST(CCAS)
AC_SUBST(plugin_LIBADD) AC_SUBST(CCASFLAGS)
AC_SUBST(plugin_ldflags)
AC_SUBST(plugin_libadd)
dnl ================================================================== dnl ==================================================================
dnl Make sure we link against a working zlib dnl Make sure we link against a working zlib

14
libs/audio/cd/Makefile.am
View file

@ -4,6 +4,8 @@ INCLUDES= -I$(top_srcdir)/include $(SDL_CFLAGS) $(XMMS_CFLAGS)
SDL_LIBS= @SDL_LIBS@ SDL_LIBS= @SDL_LIBS@
XMMS_LIBS= @XMMS_LIBS@ XMMS_LIBS= @XMMS_LIBS@
PLUGIN_RPATH= @PLUGIN_RPATH@ PLUGIN_RPATH= @PLUGIN_RPATH@
plugin_ldflags= @plugin_ldflags@
plugin_libadd= @plugin_libadd@
plugin_LTLIBRARIES= @CD_PLUGIN_TARGETS@ plugin_LTLIBRARIES= @CD_PLUGIN_TARGETS@
noinst_LTLIBRARIES= @CD_PLUGIN_STATIC@ noinst_LTLIBRARIES= @CD_PLUGIN_STATIC@
@ -16,18 +18,18 @@ libcd_xmms_la_LDFLAGS= -version-info 1:0:0 $(PLUGIN_RPATH)
libcd_xmms_la_LIBADD= $(XMMS_LIBS) libcd_xmms_la_LIBADD= $(XMMS_LIBS)
libcd_xmms_la_SOURCES= cd_xmms.c libcd_xmms_la_SOURCES= cd_xmms.c
libcd_sdl_la_LDFLAGS= $(plugin_LDFLAGS) -version-info 1:0:0 $(PLUGIN_RPATH) libcd_sdl_la_LDFLAGS= $(plugin_ldflags) -version-info 1:0:0 $(PLUGIN_RPATH)
libcd_sdl_la_LIBADD= $(SDL_LIBS) $(plugin_LIBADD) libcd_sdl_la_LIBADD= $(SDL_LIBS) $(plugin_libadd)
libcd_sdl_la_SOURCES= cd_sdl.c libcd_sdl_la_SOURCES= cd_sdl.c
libcd_sgi_la_LDFLAGS= -version-info 1:0:0 $(PLUGIN_RPATH) libcd_sgi_la_LDFLAGS= -version-info 1:0:0 $(PLUGIN_RPATH)
libcd_sgi_la_LIBADD= $(SGI_CD_LIBS) libcd_sgi_la_LIBADD= $(SGI_CD_LIBS)
libcd_sgi_la_SOURCES= cd_sgi.c libcd_sgi_la_SOURCES= cd_sgi.c
libcd_win_la_LDFLAGS= $(plugin_LDFLAGS) -version-info 1:0:0 $(PLUGIN_RPATH) libcd_win_la_LDFLAGS= $(plugin_ldflags) -version-info 1:0:0 $(PLUGIN_RPATH)
libcd_win_la_LIBADD= $(plugin_LIBADD) libcd_win_la_LIBADD= $(plugin_libadd)
libcd_win_la_SOURCES= cd_win.c libcd_win_la_SOURCES= cd_win.c
libcd_null_la_LDFLAGS= $(plugin_LDFLAGS) -version-info 1:0:0 $(PLUGIN_RPATH) libcd_null_la_LDFLAGS= $(plugin_ldflags) -version-info 1:0:0 $(PLUGIN_RPATH)
libcd_null_la_LIBADD= $(plugin_LIBADD) libcd_null_la_LIBADD= $(plugin_libadd)
libcd_null_la_SOURCES= cd_null.c libcd_null_la_SOURCES= cd_null.c

2
libs/audio/renderer/Makefile.am
View file

@ -2,6 +2,8 @@ AUTOMAKE_OPTIONS= foreign
INCLUDES= -I$(top_srcdir)/include INCLUDES= -I$(top_srcdir)/include
PLUGIN_RPATH= @PLUGIN_RPATH@ PLUGIN_RPATH= @PLUGIN_RPATH@
plugin_ldflags= @plugin_ldflags@
plugin_libadd= @plugin_libadd@
plugin_LTLIBRARIES= @SND_REND_TARGETS@ plugin_LTLIBRARIES= @SND_REND_TARGETS@
EXTRA_LTLIBRARIES= libsnd_render_default.la EXTRA_LTLIBRARIES= libsnd_render_default.la

18
libs/audio/targets/Makefile.am
View file

@ -3,6 +3,8 @@ AUTOMAKE_OPTIONS= foreign
INCLUDES= -I$(top_srcdir)/include $(ALSA_CFLAGS) $(MME_CFLAGS) $(OSS_CFLAGS) $(SGISND_CFLAGS) $(SUNSND_CFLAGS) $(WIN32SND_CFLAGS) $(SDL_CFLAGS) INCLUDES= -I$(top_srcdir)/include $(ALSA_CFLAGS) $(MME_CFLAGS) $(OSS_CFLAGS) $(SGISND_CFLAGS) $(SUNSND_CFLAGS) $(WIN32SND_CFLAGS) $(SDL_CFLAGS)
SDL_LIBS = @SDL_LIBS@ SDL_LIBS = @SDL_LIBS@
PLUGIN_RPATH= @PLUGIN_RPATH@ PLUGIN_RPATH= @PLUGIN_RPATH@
plugin_ldflags= @plugin_ldflags@
plugin_libadd= @plugin_libadd@
plugin_LTLIBRARIES= @SND_PLUGIN_TARGETS@ plugin_LTLIBRARIES= @SND_PLUGIN_TARGETS@
noinst_LTLIBRARIES= @SND_PLUGIN_STATIC@ noinst_LTLIBRARIES= @SND_PLUGIN_STATIC@
@ -11,8 +13,8 @@ EXTRA_LTLIBRARIES= \
libsnd_output_oss.la libsnd_output_sgi.la libsnd_output_sun.la \ libsnd_output_oss.la libsnd_output_sgi.la libsnd_output_sun.la \
libsnd_output_win.la libsnd_output_null.la libsnd_output_disk.la libsnd_output_win.la libsnd_output_null.la libsnd_output_disk.la
libsnd_output_sdl_la_LDFLAGS= $(plugin_LDFLAGS) -version-info 1:0:0 $(PLUGIN_RPATH) libsnd_output_sdl_la_LDFLAGS= $(plugin_ldflags) -version-info 1:0:0 $(PLUGIN_RPATH)
libsnd_output_sdl_la_LIBADD= $(SDL_LIBS) $(plugin_LIBADD) libsnd_output_sdl_la_LIBADD= $(SDL_LIBS) $(plugin_libadd)
libsnd_output_sdl_la_SOURCES= snd_sdl.c libsnd_output_sdl_la_SOURCES= snd_sdl.c
libsnd_output_alsa0_5_la_LDFLAGS= -version-info 1:0:0 $(PLUGIN_RPATH) libsnd_output_alsa0_5_la_LDFLAGS= -version-info 1:0:0 $(PLUGIN_RPATH)
@ -34,14 +36,14 @@ libsnd_output_sgi_la_SOURCES= snd_sgi.c
libsnd_output_sun_la_LDFLAGS= -version-info 1:0:0 $(PLUGIN_RPATH) libsnd_output_sun_la_LDFLAGS= -version-info 1:0:0 $(PLUGIN_RPATH)
libsnd_output_sun_la_SOURCES= snd_sun.c libsnd_output_sun_la_SOURCES= snd_sun.c
libsnd_output_win_la_LDFLAGS= $(plugin_LDFLAGS) -version-info 1:0:0 $(PLUGIN_RPATH) libsnd_output_win_la_LDFLAGS= $(plugin_ldflags) -version-info 1:0:0 $(PLUGIN_RPATH)
libsnd_output_win_la_LIBADD= $(WINSND_LIBS) $(plugin_LIBADD) libsnd_output_win_la_LIBADD= $(WINSND_LIBS) $(plugin_libadd)
libsnd_output_win_la_SOURCES= snd_win.c libsnd_output_win_la_SOURCES= snd_win.c
libsnd_output_disk_la_LDFLAGS= $(plugin_LDFLAGS) -version-info 1:0:0 $(PLUGIN_RPATH) libsnd_output_disk_la_LDFLAGS= $(plugin_ldflags) -version-info 1:0:0 $(PLUGIN_RPATH)
libsnd_output_disk_la_LIBADD= $(plugin_LIBADD) libsnd_output_disk_la_LIBADD= $(plugin_libadd)
libsnd_output_disk_la_SOURCES= snd_disk.c libsnd_output_disk_la_SOURCES= snd_disk.c
libsnd_output_null_la_LDFLAGS= $(plugin_LDFLAGS) -version-info 1:0:0 $(PLUGIN_RPATH) libsnd_output_null_la_LDFLAGS= $(plugin_ldflags) -version-info 1:0:0 $(PLUGIN_RPATH)
libsnd_output_null_la_LIBADD= $(plugin_LIBADD) libsnd_output_null_la_LIBADD= $(plugin_libadd)
libsnd_output_null_la_SOURCES= snd_null.c libsnd_output_null_la_SOURCES= snd_null.c

15
libs/console/Makefile.am
View file

@ -1,6 +1,9 @@
AUTOMAKE_OPTIONS= foreign AUTOMAKE_OPTIONS= foreign
INCLUDES= -I$(top_srcdir)/include INCLUDES= -I$(top_srcdir)/include
PLUGIN_RPATH= @PLUGIN_RPATH@
plugin_ldflags= @plugin_ldflags@
plugin_libadd= @plugin_libadd@
lib_LTLIBRARIES= libQFconsole.la lib_LTLIBRARIES= libQFconsole.la
plugin_LTLIBRARIES= @SERVER_PLUGIN_TARGETS@ @CLIENT_PLUGIN_TARGETS@ plugin_LTLIBRARIES= @SERVER_PLUGIN_TARGETS@ @CLIENT_PLUGIN_TARGETS@
@ -11,14 +14,14 @@ common_sources= buffer.c complete.c console.c inputline.c list.c filelist.c
client_sources= client.c menu.c client_sources= client.c menu.c
server_sources= server.c server_sources= server.c
libQFconsole_la_LDFLAGS= $(plugin_LDFLAGS) -version-info 1:0:0 libQFconsole_la_LDFLAGS= $(plugin_ldflags) -version-info 1:0:0
libQFconsole_la_LIBADD= $(plugin_LIBADD) libQFconsole_la_LIBADD= $(plugin_libadd)
libQFconsole_la_SOURCES= $(common_sources) libQFconsole_la_SOURCES= $(common_sources)
libconsole_client_la_LDFLAGS= $(plugin_LDFLAGS) -version-info 1:0:0 $(PLUGIN_RPATH) libconsole_client_la_LDFLAGS= $(plugin_ldflags) -version-info 1:0:0 $(PLUGIN_RPATH)
libconsole_client_la_LIBADD= $(plugin_LIBADD) libconsole_client_la_LIBADD= $(plugin_libadd)
libconsole_client_la_SOURCES= $(client_sources) libconsole_client_la_SOURCES= $(client_sources)
libconsole_server_la_LDFLAGS= $(plugin_LDFLAGS) -version-info 1:0:0 $(PLUGIN_RPATH) libconsole_server_la_LDFLAGS= $(plugin_ldflags) -version-info 1:0:0 $(PLUGIN_RPATH)
libconsole_server_la_LIBADD= $(CURSES_LIBS) $(plugin_LIBADD) libconsole_server_la_LIBADD= $(CURSES_LIBS) $(plugin_libadd)
libconsole_server_la_SOURCES= $(server_sources) libconsole_server_la_SOURCES= $(server_sources)