From 2ab22bdad1415813a3e1df329640332702272fc0 Mon Sep 17 00:00:00 2001 From: tobigun Date: Mon, 1 Sep 2008 17:01:58 +0000 Subject: - new configure/make layout: - configure/main-makefile moved to root-dir - configure-script checked in (no need to call autogen.sh on first run) - autogen.sh, m4, install.sh etc. moved to dists/autogen/ - config.guess/sub for canonical builds - unit-tests moved to test - removed delphi subdir in portaudio/-mixer - COPYING.txt/AUTHORS.txt/... added - dists/delphi7/2005 added git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1334 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 454 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 454 insertions(+) create mode 100644 configure.ac (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac new file mode 100644 index 00000000..a04d5a68 --- /dev/null +++ b/configure.ac @@ -0,0 +1,454 @@ +# +# ultrastardx configure.ac script +# +# by UltraStar Deluxe Team +# +# Execute "autogen.sh" to create the configure script. +# + +# Require autoconf >= 2.61 +AC_PREREQ(2.61) + +# Init autoconf +AC_INIT([ultrastardx], + [1.1-alpha], + [http://sourceforge.net/tracker/?group_id=191560&atid=937872]) +# specify the website here +PACKAGE_WEBSITE="http://www.ultrastardeluxe.org/" +AC_SUBST(PACKAGE_WEBSITE) +# specify the IRC-channel here +PACKAGE_IRC="#ultrastardx at quakenet.org" +AC_SUBST(PACKAGE_IRC) + +# Specify a source-file so autoconf can check if the source-dir exists +AC_CONFIG_SRCDIR(src/ultrastardx.dpr) + +# Set the path to install-sh +AC_CONFIG_AUX_DIR(dists/autogen) + +# show features and packages in one list +AC_PRESERVE_HELP_ORDER + +# set sharerootdir to the resolved dataroot-dir for the config-*.inc file. +# Pascal cannot handle shell-variables like ${prefix} +AC_DEFINE_DIR(sharerootdir, datarootdir) + +# ----------------------------------------- +# find tools +# ----------------------------------------- + +# options for make command +AC_PROG_MAKE_SET +# find tool for ln -s (e.g. uses cp -p for FAT-filesystems) +AC_LN_S +# find a program for recursive dir creation +AC_PROG_MKDIR_P +# find the best install tool +AC_PROG_INSTALL +# some other useful tools +#AC_PROG_AWK +AC_PROG_SED +AC_PROG_GREP +#AC_PROG_EGREP + +# ----------------------------------------- +# macro declarations +# ----------------------------------------- + +# AC_TRIM(STRING) +# removes surrounding whitespace +# ------------------------------------------- +AC_DEFUN([AC_TRIM], +[echo "[$1]" | $SED 's/^[[ \t]]*//' | $SED 's/[[ \t]]*$//' +]) + +# AC_SUBST_DEFINE(DEFINE_SUFFIX, IS_DEFINED) +# used to enable/disable pascal defines +AC_DEFUN([AC_SUBST_DEFINE], +[ + if [[ x$2 = xyes ]]; then + DEFINE_[$1]=DEFINE + else + DEFINE_[$1]=UNDEF + fi + AC_SUBST(DEFINE_[$1]) +]) + +# AC_SPLIT_VERSION(VARIABLE_PREFIX, VERSION) +# Splits version number ("major.minor.release") into its components. +# Sets +# [$VARIABLE_PREFIX]_VERSION_MAJOR +# [$VARIABLE_PREFIX]_VERSION_MINOR +# [$VARIABLE_PREFIX]_VERSION_RELEASE +# This function calls +# AC_SUBST([$VARIABLE_PREFIX]_VERSION_type] for each type +AC_DEFUN([AC_SPLIT_VERSION], +[ + version=[$2] + + # strip leading non-numeric tokens + # (necessary for some ffmpeg-packages in ubuntu) + # example: 0d.51.1.0 -> 51.1.0 + version=`echo $version | $SED 's/^[[^.]]*[[^0-9.]][[^.]]*\.//'` + + # replace "." and "-" with " " and ignore trailing tokens. + # 1.23.4-r2 will be splitted to [maj=1, min=23, rel=4]. + # In addition we delete every character which is not 0-9. + # 1.3a4-r32 will be [maj=1, min=34, rel=32]. + read major minor release ignore <@) + else + [$1][_VERSION]="0.0.0" + fi + AC_SPLIT_VERSION([$1], $[$1][_VERSION]) +]) + +# PKG_HAVE(VARIABLE_PREFIX, MODULE, [REQUIRED]) +# Checks with pkg-config if a package exists and retrieves information +# about it. +# Parameters: +# - VARIABLE_PREFIX: the prefix for the variables storing information about the package. +# - MODULE: package name according to pkg-config +# - REQUIRED: if true, the configure-script is aborted if the package was not found +# Uses: +# with_[$VARIABLE_PREFIX]: whether and how the package should be checked for +# "check": check for the package but do not abort if it does not exist (default) +# "no": do not check for the package (sets _HAVE to "no" and _VERSION to "0.0.0") +# "yes": check for the package and abort if it does not exist +# "nocheck": do not check for the package (sets _HAVE to "yes") +# Sets: +# [$VARIABLE_PREFIX]_HAVE # package is available (values: "yes"|"no") +# [$VARIABLE_PREFIX]_LIBS # linker flags (e.g. -Lmylibdir -lmylib) +# [$VARIABLE_PREFIX]_LIBDIRS # library dirs (e.g. -Lmylibdir) +AC_DEFUN([PKG_HAVE], +[ + have_lib="no" + AC_MSG_CHECKING([for $2]) + if test x"$with_[$1]" = xnocheck; then + # do not call pkg-config, use user settings + have_lib="yes" + elif test x"$with_[$1]" != xno; then + # check if package exists + PKG_CHECK_EXISTS([$2], [ + have_lib="yes" + [$1][_LIBS]=`$PKG_CONFIG --libs --silence-errors "$2"` + [$1][_LIBDIRS]=`$PKG_CONFIG --libs-only-L --silence-errors "$2"` + [$1][_LIBDIRS]=`AC_TRIM($[$1][_LIBDIRS])` + # add library directories to LIBS (ignore *_LIBS for now) + if test -n "$[$1][_LIBDIRS]"; then + LIBS="$LIBS $[$1][_LIBDIRS]" + fi + ]) + fi + if test x$have_lib = xyes; then + [$1][_HAVE]="yes" + if test -n "$[$1][_LIBDIRS]"; then + # show additional lib-dirs + AC_MSG_RESULT(yes [(]$[$1][_LIBDIRS][)]) + else + AC_MSG_RESULT(yes) + fi + else + [$1][_HAVE]="no" + AC_MSG_RESULT(no) + + # check if package is required + if test x$3 = xyes -o x"$with_[$1]" = xyes ; then + # print error message and quit + err_msg=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` + AC_MSG_ERROR( +[ + +$err_msg + +Alternatively, you may set --with-[$1]=nocheck and the environment +variables [$1]_[[...]] (see configure --help) +to appropriate values to avoid the need to call pkg-config. + +See the pkg-config man page for more details. +]) + fi + fi +]) + + +# ----------------------------------------- +# define switches +# ----------------------------------------- + +# print library options header +AC_ARG_WITH([cfg-dummy1], [ +External Libraries:]) + +# add portmixer option +AC_ARG_WITH([portmixer], + [AS_HELP_STRING([--with-portmixer], + [enable portmixer audio-mixer support @<:@default=check@:>@])], + [with_portmixer=$withval], [with_portmixer="check"]) + +# add projectM option +AC_ARG_WITH([libprojectM], + [AS_HELP_STRING([--with-libprojectM], + [enable projectM visualization support @<:@default=no@:>@])], + [with_libprojectM=$withval], [with_libprojectM="no"]) + +# print misc options header +AC_ARG_WITH([cfg-dummy2], [ +Development options:]) + +LOCAL_BUILD="no" + +# add global option +AC_ARG_ENABLE(global, + [AS_HELP_STRING([--enable-global], + [install into global folders (PREFIX/...) @<:@default=yes@:>@])], + [test $enableval = "no" && LOCAL_BUILD="yes"], []) + +# add local option +AC_ARG_ENABLE(local, + [AS_HELP_STRING([--enable-local], + [install into local folders (./game/...) (same as --disable-global) @<:@default=no@:>@]))], + [test $enableval = "yes" && LOCAL_BUILD="yes"], []) + +# set default Makefile install-target according to local/global build-type +AC_SUBST_DEFINE(USE_LOCAL_DIRS, $LOCAL_BUILD) +if [[ x$LOCAL_BUILD = xyes ]]; then + AC_SUBST(install_type, ["local"]) +else + AC_SUBST(install_type, ["global"]) +fi + + +# ----------------------------------------- +# check for compilers +# ----------------------------------------- + +AC_CANONICAL_TARGET + +# find and test the freepascal compiler +# sets PFLAGS, FPC_VERSION, FPC_DEBUG, etc. +AC_PROG_FPC +# FPC_VERSION is already defined by FPC, use +# PPC as prefix instead. +AC_SPLIT_VERSION(PPC, $FPC_VERSION) + +# find and test the C compiler (for C-libs and wrappers) +AC_PROG_CC +AC_LANG([C]) + +# find and test the C++ compiler (for C-libs and wrappers) +AC_PROG_CXX +AC_LANG([C++]) + +AC_PROG_RANLIB + +# find pkg-config +PKG_PROG_PKG_CONFIG() +if [[ x$PKG_CONFIG = x ]]; then + AC_MSG_ERROR([ +!!! pkg-config was not found on your system. +!!! It is needed to determine the versions of your libraries. +!!! Install it and try again.]) +fi + + +# ----------------------------------------- +# check for OS +# ----------------------------------------- + +if [[ x$FPC_PLATFORM = xdarwin ]]; then + AC_MSG_CHECKING([for Mac OS X version]) + MACOSX_VERSION=`sw_vers -productVersion` + AC_SPLIT_VERSION(MACOSX, $MACOSX_VERSION) + AC_MSG_RESULT(@<:@$MACOSX_VERSION@:>@) +fi + +# ----------------------------------------- +# check for libraries +# ----------------------------------------- + +# libpng +PKG_HAVE([libpng], [libpng], yes) + +# find sdl +PKG_HAVE([sdl], [sdl], yes) + +# find sqlite3 +PKG_HAVE([sqlite3], [sqlite3], yes) + +# find FFMpeg +# Note: do not use the min/max version parameters with ffmpeg +# otherwise it might fail in ubuntu due to a wrong version number +# format in ffmpeg's .pc-files. +# For example: 0d.51.1.2 instead of the correct 51.1.2. +# A check for version >=52.0.0 will return version 0d.51.1.2 +# although it is lower because pkg-config is confused by the 0d. +# Use [mylib]_VERSION_INT for version-checking instead +PKG_HAVE([libavcodec], [libavcodec], yes) +PKG_VERSION([libavcodec], [libavcodec]) +AC_CHECK_LIB([avcodec], [avcodec_decode_audio], [HAVE_AVCODEC_DECODE_AUDIO="yes"]) +AC_CHECK_LIB([avcodec], [avcodec_decode_audio2], [HAVE_AVCODEC_DECODE_AUDIO2="yes"]) +AC_CHECK_LIB([avcodec], [img_convert], [HAVE_IMG_CONVERT="yes"]) +PKG_HAVE([libavformat], [libavformat], yes) +PKG_VERSION([libavformat], [libavformat]) +PKG_HAVE([libavutil], [libavutil], yes) +PKG_VERSION([libavutil], [libavutil]) +if [[ x$libavcodec_HAVE = xyes -a x$libavformat_HAVE = xyes -a x$libavutil_HAVE = xyes ]]; then + ffmpeg_HAVE=yes +else + ffmpeg_HAVE=no +fi +AC_SUBST_DEFINE(HAVE_FFMPEG, $ffmpeg_HAVE) + +# find FFMpeg's swscale lib (just if FFMpeg is compiled in GPL mode) +PKG_HAVE([libswscale], [libswscale], no) +PKG_VERSION([libswscale], [libswscale]) +AC_SUBST_DEFINE(HAVE_SWSCALE, $libswscale_HAVE) + + +# find projectM version +libprojectM_PKG="libprojectM >= 0.98" +PKG_HAVE([libprojectM], [$libprojectM_PKG], no) +PKG_VERSION([libprojectM], [$libprojectM_PKG]) +AC_SUBST_DEFINE(HAVE_PROJECTM, $libprojectM_HAVE) +# get projectM include-dir +PKG_VALUE([libprojectM], [INCLUDEDIR], [variable=includedir], [$libprojectM_PKG], + [C-Header include-dir (e.g. /usr/include)]) +# get projectM data-dir (for preset- and font-dir) +PKG_VALUE([libprojectM], [DATADIR], [variable=pkgdatadir], [$libprojectM_PKG], + [projectM data-directory for presets etc. (e.g. /usr/share/projectM)]) +# check if we need the c-wrapper +if [[ "$libprojectM_VERSION_MAJOR" -ge 1 ]]; then + libprojectM_USE_CWRAPPER=yes +else + libprojectM_USE_CWRAPPER=no +fi +AC_SUBST(USE_PROJECTM_CWRAPPER, $libprojectM_USE_CWRAPPER) + +# find portaudio +PKG_HAVE([portaudio], [portaudio-2.0], yes) +PKG_VERSION([portaudio], [portaudio-2.0]) +AC_SUBST_DEFINE(HAVE_PORTAUDIO, $portaudio_HAVE) +# find portmixer +PKG_HAVE([portmixer], [portmixer], no) +AC_SUBST_DEFINE(HAVE_PORTMIXER, $portmixer_HAVE) + +# determine linker-flags +#LDFLAGS= +#LIBS= +AC_SUBST(LDFLAGS) +AC_SUBST(LIBS) + +# ----------------------------------------- +# create output files +# ----------------------------------------- + +AC_CONFIG_FILES([Makefile]) +AC_CONFIG_FILES([src/Makefile]) +AC_CONFIG_FILES([src/config-$FPC_PLATFORM.inc:src/config.inc.in]) +if [[ x$libprojectM_USE_CWRAPPER = xyes ]]; then + AC_CONFIG_FILES([src/lib/projectM/cwrapper/Makefile]) +fi +AC_CONFIG_FILES([tools/ResourceExtractor/Makefile]) +AC_OUTPUT + +# ----------------------------------------- +# show results +# ----------------------------------------- + +AC_MSG_NOTICE([ + +!!! +!!! Configuration of $PACKAGE_NAME $PACKAGE_VERSION done! +!!! +!!! Type "make" to compile and +!!! "make install" to install it afterwards. +!!! +!!! For further information on $PACKAGE_NAME visit: +!!! $PACKAGE_WEBSITE +!!! +!!! IMPORTANT: +!!! This is an UNSUPPORTED ALPHA release for developers only. +!!! +!!! DO NOT EXPECT THE MAKEFILE OR THE PROGRAM ITSELF TO WORK +!!! +!!! If you want to contribute, visit the IRC-Channel instead: +!!! $PACKAGE_IRC +!!! +!!! PLEASE DO NOT SEND BUGREPORTS FOR THIS VERSION. +!!! +]) + +# TODO: insert this in the public beta release +#!!! In case you find a bug send a bugreport to: +#!!! $PACKAGE_BUGREPORT +#!!! You might as well ask for help at the IRC-Channel +#!!! $PACKAGE_IRC + + -- cgit v1.2.3 From 4859734e7e6699e5c88added2df53ba3ff168300 Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 2 Sep 2008 13:34:19 +0000 Subject: - removed configure options --enable-local/global - instead for - global build: just type "make" and "make install" - local build: just type "make" and start "game/ultrastardx" git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1338 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 42 ++++++++++++++++++------------------------ 1 file changed, 18 insertions(+), 24 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index a04d5a68..18d7e957 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,8 @@ # # by UltraStar Deluxe Team # -# Execute "autogen.sh" to create the configure script. +# Execute "dists/autogen/autogen.sh" or "make reconf" +# to create the configure script. # # Require autoconf >= 2.61 @@ -29,9 +30,11 @@ AC_CONFIG_AUX_DIR(dists/autogen) # show features and packages in one list AC_PRESERVE_HELP_ORDER -# set sharerootdir to the resolved dataroot-dir for the config-*.inc file. -# Pascal cannot handle shell-variables like ${prefix} -AC_DEFINE_DIR(sharerootdir, datarootdir) +# set INSTALL_DATADIR to the expanded dataroot sub-directory for USDX. +# Pascal is not able to handle shell-variables like ${prefix} that is +# why we expand here. +INSTALL_DATADIR_UNEXP="$datadir/$PACKAGE_NAME" +AC_DEFINE_DIR(INSTALL_DATADIR, INSTALL_DATADIR_UNEXP) # ----------------------------------------- # find tools @@ -262,34 +265,25 @@ AC_ARG_WITH([libprojectM], AC_ARG_WITH([cfg-dummy2], [ Development options:]) -LOCAL_BUILD="no" +# add DEPRECATED global and local options +AC_ARG_ENABLE(global, [AS_HELP_STRING([--enable-global], [(DEPRECATED, DO NOT USE]))]) +AC_ARG_ENABLE(local, [AS_HELP_STRING([--enable-local], [(DEPRECATED, DO NOT USE]))]) -# add global option -AC_ARG_ENABLE(global, - [AS_HELP_STRING([--enable-global], - [install into global folders (PREFIX/...) @<:@default=yes@:>@])], - [test $enableval = "no" && LOCAL_BUILD="yes"], []) +if [[ x$enable_global != x -o x$enable_local != x ]]; then + AC_MSG_NOTICE([ -# add local option -AC_ARG_ENABLE(local, - [AS_HELP_STRING([--enable-local], - [install into local folders (./game/...) (same as --disable-global) @<:@default=no@:>@]))], - [test $enableval = "yes" && LOCAL_BUILD="yes"], []) - -# set default Makefile install-target according to local/global build-type -AC_SUBST_DEFINE(USE_LOCAL_DIRS, $LOCAL_BUILD) -if [[ x$LOCAL_BUILD = xyes ]]; then - AC_SUBST(install_type, ["local"]) -else - AC_SUBST(install_type, ["global"]) +!!! NOTE: --enable-global and --enable-local are deprecated: +!!! - global build: just type "make" and "make install" +!!! - local build: just type "make" and start "game/ultrastardx" +]) + sleep 2 fi - # ----------------------------------------- # check for compilers # ----------------------------------------- -AC_CANONICAL_TARGET +AC_CANONICAL_HOST # find and test the freepascal compiler # sets PFLAGS, FPC_VERSION, FPC_DEBUG, etc. -- cgit v1.2.3 From 5e1dd23ad5ed2fe8b0a618a9f9e10eac1694fe2b Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 9 Sep 2008 12:50:50 +0000 Subject: - better conformance of Makefiles to GNU coding standards - bindir/prefix, etc. can be changed anytime make is performed and is not hardcoded on configure time anymore - paths are written to the intermediate paths.inc file (instead of config-xyz.inc) - binary is not stripped anymore - fpc.m4 rewrite - additional options like heaptrace, range-checks - noexecstack workaround - some more changes - configure.ac helper functions moved to ax_ectract_version.m4 and pkg_config_utils.m4 - some icons moved from artwork to icons git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1351 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 197 ++++------------------------------------------------------- 1 file changed, 12 insertions(+), 185 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 18d7e957..2a0bc83a 100644 --- a/configure.ac +++ b/configure.ac @@ -6,6 +6,10 @@ # Execute "dists/autogen/autogen.sh" or "make reconf" # to create the configure script. # +# Helper macros have been separated to +# ax_extract_version.m4 (AX_EXTRACT_VERSION) +# pkg_config_utils.m4 (PKG_VALUE, PKG_VERSION, PKG_HAVE) +# # Require autoconf >= 2.61 AC_PREREQ(2.61) @@ -30,12 +34,6 @@ AC_CONFIG_AUX_DIR(dists/autogen) # show features and packages in one list AC_PRESERVE_HELP_ORDER -# set INSTALL_DATADIR to the expanded dataroot sub-directory for USDX. -# Pascal is not able to handle shell-variables like ${prefix} that is -# why we expand here. -INSTALL_DATADIR_UNEXP="$datadir/$PACKAGE_NAME" -AC_DEFINE_DIR(INSTALL_DATADIR, INSTALL_DATADIR_UNEXP) - # ----------------------------------------- # find tools # ----------------------------------------- @@ -58,13 +56,6 @@ AC_PROG_GREP # macro declarations # ----------------------------------------- -# AC_TRIM(STRING) -# removes surrounding whitespace -# ------------------------------------------- -AC_DEFUN([AC_TRIM], -[echo "[$1]" | $SED 's/^[[ \t]]*//' | $SED 's/[[ \t]]*$//' -]) - # AC_SUBST_DEFINE(DEFINE_SUFFIX, IS_DEFINED) # used to enable/disable pascal defines AC_DEFUN([AC_SUBST_DEFINE], @@ -77,170 +68,6 @@ AC_DEFUN([AC_SUBST_DEFINE], AC_SUBST(DEFINE_[$1]) ]) -# AC_SPLIT_VERSION(VARIABLE_PREFIX, VERSION) -# Splits version number ("major.minor.release") into its components. -# Sets -# [$VARIABLE_PREFIX]_VERSION_MAJOR -# [$VARIABLE_PREFIX]_VERSION_MINOR -# [$VARIABLE_PREFIX]_VERSION_RELEASE -# This function calls -# AC_SUBST([$VARIABLE_PREFIX]_VERSION_type] for each type -AC_DEFUN([AC_SPLIT_VERSION], -[ - version=[$2] - - # strip leading non-numeric tokens - # (necessary for some ffmpeg-packages in ubuntu) - # example: 0d.51.1.0 -> 51.1.0 - version=`echo $version | $SED 's/^[[^.]]*[[^0-9.]][[^.]]*\.//'` - - # replace "." and "-" with " " and ignore trailing tokens. - # 1.23.4-r2 will be splitted to [maj=1, min=23, rel=4]. - # In addition we delete every character which is not 0-9. - # 1.3a4-r32 will be [maj=1, min=34, rel=32]. - read major minor release ignore <@) - else - [$1][_VERSION]="0.0.0" - fi - AC_SPLIT_VERSION([$1], $[$1][_VERSION]) -]) - -# PKG_HAVE(VARIABLE_PREFIX, MODULE, [REQUIRED]) -# Checks with pkg-config if a package exists and retrieves information -# about it. -# Parameters: -# - VARIABLE_PREFIX: the prefix for the variables storing information about the package. -# - MODULE: package name according to pkg-config -# - REQUIRED: if true, the configure-script is aborted if the package was not found -# Uses: -# with_[$VARIABLE_PREFIX]: whether and how the package should be checked for -# "check": check for the package but do not abort if it does not exist (default) -# "no": do not check for the package (sets _HAVE to "no" and _VERSION to "0.0.0") -# "yes": check for the package and abort if it does not exist -# "nocheck": do not check for the package (sets _HAVE to "yes") -# Sets: -# [$VARIABLE_PREFIX]_HAVE # package is available (values: "yes"|"no") -# [$VARIABLE_PREFIX]_LIBS # linker flags (e.g. -Lmylibdir -lmylib) -# [$VARIABLE_PREFIX]_LIBDIRS # library dirs (e.g. -Lmylibdir) -AC_DEFUN([PKG_HAVE], -[ - have_lib="no" - AC_MSG_CHECKING([for $2]) - if test x"$with_[$1]" = xnocheck; then - # do not call pkg-config, use user settings - have_lib="yes" - elif test x"$with_[$1]" != xno; then - # check if package exists - PKG_CHECK_EXISTS([$2], [ - have_lib="yes" - [$1][_LIBS]=`$PKG_CONFIG --libs --silence-errors "$2"` - [$1][_LIBDIRS]=`$PKG_CONFIG --libs-only-L --silence-errors "$2"` - [$1][_LIBDIRS]=`AC_TRIM($[$1][_LIBDIRS])` - # add library directories to LIBS (ignore *_LIBS for now) - if test -n "$[$1][_LIBDIRS]"; then - LIBS="$LIBS $[$1][_LIBDIRS]" - fi - ]) - fi - if test x$have_lib = xyes; then - [$1][_HAVE]="yes" - if test -n "$[$1][_LIBDIRS]"; then - # show additional lib-dirs - AC_MSG_RESULT(yes [(]$[$1][_LIBDIRS][)]) - else - AC_MSG_RESULT(yes) - fi - else - [$1][_HAVE]="no" - AC_MSG_RESULT(no) - - # check if package is required - if test x$3 = xyes -o x"$with_[$1]" = xyes ; then - # print error message and quit - err_msg=`$PKG_CONFIG --errors-to-stdout --print-errors "$2"` - AC_MSG_ERROR( -[ - -$err_msg - -Alternatively, you may set --with-[$1]=nocheck and the environment -variables [$1]_[[...]] (see configure --help) -to appropriate values to avoid the need to call pkg-config. - -See the pkg-config man page for more details. -]) - fi - fi -]) - - # ----------------------------------------- # define switches # ----------------------------------------- @@ -279,6 +106,12 @@ if [[ x$enable_global != x -o x$enable_local != x ]]; then sleep 2 fi +AC_ARG_ENABLE(debug, + [AS_HELP_STRING([--enable-debug], + [Enable debug build @<:@default=no@:>@])], + [test $enableval = "yes" && ENABLE_DEBUG="yes"], []) +AC_SUBST(ENABLE_DEBUG) + # ----------------------------------------- # check for compilers # ----------------------------------------- @@ -288,9 +121,6 @@ AC_CANONICAL_HOST # find and test the freepascal compiler # sets PFLAGS, FPC_VERSION, FPC_DEBUG, etc. AC_PROG_FPC -# FPC_VERSION is already defined by FPC, use -# PPC as prefix instead. -AC_SPLIT_VERSION(PPC, $FPC_VERSION) # find and test the C compiler (for C-libs and wrappers) AC_PROG_CC @@ -316,11 +146,8 @@ fi # check for OS # ----------------------------------------- -if [[ x$FPC_PLATFORM = xdarwin ]]; then - AC_MSG_CHECKING([for Mac OS X version]) - MACOSX_VERSION=`sw_vers -productVersion` - AC_SPLIT_VERSION(MACOSX, $MACOSX_VERSION) - AC_MSG_RESULT(@<:@$MACOSX_VERSION@:>@) +if test x$FPC_PLATFORM = xdarwin; then + AC_MACOSX_VERSION fi # ----------------------------------------- -- cgit v1.2.3 From 0c922e18017b337db4580f44709666589482e747 Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 9 Sep 2008 13:06:00 +0000 Subject: autogen.sh moved back to root git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1352 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 2a0bc83a..877264f1 100644 --- a/configure.ac +++ b/configure.ac @@ -3,7 +3,7 @@ # # by UltraStar Deluxe Team # -# Execute "dists/autogen/autogen.sh" or "make reconf" +# Execute "autogen.sh" or "make reconf" # to create the configure script. # # Helper macros have been separated to -- cgit v1.2.3 From d6554ccc1ec223c52f33ff034491e64ac1fa92aa Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 9 Sep 2008 21:28:44 +0000 Subject: FreeBSD compatibility fixes: - libpng -> libpng12 - arithmetic expressions with no argument do not work $(()) -> check for empty minor/major/release version added (error occurred with portaudio. The version is simply 19) - duplicates in linker flags removed (-L...) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1356 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 877264f1..9201a86a 100644 --- a/configure.ac +++ b/configure.ac @@ -155,7 +155,7 @@ fi # ----------------------------------------- # libpng -PKG_HAVE([libpng], [libpng], yes) +PKG_HAVE([libpng], [libpng12], yes) # find sdl PKG_HAVE([sdl], [sdl], yes) -- cgit v1.2.3 From abf47ddd1fe77287136535e2d05ada48b99b8e1f Mon Sep 17 00:00:00 2001 From: tobigun Date: Fri, 12 Sep 2008 09:51:33 +0000 Subject: - Windows resources (.rc) reduced to the icon - Texture resource names are now directly written to resources.inc - Fonts are no resources anymore. They are moved to game/fonts and can be changed to support multiple charsets (until the TTF part is finished). Fonts are registered in fonts/fonts.in git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1367 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 1 - 1 file changed, 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 9201a86a..8229210c 100644 --- a/configure.ac +++ b/configure.ac @@ -236,7 +236,6 @@ AC_CONFIG_FILES([src/config-$FPC_PLATFORM.inc:src/config.inc.in]) if [[ x$libprojectM_USE_CWRAPPER = xyes ]]; then AC_CONFIG_FILES([src/lib/projectM/cwrapper/Makefile]) fi -AC_CONFIG_FILES([tools/ResourceExtractor/Makefile]) AC_OUTPUT # ----------------------------------------- -- cgit v1.2.3 From 35e0da31ee1a60cdf8b7a1ed09398e8a730341e2 Mon Sep 17 00:00:00 2001 From: tobigun Date: Sat, 25 Oct 2008 18:36:12 +0000 Subject: configure and package description update: - SDL_TTF replaced by freetype - swscale added to debian control file git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1475 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 8229210c..84f06d58 100644 --- a/configure.ac +++ b/configure.ac @@ -160,6 +160,9 @@ PKG_HAVE([libpng], [libpng12], yes) # find sdl PKG_HAVE([sdl], [sdl], yes) +# find freetype +PKG_HAVE([freetype], [freetype2], yes) + # find sqlite3 PKG_HAVE([sqlite3], [sqlite3], yes) -- cgit v1.2.3 From 8030b5caf37443fecd8887a851be149c028dd810 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Sun, 19 Apr 2009 11:56:19 +0000 Subject: forgot configure.ac in previous commit git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1683 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 1 + 1 file changed, 1 insertion(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 84f06d58..7d643c9b 100644 --- a/configure.ac +++ b/configure.ac @@ -235,6 +235,7 @@ AC_SUBST(LIBS) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([src/Makefile]) +AC_CONFIG_FILES([plugins/Makefile]) AC_CONFIG_FILES([src/config-$FPC_PLATFORM.inc:src/config.inc.in]) if [[ x$libprojectM_USE_CWRAPPER = xyes ]]; then AC_CONFIG_FILES([src/lib/projectM/cwrapper/Makefile]) -- cgit v1.2.3 From 21f5a7d22b1fd12db09d73b306927badb8cd33e7 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Sun, 22 Nov 2009 22:00:51 +0000 Subject: relax the linker conditions for failure for linking sqlite3 on Mac OS X 10.4, which does not have a recent enough version, but the missing symbol is not used by USDX. git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1953 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 7d643c9b..69e358fc 100644 --- a/configure.ac +++ b/configure.ac @@ -224,7 +224,7 @@ PKG_HAVE([portmixer], [portmixer], no) AC_SUBST_DEFINE(HAVE_PORTMIXER, $portmixer_HAVE) # determine linker-flags -#LDFLAGS= +LDFLAGS="-undefined dynamic_lookup" #LIBS= AC_SUBST(LDFLAGS) AC_SUBST(LIBS) -- cgit v1.2.3 From e0d74e92c0c7aa5b4e0fd7ee5fae0bff8e513a27 Mon Sep 17 00:00:00 2001 From: s_alexander Date: Sat, 5 Dec 2009 12:24:56 +0000 Subject: added pcre dependency git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1963 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 69e358fc..25537088 100644 --- a/configure.ac +++ b/configure.ac @@ -166,6 +166,20 @@ PKG_HAVE([freetype], [freetype2], yes) # find sqlite3 PKG_HAVE([sqlite3], [sqlite3], yes) +# find pcre +AC_ARG_WITH(pcre, + [ --with-pcre= prefix of pcre installation (eg /usr/local)], + [ + CPPFLAGS="$CPPFLAGS -I $withval/include" + LDFLAGS="$LDFLAGS -L $withval/lib" + ] +) + +AC_CHECK_HEADERS(pcre.h, + AC_SEARCH_LIBS([pcre_compile], [pcre]) , + AC_MSG_WARN([*** pcre.h not found -- consider using --with-pcre]) +) + # find FFMpeg # Note: do not use the min/max version parameters with ffmpeg # otherwise it might fail in ubuntu due to a wrong version number -- cgit v1.2.3 From 841f7c4c93d58475682555c63b430c2917b4dab3 Mon Sep 17 00:00:00 2001 From: s_alexander Date: Sat, 5 Dec 2009 14:49:02 +0000 Subject: removed static pcre deps pcre is dynamic-loaded on application start, so configure have not to check for the pcre-lib git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@1970 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 14 -------------- 1 file changed, 14 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 25537088..69e358fc 100644 --- a/configure.ac +++ b/configure.ac @@ -166,20 +166,6 @@ PKG_HAVE([freetype], [freetype2], yes) # find sqlite3 PKG_HAVE([sqlite3], [sqlite3], yes) -# find pcre -AC_ARG_WITH(pcre, - [ --with-pcre= prefix of pcre installation (eg /usr/local)], - [ - CPPFLAGS="$CPPFLAGS -I $withval/include" - LDFLAGS="$LDFLAGS -L $withval/lib" - ] -) - -AC_CHECK_HEADERS(pcre.h, - AC_SEARCH_LIBS([pcre_compile], [pcre]) , - AC_MSG_WARN([*** pcre.h not found -- consider using --with-pcre]) -) - # find FFMpeg # Note: do not use the min/max version parameters with ffmpeg # otherwise it might fail in ubuntu due to a wrong version number -- cgit v1.2.3 From 7f37a7a60dec8ee0aa18d794b5789cc555da6036 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Sun, 13 Dec 2009 13:44:54 +0000 Subject: another fix to pass better options to the linker on Mac OS X, in particular to 10.4 ppc systems :-) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2028 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 69e358fc..b7055ae6 100644 --- a/configure.ac +++ b/configure.ac @@ -224,7 +224,9 @@ PKG_HAVE([portmixer], [portmixer], no) AC_SUBST_DEFINE(HAVE_PORTMIXER, $portmixer_HAVE) # determine linker-flags -LDFLAGS="-undefined dynamic_lookup" +if test x$FPC_PLATFORM = xdarwin; then + LDFLAGS="-macosx_version_min 10.4 -undefined dynamic_lookup" +fi #LIBS= AC_SUBST(LDFLAGS) AC_SUBST(LIBS) -- cgit v1.2.3 From 4711217f127aa0c10fa52755fd567c570277a1a1 Mon Sep 17 00:00:00 2001 From: s_alexander Date: Tue, 12 Jan 2010 17:42:41 +0000 Subject: merged lua into trunk git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2071 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index b7055ae6..898af362 100644 --- a/configure.ac +++ b/configure.ac @@ -166,6 +166,14 @@ PKG_HAVE([freetype], [freetype2], yes) # find sqlite3 PKG_HAVE([sqlite3], [sqlite3], yes) +# find lua 5.1 +# (K)Ubuntu uses lua5.1.pc, Mac OS X and other +# linux distributions use lua.pc +PKG_HAVE([lua], [lua5.1], no) +if [[ x$lua_HAVE = xno ]]; then + PKG_HAVE([lua], [lua >= 5.1], yes) +fi + # find FFMpeg # Note: do not use the min/max version parameters with ffmpeg # otherwise it might fail in ubuntu due to a wrong version number -- cgit v1.2.3 From e40d75711e644fa33756263299baa7e8da5d2f47 Mon Sep 17 00:00:00 2001 From: s_alexander Date: Tue, 12 Jan 2010 19:39:35 +0000 Subject: removed old plugin stuff git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2078 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 1 - 1 file changed, 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 898af362..8f9f6e11 100644 --- a/configure.ac +++ b/configure.ac @@ -245,7 +245,6 @@ AC_SUBST(LIBS) AC_CONFIG_FILES([Makefile]) AC_CONFIG_FILES([src/Makefile]) -AC_CONFIG_FILES([plugins/Makefile]) AC_CONFIG_FILES([src/config-$FPC_PLATFORM.inc:src/config.inc.in]) if [[ x$libprojectM_USE_CWRAPPER = xyes ]]; then AC_CONFIG_FILES([src/lib/projectM/cwrapper/Makefile]) -- cgit v1.2.3 From e404ff79067fcde24150f42c2dcb926ec5926fd1 Mon Sep 17 00:00:00 2001 From: s_alexander Date: Wed, 13 Jan 2010 20:33:19 +0000 Subject: change lua lib filename for different versions git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2088 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 3 +++ 1 file changed, 3 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 8f9f6e11..e0846256 100644 --- a/configure.ac +++ b/configure.ac @@ -170,9 +170,12 @@ PKG_HAVE([sqlite3], [sqlite3], yes) # (K)Ubuntu uses lua5.1.pc, Mac OS X and other # linux distributions use lua.pc PKG_HAVE([lua], [lua5.1], no) +lua_LIB_NAME="lua5.1" if [[ x$lua_HAVE = xno ]]; then PKG_HAVE([lua], [lua >= 5.1], yes) + lua_LIB_NAME="lua" fi +AC_SUBST(lua_LIB_NAME) # find FFMpeg # Note: do not use the min/max version parameters with ffmpeg -- cgit v1.2.3 From 01060a707820907091de02348cabe193ae1ae3dd Mon Sep 17 00:00:00 2001 From: tobigun Date: Fri, 30 Apr 2010 20:38:19 +0000 Subject: - configure recreated with autogen.sh - cleanup git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2323 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index e0846256..0e9214e3 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ AC_PREREQ(2.61) # Init autoconf AC_INIT([ultrastardx], - [1.1-alpha], + [1.1-beta], [http://sourceforge.net/tracker/?group_id=191560&atid=937872]) # specify the website here PACKAGE_WEBSITE="http://www.ultrastardeluxe.org/" @@ -269,22 +269,12 @@ AC_MSG_NOTICE([ !!! For further information on $PACKAGE_NAME visit: !!! $PACKAGE_WEBSITE !!! -!!! IMPORTANT: -!!! This is an UNSUPPORTED ALPHA release for developers only. -!!! -!!! DO NOT EXPECT THE MAKEFILE OR THE PROGRAM ITSELF TO WORK -!!! -!!! If you want to contribute, visit the IRC-Channel instead: +!!! In case you find a bug send a bugreport to: +!!! $PACKAGE_BUGREPORT +!!! You might as well ask for help at the IRC-Channel !!! $PACKAGE_IRC !!! -!!! PLEASE DO NOT SEND BUGREPORTS FOR THIS VERSION. -!!! ]) -# TODO: insert this in the public beta release -#!!! In case you find a bug send a bugreport to: -#!!! $PACKAGE_BUGREPORT -#!!! You might as well ask for help at the IRC-Channel -#!!! $PACKAGE_IRC -- cgit v1.2.3 From be3978a078196c423d1974d87bd3cf07a3dd2d45 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Mon, 24 May 2010 18:59:38 +0000 Subject: add configure for libpcre and add path for dlopen on darwin git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2416 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 0e9214e3..78bd2d4a 100644 --- a/configure.ac +++ b/configure.ac @@ -230,6 +230,16 @@ AC_SUBST(USE_PROJECTM_CWRAPPER, $libprojectM_USE_CWRAPPER) PKG_HAVE([portaudio], [portaudio-2.0], yes) PKG_VERSION([portaudio], [portaudio-2.0]) AC_SUBST_DEFINE(HAVE_PORTAUDIO, $portaudio_HAVE) + +# find pcre +libpcre_PKG="libpcre" +PKG_HAVE([libpcre], [$libpcre_PKG], yes) +PKG_VERSION([libpcre], [$libpcre_PKG]) +AC_SUBST_DEFINE(HAVE_LIBPCRE, $libpcre_HAVE) +# get libpcre library dir +PKG_VALUE([libpcre], [LIBDIR], [variable=libdir], [$libpcre_PKG], + [library dir (e.g. /usr/lib, /sw/lib, ...)]) + # find portmixer PKG_HAVE([portmixer], [portmixer], no) AC_SUBST_DEFINE(HAVE_PORTMIXER, $portmixer_HAVE) -- cgit v1.2.3 From de239a918bb9f03af2302c035cd90ad006d99939 Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Mon, 24 May 2010 19:52:05 +0000 Subject: make pcre not required, since it fails on ubuntu because of a different name. do not forget to execute ./autogen.sh git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2417 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 78bd2d4a..e4c63496 100644 --- a/configure.ac +++ b/configure.ac @@ -233,7 +233,7 @@ AC_SUBST_DEFINE(HAVE_PORTAUDIO, $portaudio_HAVE) # find pcre libpcre_PKG="libpcre" -PKG_HAVE([libpcre], [$libpcre_PKG], yes) +PKG_HAVE([libpcre], [$libpcre_PKG], no) PKG_VERSION([libpcre], [$libpcre_PKG]) AC_SUBST_DEFINE(HAVE_LIBPCRE, $libpcre_HAVE) # get libpcre library dir -- cgit v1.2.3 From f0f0d4b3f9c1e343edf6dfddc04cf25d3b52b496 Mon Sep 17 00:00:00 2001 From: tobigun Date: Tue, 8 Jun 2010 18:27:37 +0000 Subject: string update git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2456 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index e4c63496..c609c460 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ AC_PREREQ(2.61) # Init autoconf AC_INIT([ultrastardx], - [1.1-beta], + [1.1-RC], [http://sourceforge.net/tracker/?group_id=191560&atid=937872]) # specify the website here PACKAGE_WEBSITE="http://www.ultrastardeluxe.org/" -- cgit v1.2.3 From c946cb8ddb576b695a7d3ff4d7a32bd6bf7f24ec Mon Sep 17 00:00:00 2001 From: k-m_schindler Date: Wed, 16 Jun 2010 18:53:12 +0000 Subject: Steve Jobs: There is on more thing :-) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2532 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index c609c460..36b4e4ab 100644 --- a/configure.ac +++ b/configure.ac @@ -246,7 +246,7 @@ AC_SUBST_DEFINE(HAVE_PORTMIXER, $portmixer_HAVE) # determine linker-flags if test x$FPC_PLATFORM = xdarwin; then - LDFLAGS="-macosx_version_min 10.4 -undefined dynamic_lookup" + LDFLAGS="-macosx_version_min 10.4 -undefined dynamic_lookup -headerpad_max_install_names" fi #LIBS= AC_SUBST(LDFLAGS) -- cgit v1.2.3 From 7e517498f282e58c2d26f9ffd7c227da9cc622fe Mon Sep 17 00:00:00 2001 From: tobigun Date: Thu, 17 Jun 2010 16:38:18 +0000 Subject: update configure to find libpng 1.4 git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2539 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 36b4e4ab..99f2fb3f 100644 --- a/configure.ac +++ b/configure.ac @@ -154,8 +154,16 @@ fi # check for libraries # ----------------------------------------- -# libpng -PKG_HAVE([libpng], [libpng12], yes) +# find libpng +# pkgconfig name for 1.2 is "libpng12", for 1.4 "libpng" +PKG_HAVE([libpng], [libpng12], no) +if [[ x$libpng_HAVE = xyes ]]; then + PKG_VERSION([libpng], [libpng12]) +else + # check for the generic .pc file + PKG_HAVE([libpng], [libpng >= 1.2], yes) + PKG_VERSION([libpng], [libpng >= 1.2]) +fi # find sdl PKG_HAVE([sdl], [sdl], yes) -- cgit v1.2.3 From 5e13354bb1fcee732a92c89d6d0ac9888f43daeb Mon Sep 17 00:00:00 2001 From: tobigun Date: Sun, 10 Oct 2010 18:55:31 +0000 Subject: strings adjusted (removed 'RC'-parts) git-svn-id: svn://svn.code.sf.net/p/ultrastardx/svn/trunk@2656 b956fd51-792f-4845-bead-9b4dfca2ff2c --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 99f2fb3f..c240aa7d 100644 --- a/configure.ac +++ b/configure.ac @@ -16,7 +16,7 @@ AC_PREREQ(2.61) # Init autoconf AC_INIT([ultrastardx], - [1.1-RC], + [1.1], [http://sourceforge.net/tracker/?group_id=191560&atid=937872]) # specify the website here PACKAGE_WEBSITE="http://www.ultrastardeluxe.org/" -- cgit v1.2.3