mantarimay/Aegisub
1
0
Fork 0
forked from mia/Aegisub
Code Pull requests Activity

* Add DEBUG_FLAGS / PROFILE_FLAGS to LDFLAGS for aegisub binary linking.

Browse source 
* Move assigned variables used by AC_SUBST below AC_INIT(), they won't work
  otherwise.

Originally committed to SVN as r2718.
This commit is contained in:
Amar Takhar 2009-01-29 21:32:39 +00:00
parent 287639df1e
commit 9c6780a33e
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
aegisub/Makefile.am
View file

@ -15,7 +15,7 @@ AM_CXXFLAGS = -DAEGISUB -Iinclude @WX_CPPFLAGS@ @OPENMP_CXXFLAGS@ @LIBAVFORMAT_C
bin_PROGRAMS = aegisub-2.1 bin_PROGRAMS = aegisub-2.1
aegisub_2_1_LDADD = libresrc/libresrc.a $(libosxutil_lib) aegisub_2_1_LDADD = libresrc/libresrc.a $(libosxutil_lib)
aegisub_2_1_CPPFLAGS = @FREETYPE_CFLAGS@ aegisub_2_1_CPPFLAGS = @FREETYPE_CFLAGS@
aegisub_2_1_LDFLAGS = @GL_LIBS@ @PTHREAD_LIBS@ @WX_LIBS@ @ICONV_LDFLAGS@ $(libosxutil_ldflags) aegisub_2_1_LDFLAGS = @DEBUG_FLAGS@ @PROFILE_FLAGS@ @GL_LIBS@ @PTHREAD_LIBS@ @WX_LIBS@ @ICONV_LDFLAGS@ $(libosxutil_ldflags)
LIBS += @FREETYPE_LIBS@ @FONTCONFIG_LIBS@ LIBS += @FREETYPE_LIBS@ @FONTCONFIG_LIBS@
if BUILD_DARWIN if BUILD_DARWIN

13
configure.in
View file

@ -8,10 +8,6 @@ m4_define([aegisub_version_minor], [1])
m4_define([aegisub_version_revision], [6]) m4_define([aegisub_version_revision], [6])
m4_define([aegisub_version], [aegisub_version_major.aegisub_version_minor.aegisub_version_revision-dev]) m4_define([aegisub_version], [aegisub_version_major.aegisub_version_minor.aegisub_version_revision-dev])
m4_define([aegisub_version_data], [aegisub_version_major.aegisub_version_minor]) m4_define([aegisub_version_data], [aegisub_version_major.aegisub_version_minor])
AEGISUB_VERSION_MAJOR=aegisub_version_major
AEGISUB_VERSION_MINOR=aegisub_version_minor
AEGISUB_VERSION=aegisub_version
AEGISUB_VERSION_DATA=aegisub_version_data
################### ###################
@ -93,6 +89,12 @@ AC_C_BIGENDIAN(
# Configurable variables # Configurable variables
######################## ########################
# These cannot be set before AC_INIT()
AEGISUB_VERSION_MAJOR=aegisub_version_major
AEGISUB_VERSION_MINOR=aegisub_version_minor
AEGISUB_VERSION=aegisub_version
AEGISUB_VERSION_DATA=aegisub_version_data
# Suffix used for data paths. # Suffix used for data paths.
AC_DEFINE_UNQUOTED(AEGISUB_VERSION_DATA, ["$AEGISUB_VERSION_DATA"], [Data path suffix.]) AC_DEFINE_UNQUOTED(AEGISUB_VERSION_DATA, ["$AEGISUB_VERSION_DATA"], [Data path suffix.])
AC_SUBST(AEGISUB_VERSION_DATA) AC_SUBST(AEGISUB_VERSION_DATA)
@ -1036,6 +1038,7 @@ if test "$enable_debug" = "yes"; then
AC_MSG_RESULT([yes ($DEBUG_FLAGS)]) AC_MSG_RESULT([yes ($DEBUG_FLAGS)])
CPPFLAGS="$DEBUG_FLAGS $CPPFLAGS" CPPFLAGS="$DEBUG_FLAGS $CPPFLAGS"
msg_debug="($DEBUG_FLAGS)" msg_debug="($DEBUG_FLAGS)"
AC_SUBST(DEBUG_FLAGS)
else else
enable_debug="no" enable_debug="no"
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
@ -1056,13 +1059,13 @@ AC_ARG_ENABLE(profile, [ --enable-profile turn on profiling (default=no)
if test "$enable_profile" = "yes"; then if test "$enable_profile" = "yes"; then
AC_MSG_RESULT([yes ($PROFILE_FLAGS)]) AC_MSG_RESULT([yes ($PROFILE_FLAGS)])
CPPFLAGS="$PROFILE_FLAGS $CPPFLAGS" CPPFLAGS="$PROFILE_FLAGS $CPPFLAGS"
AC_SUBST(PROFILE_FLAGS)
else else
enable_profile="no" enable_profile="no"
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
############################## ##############################
# Internationalisation support # Internationalisation support
############################## ##############################