Modernize configure.ac a bit
git-svn-id: https://geany.svn.sourceforge.net/svnroot/geany/trunk@6000 ea778897-0a13-0410-b9d1-a72fbfd435f5
This commit is contained in:
Colomban Wendling
parent
d63f1f052b
commit
4dd7092726
@ -1,3 +1,9 @@
|
||||
2011-10-06 Colomban Wendling <colomban(at)geany(dot)org>
|
||||
|
||||
* autogen.sh, configure.ac:
|
||||
Modernize configure.ac a bit.
|
||||
|
||||
|
||||
2011-10-05 Nick Treleaven <nick(dot)treleaven(at)btinternet(dot)com>
|
||||
|
||||
* tagmanager/lregex.c, tagmanager/php.c:
|
||||
|
||||
@ -83,6 +83,7 @@ fi
|
||||
|
||||
echo "Processing configure.ac"
|
||||
|
||||
test -d build-aux || mkdir build-aux
|
||||
echo "no" | glib-gettextize --force --copy
|
||||
intltoolize --copy --force --automake
|
||||
libtoolize --copy --force || glibtoolize --copy --force
|
||||
|
||||
320
configure.ac
320
configure.ac
@ -1,25 +1,26 @@
|
||||
dnl Process this file with autoconf to produce a configure script.
|
||||
dnl $Id$
|
||||
|
||||
AC_INIT(configure.ac)
|
||||
AM_INIT_AUTOMAKE(geany, 1.22)
|
||||
AC_PREREQ([2.60])
|
||||
AC_INIT([Geany], [1.22],
|
||||
[https://sourceforge.net/tracker/?group_id=153444&atid=787791])
|
||||
AC_CONFIG_SRCDIR([src/geany.h])
|
||||
AC_CONFIG_AUX_DIR([build-aux])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
AM_INIT_AUTOMAKE
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
|
||||
m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
|
||||
|
||||
AM_CONFIG_HEADER(config.h)
|
||||
|
||||
AC_GNU_SOURCE
|
||||
AC_AIX
|
||||
AC_MINIX
|
||||
# why do we use this?
|
||||
AC_USE_SYSTEM_EXTENSIONS
|
||||
|
||||
AC_PROG_CC
|
||||
|
||||
AC_PROG_CXX
|
||||
# check for C++ compiler explicitly and fail if none is found, do this check
|
||||
# after AC_PROG_CXX has set the CXX environment variable
|
||||
which $CXX >/dev/null 2>&1
|
||||
if test "x$?" != "x0"; then
|
||||
if ! which $CXX >/dev/null 2>&1; then
|
||||
AC_MSG_ERROR([No C++ compiler found. Please install a C++ compiler.])
|
||||
fi
|
||||
|
||||
@ -48,8 +49,11 @@ AC_CHECK_FUNCS([gethostname ftruncate fgetpos mkstemp strerror strstr])
|
||||
# autoscan end
|
||||
|
||||
|
||||
# get svn revision (try GIT first, then check for SVN)
|
||||
# check for SVN revision
|
||||
REVISION="r0"
|
||||
|
||||
AC_MSG_CHECKING([for SVN revision])
|
||||
# try Git first
|
||||
GIT=`which git 2>/dev/null`
|
||||
if test -d ".git" -a "x${GIT}" != "x" -a -x "${GIT}"
|
||||
then
|
||||
@ -57,10 +61,13 @@ then
|
||||
git svn info &>/dev/null
|
||||
if test "x$?" == "x0"; then
|
||||
REVISION=r`git svn find-rev origin/trunk 2>/dev/null ||
|
||||
git svn find-rev trunk 2>/dev/null || git svn find-rev HEAD 2>/dev/null ||
|
||||
git svn find-rev master 2>/dev/null || echo 0`
|
||||
git svn find-rev trunk 2>/dev/null ||
|
||||
git svn find-rev HEAD 2>/dev/null ||
|
||||
git svn find-rev master 2>/dev/null ||
|
||||
echo 0`
|
||||
fi
|
||||
fi
|
||||
# then check for SVN
|
||||
if test "x${REVISION}" = "xr0"
|
||||
then
|
||||
SVN=`which svn 2>/dev/null`
|
||||
@ -73,155 +80,181 @@ if test "x${REVISION}" != "xr0"
|
||||
then
|
||||
# force debug mode for a SVN working copy
|
||||
CFLAGS="-g -DGEANY_DEBUG $CFLAGS"
|
||||
AC_MSG_RESULT([$REVISION])
|
||||
else
|
||||
REVISION="-1"
|
||||
AC_MSG_RESULT([none])
|
||||
fi
|
||||
AC_DEFINE_UNQUOTED([REVISION], "$REVISION", [subversion revision number])
|
||||
|
||||
|
||||
dnl Check for binary relocation support
|
||||
dnl taken from Inkscape (Hongli Lai <h.lai@chello.nl>)
|
||||
# Check for binary relocation support
|
||||
# taken from Inkscape (Hongli Lai <h.lai@chello.nl>)
|
||||
AC_ARG_ENABLE([binreloc],
|
||||
[AS_HELP_STRING([--enable-binreloc],
|
||||
[compile with binary relocation support [default=no]])],
|
||||
[enable_binreloc=$enableval],
|
||||
[enable_binreloc=no])
|
||||
|
||||
AC_ARG_ENABLE(binreloc,
|
||||
[ --enable-binreloc compile with binary relocation support],
|
||||
enable_binreloc=$enableval,enable_binreloc=no)
|
||||
|
||||
AC_MSG_CHECKING(whether binary relocation support should be enabled)
|
||||
AC_MSG_CHECKING([whether binary relocation support should be enabled])
|
||||
if test "$enable_binreloc" = "yes"; then
|
||||
AC_MSG_RESULT(yes)
|
||||
AC_MSG_CHECKING(for linker mappings at /proc/self/maps)
|
||||
if test -e /proc/self/maps; then
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_ERROR(/proc/self/maps is not available. Binary relocation cannot be enabled.)
|
||||
enable_binreloc="no"
|
||||
fi
|
||||
AC_MSG_RESULT([yes])
|
||||
AC_MSG_CHECKING([for linker mappings at /proc/self/maps])
|
||||
if test -e /proc/self/maps; then
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
AC_MSG_ERROR([/proc/self/maps is not available. Binary relocation cannot be enabled.])
|
||||
enable_binreloc="no"
|
||||
fi
|
||||
|
||||
elif test "$enable_binreloc" = "auto"; then
|
||||
AC_MSG_RESULT(yes when available)
|
||||
AC_MSG_CHECKING(for linker mappings at /proc/self/maps)
|
||||
if test -e /proc/self/maps; then
|
||||
AC_MSG_RESULT(yes)
|
||||
enable_binreloc=yes
|
||||
AC_MSG_RESULT([yes when available])
|
||||
AC_MSG_CHECKING([for linker mappings at /proc/self/maps])
|
||||
if test -e /proc/self/maps; then
|
||||
AC_MSG_RESULT([yes])
|
||||
enable_binreloc=yes
|
||||
|
||||
AC_MSG_CHECKING(whether everything is installed to the same prefix)
|
||||
if test "$bindir" = '${exec_prefix}/bin' -a "$sbindir" = '${exec_prefix}/sbin' -a \
|
||||
"$datadir" = '${prefix}/share' -a "$libdir" = '${exec_prefix}/lib' -a \
|
||||
"$libexecdir" = '${exec_prefix}/libexec' -a "$sysconfdir" = '${prefix}/etc'
|
||||
then
|
||||
AC_MSG_RESULT(yes)
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_NOTICE(Binary relocation support will be disabled.)
|
||||
enable_binreloc=no
|
||||
fi
|
||||
AC_MSG_CHECKING([whether everything is installed to the same prefix])
|
||||
if test "$bindir" = '${exec_prefix}/bin' -a "$sbindir" = '${exec_prefix}/sbin' -a \
|
||||
"$datadir" = '${prefix}/share' -a "$libdir" = '${exec_prefix}/lib' -a \
|
||||
"$libexecdir" = '${exec_prefix}/libexec' -a "$sysconfdir" = '${prefix}/etc'
|
||||
then
|
||||
AC_MSG_RESULT([yes])
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
AC_MSG_NOTICE([Binary relocation support will be disabled.])
|
||||
enable_binreloc=no
|
||||
fi
|
||||
|
||||
else
|
||||
AC_MSG_RESULT(no)
|
||||
enable_binreloc=no
|
||||
fi
|
||||
else
|
||||
AC_MSG_RESULT([no])
|
||||
enable_binreloc=no
|
||||
fi
|
||||
|
||||
elif test "$enable_binreloc" = "no"; then
|
||||
AC_MSG_RESULT(no)
|
||||
AC_MSG_RESULT([no])
|
||||
else
|
||||
AC_MSG_RESULT(no (unknown value "$enable_binreloc"))
|
||||
enable_binreloc=no
|
||||
AC_MSG_RESULT([no (unknown value "$enable_binreloc")])
|
||||
enable_binreloc=no
|
||||
fi
|
||||
if test "$enable_binreloc" = "yes"; then
|
||||
AC_DEFINE(ENABLE_BINRELOC,,[Use AutoPackage?])
|
||||
AC_DEFINE([ENABLE_BINRELOC],,[Use AutoPackage?])
|
||||
fi
|
||||
|
||||
|
||||
# GTK/GLib/GIO checks
|
||||
gtk_modules="gtk+-2.0 >= 2.12 glib-2.0 >= 2.16 gio-2.0 >= 2.16"
|
||||
PKG_CHECK_MODULES(GTK, [$gtk_modules])
|
||||
AC_SUBST(GTK_CFLAGS)
|
||||
AC_SUBST(GTK_LIBS)
|
||||
PKG_CHECK_MODULES([GTK], [$gtk_modules])
|
||||
AC_SUBST([GTK_CFLAGS])
|
||||
AC_SUBST([GTK_LIBS])
|
||||
GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0`
|
||||
# GTHREAD checks
|
||||
gthread_modules="gthread-2.0"
|
||||
PKG_CHECK_MODULES(GTHREAD, [$gthread_modules])
|
||||
AC_SUBST(GTHREAD_CFLAGS)
|
||||
AC_SUBST(GTHREAD_LIBS)
|
||||
PKG_CHECK_MODULES([GTHREAD], [$gthread_modules])
|
||||
AC_SUBST([GTHREAD_CFLAGS])
|
||||
AC_SUBST([GTHREAD_LIBS])
|
||||
|
||||
# --disable-deprecated switch for GTK2 purification
|
||||
AC_ARG_ENABLE(deprecated, [ --disable-deprecated Disable deprecated GTK functions. ],
|
||||
[GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"], [])
|
||||
AC_ARG_ENABLE([deprecated],
|
||||
[AS_HELP_STRING([--disable-deprecated], [Disable deprecated GTK functions.])],
|
||||
[GTK_CFLAGS="$GTK_CFLAGS -DG_DISABLE_DEPRECATED -DGTK_DISABLE_DEPRECATED"],
|
||||
[])
|
||||
|
||||
|
||||
# Plugins support
|
||||
AC_ARG_ENABLE(plugins, [AC_HELP_STRING([--disable-plugins], [compile without plugin support [default=no]])], , enable_plugins=yes)
|
||||
AC_ARG_ENABLE([plugins],
|
||||
[AS_HELP_STRING([--disable-plugins], [compile without plugin support [default=no]])],
|
||||
,
|
||||
[enable_plugins=yes])
|
||||
|
||||
if test "x$enable_plugins" = "xyes" ; then
|
||||
AC_DEFINE(HAVE_PLUGINS, 1, [Define if plugins are enabled.])
|
||||
AM_CONDITIONAL(PLUGINS, true)
|
||||
AC_DEFINE([HAVE_PLUGINS], [1], [Define if plugins are enabled.])
|
||||
AM_CONDITIONAL([PLUGINS], true)
|
||||
else
|
||||
AM_CONDITIONAL(PLUGINS, false)
|
||||
AM_CONDITIONAL([PLUGINS], false)
|
||||
fi
|
||||
|
||||
# Use included GNU regex library
|
||||
AC_ARG_ENABLE(gnu-regex, [AC_HELP_STRING([--enable-gnu-regex], [compile with included GNU regex library [default=no]])], , enable_gnu_regex=no)
|
||||
|
||||
# check whether to use included GNU regex library
|
||||
AC_ARG_ENABLE([gnu-regex],
|
||||
[AS_HELP_STRING([--enable-gnu-regex],
|
||||
[compile with included GNU regex library [default=no]])],
|
||||
,
|
||||
[enable_gnu_regex=no])
|
||||
|
||||
# auto-enable included regex if necessary
|
||||
# FIXME: this may override a user choice
|
||||
AC_CHECK_FUNCS([regcomp], [], [enable_gnu_regex="yes"])
|
||||
|
||||
if test "x$enable_gnu_regex" = "xyes" ; then
|
||||
AC_DEFINE(USE_INCLUDED_REGEX, 1, [Define if included GNU regex code should be used.])
|
||||
AC_DEFINE(HAVE_REGCOMP, 1, [Define if you have the 'regcomp' function.])
|
||||
AM_CONDITIONAL(USE_INCLUDED_REGEX, true)
|
||||
AC_DEFINE([USE_INCLUDED_REGEX], [1], [Define if included GNU regex code should be used.])
|
||||
AC_DEFINE([HAVE_REGCOMP], [1], [Define if you have the 'regcomp' function.])
|
||||
AM_CONDITIONAL([USE_INCLUDED_REGEX], true)
|
||||
else
|
||||
AM_CONDITIONAL(USE_INCLUDED_REGEX, false)
|
||||
AM_CONDITIONAL([USE_INCLUDED_REGEX], false)
|
||||
fi
|
||||
|
||||
|
||||
# check for mingw specific settings
|
||||
case "${host}" in
|
||||
*mingw*)
|
||||
AC_CHECK_LIB(iberty, fnmatch, [], [
|
||||
AC_MSG_ERROR([fnmatch does not present in libiberty. You need to update it, read http://www.geany.org/Support/CrossCompile for details.])
|
||||
])
|
||||
AC_DEFINE_UNQUOTED([WIN32], 1, [we are cross compiling for WIN32])
|
||||
want_vte="no"
|
||||
want_socket="yes"
|
||||
AC_DEFINE(HAVE_SOCKET, 1, [Define if you want to detect a running instance])
|
||||
AC_EXEEXT
|
||||
AM_CONDITIONAL(MINGW, true)
|
||||
;;
|
||||
*)
|
||||
AM_CONDITIONAL(MINGW, false)
|
||||
;;
|
||||
*mingw*)
|
||||
AC_CHECK_LIB([iberty], [fnmatch], [],
|
||||
[AC_MSG_ERROR([fnmatch does not present in libiberty. You need to update it, read http://www.geany.org/Support/CrossCompile for details.])])
|
||||
AC_DEFINE([WIN32], [1], [we are cross compiling for WIN32])
|
||||
AC_DEFINE([HAVE_SOCKET], [1], [Define if you want to detect a running instance])
|
||||
AM_CONDITIONAL([MINGW], true)
|
||||
want_vte="no"
|
||||
want_socket="yes"
|
||||
;;
|
||||
*)
|
||||
AM_CONDITIONAL([MINGW], false)
|
||||
;;
|
||||
esac
|
||||
|
||||
dnl skip check if already decided
|
||||
|
||||
# skip check if already decided
|
||||
if test "x$want_socket" = "x"; then
|
||||
# socket support
|
||||
AC_ARG_ENABLE(socket, AC_HELP_STRING([--enable-socket],[enable if you want to detect a running instance [[default=yes]]]),
|
||||
[want_socket="$enableval"], [want_socket="yes"])
|
||||
# socket support
|
||||
AC_ARG_ENABLE([socket],
|
||||
[AS_HELP_STRING([--enable-socket],
|
||||
[enable if you want to detect a running instance [default=yes]])],
|
||||
[want_socket="$enableval"],
|
||||
[want_socket="yes"])
|
||||
|
||||
if test "x$want_socket" = "xyes"; then
|
||||
AC_DEFINE(HAVE_SOCKET, 1, [Define if you want to detect a running instance])
|
||||
# this should bring in libsocket on Solaris:
|
||||
AC_SEARCH_LIBS([connect],[socket],[],[],[])
|
||||
fi
|
||||
if test "x$want_socket" = "xyes"; then
|
||||
AC_DEFINE([HAVE_SOCKET], [1], [Define if you want to detect a running instance])
|
||||
# this should bring in libsocket on Solaris:
|
||||
AC_SEARCH_LIBS([connect],[socket])
|
||||
fi
|
||||
fi
|
||||
|
||||
dnl skip check if already decided
|
||||
|
||||
# skip check if already decided
|
||||
if test "x$want_vte" = "x"; then
|
||||
# VTE support
|
||||
AC_ARG_ENABLE(vte, AC_HELP_STRING([--enable-vte],
|
||||
[enable if you want virtual terminal support [[default=yes]]]),
|
||||
[want_vte="$enableval"], [want_vte="yes"])
|
||||
if test "x$want_vte" = "xyes"; then
|
||||
AC_DEFINE(HAVE_VTE, 1, [Define if you want VTE support])
|
||||
fi
|
||||
AC_ARG_WITH(vte-module-path, AC_HELP_STRING([--with-vte-module-path=PATH],
|
||||
[Path to a loadable libvte [[default=None]]]), [AC_DEFINE_UNQUOTED([VTE_MODULE_PATH],
|
||||
["$withval"], [Path to a loadable libvte])])
|
||||
# VTE support
|
||||
AC_ARG_ENABLE([vte],
|
||||
[AS_HELP_STRING([--enable-vte],
|
||||
[enable if you want virtual terminal support [default=yes]])],
|
||||
[want_vte="$enableval"],
|
||||
[want_vte="yes"])
|
||||
if test "x$want_vte" = "xyes"; then
|
||||
AC_DEFINE([HAVE_VTE], [1], [Define if you want VTE support])
|
||||
fi
|
||||
AC_ARG_WITH([vte-module-path],
|
||||
[AS_HELP_STRING([--with-vte-module-path=PATH],
|
||||
[Path to a loadable libvte [default=None]])],
|
||||
[AC_DEFINE_UNQUOTED([VTE_MODULE_PATH],
|
||||
["$withval"], [Path to a loadable libvte])])
|
||||
fi
|
||||
|
||||
GTK_VERSION=`$PKG_CONFIG --modversion gtk+-2.0`
|
||||
|
||||
|
||||
# just for a laugh (it has absolutely no effect)
|
||||
AC_ARG_ENABLE(the-force, AC_HELP_STRING([--enable-the-force],
|
||||
[enable if you are Luke Skywalker and the force is with you [[default=no]]]), [be_luke="$enableval"], [be_luke="no"])
|
||||
AC_ARG_ENABLE([the-force],
|
||||
[AS_HELP_STRING([--enable-the-force],
|
||||
[enable if you are Luke Skywalker and the force is with you [default=no]])],
|
||||
[be_luke="$enableval"],
|
||||
[be_luke="no"])
|
||||
AC_MSG_CHECKING([whether the force is with you])
|
||||
if test "x$be_luke" = "xyes"; then
|
||||
AC_MSG_RESULT([yes])
|
||||
@ -229,16 +262,16 @@ else
|
||||
AC_MSG_RESULT([no])
|
||||
fi
|
||||
|
||||
# i18n
|
||||
GETTEXT_PACKAGE=geany
|
||||
AC_SUBST(GETTEXT_PACKAGE)
|
||||
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package.])
|
||||
|
||||
if test -n "${LINGUAS}"
|
||||
then
|
||||
# i18n
|
||||
GETTEXT_PACKAGE="$PACKAGE"
|
||||
AC_SUBST([GETTEXT_PACKAGE])
|
||||
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], ["$GETTEXT_PACKAGE"], [Gettext package.])
|
||||
|
||||
if test -n "${LINGUAS}"; then
|
||||
ALL_LINGUAS="${LINGUAS}"
|
||||
else
|
||||
if test -z "$conf_dir" ; then
|
||||
if test -z "$conf_dir"; then
|
||||
conf_dir="."
|
||||
fi
|
||||
ALL_LINGUAS=`cd "$conf_dir/po" 2>/dev/null && ls *.po 2>/dev/null | $AWK 'BEGIN { FS="."; ORS=" " } { print $1 }'`
|
||||
@ -261,43 +294,47 @@ fi
|
||||
# Set ${docdir} if it is empty
|
||||
if test -z "${docdir}"; then
|
||||
docdir='${datadir}/doc/${PACKAGE}'
|
||||
AC_SUBST(docdir)
|
||||
AC_SUBST([docdir])
|
||||
fi
|
||||
|
||||
GEANY_DATA_DIR=`eval echo ${datarootdir}/geany`
|
||||
AC_SUBST(GEANY_DATA_DIR)
|
||||
AC_SUBST([GEANY_DATA_DIR])
|
||||
|
||||
# intltool hack to define install_sh on Debian/Ubuntu systems
|
||||
if test "x$install_sh" = "x"; then
|
||||
install_sh="`pwd`/install-sh"
|
||||
AC_SUBST(install_sh)
|
||||
AC_SUBST([install_sh])
|
||||
fi
|
||||
|
||||
AC_OUTPUT([
|
||||
Makefile
|
||||
icons/Makefile
|
||||
icons/16x16/Makefile
|
||||
icons/48x48/Makefile
|
||||
icons/scalable/Makefile
|
||||
tagmanager/Makefile
|
||||
tagmanager/include/Makefile
|
||||
tagmanager/mio/Makefile
|
||||
scintilla/Makefile
|
||||
scintilla/include/Makefile
|
||||
src/Makefile
|
||||
plugins/Makefile
|
||||
po/Makefile.in
|
||||
doc/Makefile
|
||||
doc/geany.1
|
||||
geany.spec
|
||||
geany.pc
|
||||
doc/Doxyfile
|
||||
])
|
||||
|
||||
# Output
|
||||
AC_CONFIG_FILES([
|
||||
Makefile
|
||||
icons/Makefile
|
||||
icons/16x16/Makefile
|
||||
icons/48x48/Makefile
|
||||
icons/scalable/Makefile
|
||||
tagmanager/Makefile
|
||||
tagmanager/include/Makefile
|
||||
tagmanager/mio/Makefile
|
||||
scintilla/Makefile
|
||||
scintilla/include/Makefile
|
||||
src/Makefile
|
||||
plugins/Makefile
|
||||
po/Makefile.in
|
||||
doc/Makefile
|
||||
doc/geany.1
|
||||
geany.spec
|
||||
geany.pc
|
||||
doc/Doxyfile
|
||||
])
|
||||
AC_OUTPUT
|
||||
|
||||
|
||||
# Summary
|
||||
echo "----------------------------------------"
|
||||
echo "Install Geany in : ${prefix}"
|
||||
if test "x${build}" != "x" -a "x${target}" != "x"
|
||||
then
|
||||
if test -n "${build}" -a -n "${target}"; then
|
||||
echo "Building Geany on : ${build}"
|
||||
echo "Building Geany for : ${target}"
|
||||
fi
|
||||
@ -311,8 +348,7 @@ else
|
||||
echo "GNU regex library : system"
|
||||
fi
|
||||
|
||||
if test "${REVISION}" != "-1"
|
||||
then
|
||||
if test "${REVISION}" != "-1"; then
|
||||
echo "Compiling Subversion revision : ${REVISION}"
|
||||
fi
|
||||
echo ""
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user