From f0e00443ad923090de1d416266ff631824b7156d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20Jard=C3=B3n?= Date: Thu, 17 Feb 2011 11:41:15 +0000 Subject: [PATCH 1/2] configure: Use the recommended configure.ac instead configure.in --- configure.ac | 164 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.in | 164 ---------------------------------------------------------- 2 files changed, 164 insertions(+), 164 deletions(-) create mode 100644 configure.ac delete mode 100644 configure.in diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..e58157d --- /dev/null +++ b/configure.ac @@ -0,0 +1,164 @@ + +AC_INIT(pkg-config.1) + +AM_INIT_AUTOMAKE(pkg-config, 0.25) +AM_MAINTAINER_MODE + +AM_CONFIG_HEADER(config.h) + +AM_PROG_LIBTOOL +dnl when using libtool 2.x create libtool early, because it's used in configure +m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) + +AC_PROG_CC + +AC_DEFUN([PKG_CONFIG_FIND_PC_PATH], +[ +AC_MSG_CHECKING([for default search path for .pc files]) +AC_ARG_WITH(pc_path, + [ --with-pc-path Override the default search path for .pc files ], + [ pc_path="$withval" ], + [ +# This is slightly wrong, but hopefully causes less confusion than +# people being unable to find their .pc files in the standard location. +if test "${prefix}" = "NONE"; then + pc_path='${libdir}/pkgconfig:${datadir}/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig' +else + pc_path='${libdir}/pkgconfig:${datadir}/pkgconfig' +fi +]) + AC_MSG_RESULT([$pc_path]) + AC_SUBST([pc_path]) + +]) + +PKG_CONFIG_FIND_PC_PATH + +# +# Code taken from gtk+-2.0's configure.in. +# +# This causes pkg-config to not list private dependencies (a very +# common example is libm) on platforms which support inter-library +# dependencies. + +AC_ARG_ENABLE(indirect-deps, + [AC_HELP_STRING([--enable-indirect-deps], + [list both direct and indirect dependencies.]) +AC_HELP_STRING([--disable-indirect-deps], + [only list direct dependencies.]) + [default=auto]],use_indirect_deps=$enableval, + [use_indirect_deps=auto]) +echo use_indirect_deps=$use_indirect_deps >&AS_MESSAGE_LOG_FD +AC_MSG_CHECKING([whether to list both direct and indirect dependencies]) +case $use_indirect_deps in + auto) + deplibs_check_method=`(./libtool --config; echo eval echo '\"$deplibs_check_method\"') | sh` + if test "X$deplibs_check_method" = Xnone; then + echo "foo: $deplibs_check_method" >&AS_MESSAGE_LOG_FD + use_indirect_deps=yes + else + use_indirect_deps=no + fi + ;; + yes|no) + ;; + *) AC_MSG_ERROR([Value given to --enable-indirect-deps must be one of yes, no +or auto]) + ;; +esac +AC_MSG_RESULT($use_indirect_deps) + +# +# Choose default CFLAGS and warnings depending on compiler. +# + +WARN_CFLAGS="" +if test "${GCC}" = "yes" && test "${ac_env_CFLAGS_set}" != "set"; then + WARN_CFLAGS="-g -Wall -O2" +fi +AC_SUBST(WARN_CFLAGS) + +AC_DEFINE_UNQUOTED(ENABLE_INDIRECT_DEPS, `test $use_indirect_deps = no; echo $?`, [Link library to all dependent libraries, not only directly needed ones]) +AC_SUBST(use_indirect_deps) + +AC_MSG_CHECKING([for Win32]) +case "$host" in + *-*-mingw*) + native_win32=yes + ;; + *) + native_win32=no + ;; +esac +AC_MSG_RESULT([$native_win32]) + +case "$libdir" in +*lib64) AC_DEFINE(PREFER_LIB64,1,[Define if your native architecture defines libdir to be $prefix/lib64 instead of $prefix/lib.]) ;; +*) : ;; +esac + +if test x$native_win32 = xyes; then + # On Win32, use the normal installed GLib. Yes, this is a circular + # dependency. But then, only experienced hackers that presumably can + # work around that will be building pkg-config and GLib on Win32 + # anyway (especially using the auto*/configure/libtool + # mechanism). Others use prebuilt versions. + # + # These are correct for GLib 2.x + GLIB_CFLAGS="-I$includedir/glib-2.0 -I$libdir/glib-2.0/include" + GLIB_LIBS="-L$libdir -lglib-2.0 -liconv -lintl" + use_installed_glib=yes +else + use_installed_glib=no + AC_ARG_WITH([installed-glib], + [ --with-installed-glib Use installed Glib-2.x], [ + if test x$withval = xyes; then + # Not on Win32, but the user requested to use the installed Glib-2.x, + # therefore we may assume that (some older version of) pkg-config can + # be found in the users PATH (otherwise we simply ignore the request). + AC_CHECK_PROGS([PKG_CONFIG], [pkg-config], []) + if test -n $PKG_CONFIG && $PKG_CONFIG --exists glib-2.0; then + GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0` + GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0` + use_installed_glib=yes + fi + fi + ]) +fi # !use_installed_glib + +AM_CONDITIONAL(USE_INSTALLED_GLIB, test x$use_installed_glib = xyes) + +if test x$use_installed_glib = xyes; then + AC_DEFINE(USE_INSTALLED_GLIB, 1, [We are using an installed GLib]) + AC_SUBST(GLIB_LIBS) + AC_SUBST(GLIB_CFLAGS) + +else + AC_CONFIG_SUBDIRS(glib-1.2.10) +fi # !native_win32 + +AC_ARG_WITH([installed-popt], + [AS_HELP_STRING([--with-installed-popt], [use installed popt library])], + [with_installed_popt="$withval"], + [with_installed_popt=no]) +if test "x$with_installed_popt" = xyes; then + _save_libs="$LIBS" + AC_CHECK_LIB([popt], [poptGetContext], [:], + [AC_MSG_ERROR([could not link to installed popt library])]) + LIBS="$_save_libs" + POPT_LIBS=-lpopt +else + POPT_LIBS="" +fi +AC_SUBST([POPT_LIBS]) +AM_CONDITIONAL([USE_INSTALLED_POPT], [test "x$with_installed_popt" = xyes]) + +AC_FUNC_ALLOCA + +AC_CHECK_FUNCS(setresuid setreuid,break) +AC_CHECK_HEADERS([dirent.h unistd.h sys/wait.h malloc.h]) + +AC_OUTPUT([Makefile + popt/Makefile + check/Makefile + check/config.sh]) diff --git a/configure.in b/configure.in deleted file mode 100644 index e58157d..0000000 --- a/configure.in +++ /dev/null @@ -1,164 +0,0 @@ - -AC_INIT(pkg-config.1) - -AM_INIT_AUTOMAKE(pkg-config, 0.25) -AM_MAINTAINER_MODE - -AM_CONFIG_HEADER(config.h) - -AM_PROG_LIBTOOL -dnl when using libtool 2.x create libtool early, because it's used in configure -m4_ifdef([LT_OUTPUT], [LT_OUTPUT]) - -AC_PROG_CC - -AC_DEFUN([PKG_CONFIG_FIND_PC_PATH], -[ -AC_MSG_CHECKING([for default search path for .pc files]) -AC_ARG_WITH(pc_path, - [ --with-pc-path Override the default search path for .pc files ], - [ pc_path="$withval" ], - [ -# This is slightly wrong, but hopefully causes less confusion than -# people being unable to find their .pc files in the standard location. -if test "${prefix}" = "NONE"; then - pc_path='${libdir}/pkgconfig:${datadir}/pkgconfig:/usr/lib/pkgconfig:/usr/share/pkgconfig' -else - pc_path='${libdir}/pkgconfig:${datadir}/pkgconfig' -fi -]) - AC_MSG_RESULT([$pc_path]) - AC_SUBST([pc_path]) - -]) - -PKG_CONFIG_FIND_PC_PATH - -# -# Code taken from gtk+-2.0's configure.in. -# -# This causes pkg-config to not list private dependencies (a very -# common example is libm) on platforms which support inter-library -# dependencies. - -AC_ARG_ENABLE(indirect-deps, - [AC_HELP_STRING([--enable-indirect-deps], - [list both direct and indirect dependencies.]) -AC_HELP_STRING([--disable-indirect-deps], - [only list direct dependencies.]) - [default=auto]],use_indirect_deps=$enableval, - [use_indirect_deps=auto]) -echo use_indirect_deps=$use_indirect_deps >&AS_MESSAGE_LOG_FD -AC_MSG_CHECKING([whether to list both direct and indirect dependencies]) -case $use_indirect_deps in - auto) - deplibs_check_method=`(./libtool --config; echo eval echo '\"$deplibs_check_method\"') | sh` - if test "X$deplibs_check_method" = Xnone; then - echo "foo: $deplibs_check_method" >&AS_MESSAGE_LOG_FD - use_indirect_deps=yes - else - use_indirect_deps=no - fi - ;; - yes|no) - ;; - *) AC_MSG_ERROR([Value given to --enable-indirect-deps must be one of yes, no -or auto]) - ;; -esac -AC_MSG_RESULT($use_indirect_deps) - -# -# Choose default CFLAGS and warnings depending on compiler. -# - -WARN_CFLAGS="" -if test "${GCC}" = "yes" && test "${ac_env_CFLAGS_set}" != "set"; then - WARN_CFLAGS="-g -Wall -O2" -fi -AC_SUBST(WARN_CFLAGS) - -AC_DEFINE_UNQUOTED(ENABLE_INDIRECT_DEPS, `test $use_indirect_deps = no; echo $?`, [Link library to all dependent libraries, not only directly needed ones]) -AC_SUBST(use_indirect_deps) - -AC_MSG_CHECKING([for Win32]) -case "$host" in - *-*-mingw*) - native_win32=yes - ;; - *) - native_win32=no - ;; -esac -AC_MSG_RESULT([$native_win32]) - -case "$libdir" in -*lib64) AC_DEFINE(PREFER_LIB64,1,[Define if your native architecture defines libdir to be $prefix/lib64 instead of $prefix/lib.]) ;; -*) : ;; -esac - -if test x$native_win32 = xyes; then - # On Win32, use the normal installed GLib. Yes, this is a circular - # dependency. But then, only experienced hackers that presumably can - # work around that will be building pkg-config and GLib on Win32 - # anyway (especially using the auto*/configure/libtool - # mechanism). Others use prebuilt versions. - # - # These are correct for GLib 2.x - GLIB_CFLAGS="-I$includedir/glib-2.0 -I$libdir/glib-2.0/include" - GLIB_LIBS="-L$libdir -lglib-2.0 -liconv -lintl" - use_installed_glib=yes -else - use_installed_glib=no - AC_ARG_WITH([installed-glib], - [ --with-installed-glib Use installed Glib-2.x], [ - if test x$withval = xyes; then - # Not on Win32, but the user requested to use the installed Glib-2.x, - # therefore we may assume that (some older version of) pkg-config can - # be found in the users PATH (otherwise we simply ignore the request). - AC_CHECK_PROGS([PKG_CONFIG], [pkg-config], []) - if test -n $PKG_CONFIG && $PKG_CONFIG --exists glib-2.0; then - GLIB_CFLAGS=`$PKG_CONFIG --cflags glib-2.0` - GLIB_LIBS=`$PKG_CONFIG --libs glib-2.0` - use_installed_glib=yes - fi - fi - ]) -fi # !use_installed_glib - -AM_CONDITIONAL(USE_INSTALLED_GLIB, test x$use_installed_glib = xyes) - -if test x$use_installed_glib = xyes; then - AC_DEFINE(USE_INSTALLED_GLIB, 1, [We are using an installed GLib]) - AC_SUBST(GLIB_LIBS) - AC_SUBST(GLIB_CFLAGS) - -else - AC_CONFIG_SUBDIRS(glib-1.2.10) -fi # !native_win32 - -AC_ARG_WITH([installed-popt], - [AS_HELP_STRING([--with-installed-popt], [use installed popt library])], - [with_installed_popt="$withval"], - [with_installed_popt=no]) -if test "x$with_installed_popt" = xyes; then - _save_libs="$LIBS" - AC_CHECK_LIB([popt], [poptGetContext], [:], - [AC_MSG_ERROR([could not link to installed popt library])]) - LIBS="$_save_libs" - POPT_LIBS=-lpopt -else - POPT_LIBS="" -fi -AC_SUBST([POPT_LIBS]) -AM_CONDITIONAL([USE_INSTALLED_POPT], [test "x$with_installed_popt" = xyes]) - -AC_FUNC_ALLOCA - -AC_CHECK_FUNCS(setresuid setreuid,break) -AC_CHECK_HEADERS([dirent.h unistd.h sys/wait.h malloc.h]) - -AC_OUTPUT([Makefile - popt/Makefile - check/Makefile - check/config.sh]) -- 1.7.4