search for: ac_subst

...print (distutils.sysconfig.get_python_inc ());"` - PYTHON_INCLUDEDIR=$python_path - fi - AC_MSG_RESULT([$PYTHON_INCLUDEDIR]) + # Debian: python-2.7.pc, python-3.2.pc + PKG_CHECK_MODULES([PYTHON], [python-"$PYTHON_VERSION"],[ + AC_SUBST([PYTHON_CFLAGS]) + AC_SUBST([PYTHON_LIBS]) + AC_SUBST([PYTHON_VERSION]) + AC_DEFINE([HAVE_PYTHON],[1],[Python library found at compile time]) + ],[ + PKG_CHECK_MODULES([PYTHON], [python],[ + AC_SUBST([PYTHON_CFLAGS]) +...

Check the presence of Gtk properly depending on the value of --with-gtk: if a specific version is chosen, then let PKG_CHECK_MODULES fail if that version if not found, otherwise fallback from gtk3 to gtk2 to no gtk. Also move few common AC_SUBST in a single place. --- m4/guestfs_misc_libraries.m4 | 26 ++++++++++++++------------ 1 file changed, 14 insertions(+), 12 deletions(-) diff --git a/m4/guestfs_misc_libraries.m4 b/m4/guestfs_misc_libraries.m4 index 4ae0576..fee265b 100644 --- a/m4/guestfs_misc_libraries.m4 +++ b/m4/guestfs_misc_li...

This commit starts to split our massive, monolithic configure.ac file into smaller files, using the m4_include mechanism to combine them. I don't know if we should really do this, so I'm open to comments about it. However: - Our configure.ac script is 1800+ lines long, and that's pretty long. - configure.ac lacks structure; splitting it up might improve that. - From what I read,

On Wed, 2004-12-22 at 22:09, Markus F.X.J. Oberhumer wrote: > Below you will find a small patch for llvm/autoconf/configure.ac that fixes > wrong AC_SUBST usage and adds AMD64 detection. Please review. > > ~Markus > --- autoconf/configure.ac 22 Dec 2004 05:56:56 -0000 1.147 > +++ autoconf/configure.ac 23 Dec 2004 06:06:04 -0000 > @@ -139,7 +139,8 @@ > dnl the OS. > AC_CACHE_CHECK([target architecture],[llvm_...

...it a/configure.ac b/configure.ac index 469ea96..0e7e2ea 100644 --- a/configure.ac +++ b/configure.ac @@ -85,14 +85,14 @@ PKG_CHECK_MODULES([GIO_UNIX], [gio-unix-2.0 >= 2.32.0], ] ) -PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.5], +PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2], [ AC_SUBST([ZLIB_CFLAGS]) AC_SUBST([ZLIB_LIBS]) ] ) -PKG_CHECK_MODULES([UUID], [uuid >= 2.21.0], +PKG_CHECK_MODULES([UUID], [uuid], [ AC_SUBST([UUID_CFLAGS]) AC_SUBST([UUID_LIBS]) -- 2.0.0

...nfig.get_python_inc ());"` > - PYTHON_INCLUDEDIR=$python_path > - fi > - AC_MSG_RESULT([$PYTHON_INCLUDEDIR]) > + # Debian: python-2.7.pc, python-3.2.pc > + PKG_CHECK_MODULES([PYTHON], [python-"$PYTHON_VERSION"],[ > + AC_SUBST([PYTHON_CFLAGS]) > + AC_SUBST([PYTHON_LIBS]) > + AC_SUBST([PYTHON_VERSION]) > + AC_DEFINE([HAVE_PYTHON],[1],[Python library found at compile time]) > + ],[ > + PKG_CHECK_MODULES([PYTHON], [python],[ > + AC_SUBST([PY...

...from an environment variable. AC_ARG_WITH([sbmlode-include], AC_HELP_STRING([--with-sbmlode-include=INCLUDE_PATH], [the location of SBMLODE header files]), [sbmlode_include_path=$withval]) if test [ -n "$sbmlode_include_path" ] ; then AC_SUBST([CPPFLAGS],["-I${sbmlode_include_path} ${CPPFLAGS}"]) else if test [ -n "${SBMLODE_INCLUDE}" ] ; then AC_SUBST([CPPFLAGS],["-I${SBMLODE_INCLUDE} ${CPPFLAGS}"]) fi fi dnl ditto for a library path AC_ARG_WITH([sbmlode-lib],AC_HELP_STRING([--with-sbmlode-lib=LI...

...` > > - PYTHON_INCLUDEDIR=$python_path > > - fi > > - AC_MSG_RESULT([$PYTHON_INCLUDEDIR]) > > + # Debian: python-2.7.pc, python-3.2.pc > > + PKG_CHECK_MODULES([PYTHON], [python-"$PYTHON_VERSION"],[ > > + AC_SUBST([PYTHON_CFLAGS]) > > + AC_SUBST([PYTHON_LIBS]) > > + AC_SUBST([PYTHON_VERSION]) > > + AC_DEFINE([HAVE_PYTHON],[1],[Python library found at compile time]) > > + ],[ > > + PKG_CHECK_MODULES([PYTHON], [python],[ > >...

...missing $JAVA/bin/javah binary]) - else + if test -x "$JAVA/bin/javah"; then JAVAH="$JAVA/bin/javah" fi if test ! -x "$JAVA/bin/javadoc"; then @@ -163,6 +161,7 @@ if test "x$with_java" != "xno"; then AC_SUBST(JAR_INSTALL_DIR) AC_SUBST(JNI_INSTALL_DIR) AC_SUBST(JNI_VERSION_INFO) + AM_CONDITIONAL([HAVE_JAVAH],[test -n "$JAVAH"]) fi AM_CONDITIONAL([HAVE_JAVA],[test "x$with_java" != "xno" && test -n "$JAVAC"]) -- 2.14.3

...:= @LIBEXEC_INC@ SHAREDIR := @SHAREDIR@ MAN1DIR := $(mandir)/man1 diff --git a/m4/paths.m4 b/m4/paths.m4 index 63e0f6b..1a558e1 100644 --- a/m4/paths.m4 +++ b/m4/paths.m4 @@ -62,6 +62,14 @@ AC_ARG_WITH([sysconfig-leaf-dir], CONFIG_LEAF_DIR=$config_leaf_dir AC_SUBST(CONFIG_LEAF_DIR) +dnl autoconf docs suggest to use a "package name" subdir. We make it +dnl configurable for the benefit of those who want e.g. xen-X.Y instead. +AC_ARG_WITH([libexec-leaf-dir], + AS_HELP_STRING([--with-libexec-leaf-dir=SUBDIR], + [Name of subdirectory in libexecdi...

...alue of enable_shave + m4_if([$2], [enable], [_SHAVE_ARG_ENABLE(yes)], [_SHAVE_ARG_ENABLE(no)]) + + if test x"$enable_shave" = xyes; then + dnl where can we find the shave scripts? + m4_if([$1],, + [shavedir="$ac_pwd"], + [shavedir="$ac_pwd/$1"]) + AC_SUBST(shavedir) + + dnl make is now quiet + AC_SUBST([MAKEFLAGS], [-s]) + AC_SUBST([AM_MAKEFLAGS], ['`test -z $V && echo -s`']) + + dnl we need sed + AC_CHECK_PROG(SED,sed,sed,false) + + dnl substitute libtool + SHAVE_SAVED_LIBTOOL=$LIBTOOL + LIBTOOL="${SHELL}...

This is the same fix I posted a few days ago for hivex (<1369351909-23821-3-git-send-email-bengen@hilluzination.de>). Cheers, -Hilko

...@ -1015,12 +1015,19 @@ PKG_CHECK_MODULES([HIVEX], [hivex],[ AM_CONDITIONAL([HAVE_HIVEX],[test "x$HIVEX_LIBS" != "x"]) dnl systemd journal library (optional) -PKG_CHECK_MODULES([SD_JOURNAL], [libsystemd-journal >= 196],[ +PKG_CHECK_MODULES([SD_JOURNAL], [libsystemd],[ AC_SUBST([SD_JOURNAL_CFLAGS]) AC_SUBST([SD_JOURNAL_LIBS]) AC_DEFINE([HAVE_SD_JOURNAL],[1],[systemd journal library found at compile time.]) -], - [AC_MSG_WARN([systemd journal library not found, some features will be disabled])]) +],[ + PKG_CHECK_MODULES([SD_JOURNAL], [libsystemd-journal &gt...

...+ echo "*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf" + echo "*** so that the correct libraries are found at run-time)" + fi + fi + XMMS_CFLAGS="" + XMMS_LIBS="" + ifelse([$3], , :, [$3]) +fi +AC_SUBST(XMMS_CFLAGS) +AC_SUBST(XMMS_LIBS) +AC_SUBST(XMMS_VERSION) +AC_SUBST(XMMS_DATA_DIR) +AC_SUBST(XMMS_PLUGIN_DIR) +AC_SUBST(XMMS_VISUALIZATION_PLUGIN_DIR) +AC_SUBST(XMMS_INPUT_PLUGIN_DIR) +AC_SUBST(XMMS_OUTPUT_PLUGIN_DIR) +AC_SUBST(XMMS_GENERAL_PLUGIN_DIR) +AC_SUBST(XMMS_EFFECT_PLUGIN_DIR) +])

Building against multiple versions of Python is a lot of fun as it is. Add autoconf/automake/libtool (and possible distribution-specific stuff) to the mix and things get really interesting: On Debian and Ubuntu, building against python 3.3 requires an extra include path as documented in <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=692387>. As discussed in

...om> --- configure.ac | 6 ++++++ include/speex/speexdsp_config_types.h.in | 8 +------- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/configure.ac b/configure.ac index 2cd2d1e..1de0c23 100644 --- a/configure.ac +++ b/configure.ac @@ -334,6 +334,12 @@ AC_SUBST([USIZE16]) AC_SUBST([SIZE32]) AC_SUBST([USIZE32]) +AS_IF([test "$ac_cv_header_stdint_h" = "yes"], [INCLUDE_STDINT="#include <stdint.h>"], + [test "$ac_cv_header_inttypes_h" = "yes"], [INCLUDE_STDINT="#include <inttypes.h&g...

...t;@)"` PYTHON_VERSION="$PYTHON_VERSION_MAJOR.$PYTHON_VERSION_MINOR" AC_MSG_RESULT([$PYTHON_VERSION]) + # Debian: python-2.7.pc, python-3.2.pc PKG_CHECK_MODULES([PYTHON], [python-"$PYTHON_VERSION"],[ + have_python_module=1 AC_SUBST([PYTHON_CFLAGS]) AC_SUBST([PYTHON_LIBS]) AC_SUBST([PYTHON_VERSION]) AC_DEFINE([HAVE_PYTHON],[1],[Python library found at compile time]) ],[ PKG_CHECK_MODULES([PYTHON], [python],[ + have_python_module=1 AC_S...

"AM_INIT_AUTOMAKE(foreign) dnl ..." seems to trigger Debian bug#738716 --- configure.ac | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac index ee9d377..df31014 100644 --- a/configure.ac +++ b/configure.ac @@ -35,7 +35,8 @@ AC_CONFIG_MACRO_DIR([m4]) AC_USE_SYSTEM_EXTENSIONS AC_SYS_LARGEFILE -AM_INIT_AUTOMAKE(foreign) dnl NB: Do not

...in Otte <otte@gnome.org> Date: Sun Apr 22 12:43:59 2007 +0200 replace all FOO_REQUIRES with FOO_VER diff --git a/configure.ac b/configure.ac index eafc8fb..4a55cfc 100644 --- a/configure.ac +++ b/configure.ac @@ -69,7 +69,7 @@ if test "$HAVE_GLIB" = "no"; then fi AC_SUBST(GLIB_LIBS) AC_SUBST(GLIB_CFLAGS) -AC_SUBST(GLIB_REQUIRES) +AC_SUBST(GLIB_VER) dnl FIXME: detect these executables correctly GLIB_GENMARSHAL=glib-genmarshal AC_SUBST(GLIB_GENMARSHAL) @@ -92,17 +92,17 @@ AC_ARG_ENABLE(gtk, dnl dnl GTK: We want this for swfdec-gtk dnl -GTK_REQUIRES=2.8.0 -AC_S...

Two (not related to each other) refactorings: Patches 1-12 split configure.ac into smaller files using the m4_include mechanism. Patches 13-15 split out parts of guestfs.pod (ie. guestfs(3)) into three new manual pages: guestfs-hacking(3) - how to extend and contribute to libguestfs guestfs-internals(3) - architecture and internals guestfs-security(3) - security and CVEs Patch 16 is a