From 051739c91a14cdda5213d4c95afac6b2b0383ffe Mon Sep 17 00:00:00 2001 From: Javier Jardón Date: Tue, 15 Feb 2011 21:21:37 +0000 Subject: Use the standard configure.ac instead configure.in --- configure.ac | 119 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ configure.in | 119 ----------------------------------------------------------- 2 files changed, 119 insertions(+), 119 deletions(-) create mode 100644 configure.ac delete mode 100644 configure.in diff --git a/configure.ac b/configure.ac new file mode 100644 index 00000000..3cff53e5 --- /dev/null +++ b/configure.ac @@ -0,0 +1,119 @@ +AC_INIT([Zenity],[2.91.5],[http://bugzilla.gnome.org/enter_bug.cgi?product=zenity],[zenity]) + +AC_PREREQ([2.63]) + +AC_CONFIG_HEADERS([config.h]) +AC_CONFIG_SRCDIR([src]) +AC_CONFIG_MACRO_DIR([m4]) + +AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2 no-dist-gzip]) +AM_MAINTAINER_MODE([enable]) + +m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) + +# Check for programs +AC_PROG_CC + +GTK_REQUIRED=2.91.0 + +PKG_CHECK_MODULES([ZENITY],[gtk+-3.0 >= $GTK_REQUIRED glib-2.0]) +AC_SUBST([ZENITY_CFLAGS]) +AC_SUBST([ZENITY_LIBS]) + +dnl ************************* +dnl Check for the GTK+ backend, if it's X11, we -lX11 +dnl ************************* + +zenity_save_cflags="$CFLAGS" +# pull in the CFLAGS to locate gdkconfig.h +CFLAGS=`$PKG_CONFIG --cflags gtk+-3.0` +AC_COMPILE_IFELSE([ +#include + +int main(void) { +#ifndef GDK_WINDOWING_X11 +#error GDK_WINDOWING_X11 not defined +#endif + return 0; +} +], + GDK_BACKEND_X11=yes, + GDK_BACKEND_X11=no) + +CFLAGS="$zenity_save_cflags" + +if test "x$GDK_BACKEND_X11" = "xyes"; then + PKG_CHECK_MODULES(X, x11) + ZENITY_CFLAGS="$ZENITY_CFLAGS $X_CFLAGS" + ZENITY_LIBS="$ZENITY_LIBS $X_LIBS" +fi + +# ******************************* +# perl check +# ******************************* + +AC_PATH_PROG([PERL],[perl],) + +# ******************************* +# libnotify check +# ******************************* + +LIBNOTIFY_REQUIRED=0.6.1 + +AC_ARG_ENABLE([libnotify], + [AS_HELP_STRING([--enable-libnotify], + [Enable libnotify support])], + [], + [enable_libnotify=yes]) + +if test x$enable_libnotify = xyes; then + PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= $LIBNOTIFY_REQUIRED], + [HAVE_LIBNOTIFY="yes"],[HAVE_LIBNOTIFY="no"]) + AC_SUBST([LIBNOTIFY_CFLAGS]) + AC_SUBST([LIBNOTIFY_LIBS]) + if test "x$HAVE_LIBNOTIFY" = "xyes"; then + AC_DEFINE([HAVE_LIBNOTIFY], [1], [libnotify is available on this machine]) + fi +fi + +# ******************************* +# Debug +# ******************************* + +GNOME_DEBUG_CHECK +GNOME_COMPILE_WARNINGS([maximum]) + +# ******************************* +# Internationalization +# ******************************* +IT_PROG_INTLTOOL([0.40.0]) + +GETTEXT_PACKAGE=zenity +AC_SUBST([GETTEXT_PACKAGE]) +AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext domain]) + +AM_GLIB_GNU_GETTEXT + +# ******************************* +# User manual +# ******************************* +GNOME_DOC_INIT + +# ******************************* + +AC_SUBST([AM_CPPFLAGS]) +AC_SUBST([AM_CFLAGS]) +AC_SUBST([AM_LDFLAGS]) + +# ******************************* + +AC_CONFIG_FILES([ +Makefile +po/Makefile.in +src/Makefile +src/gdialog +data/Makefile +help/Makefile +]) + +AC_OUTPUT diff --git a/configure.in b/configure.in deleted file mode 100644 index 3cff53e5..00000000 --- a/configure.in +++ /dev/null @@ -1,119 +0,0 @@ -AC_INIT([Zenity],[2.91.5],[http://bugzilla.gnome.org/enter_bug.cgi?product=zenity],[zenity]) - -AC_PREREQ([2.63]) - -AC_CONFIG_HEADERS([config.h]) -AC_CONFIG_SRCDIR([src]) -AC_CONFIG_MACRO_DIR([m4]) - -AM_INIT_AUTOMAKE([1.10 foreign dist-bzip2 no-dist-gzip]) -AM_MAINTAINER_MODE([enable]) - -m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])]) - -# Check for programs -AC_PROG_CC - -GTK_REQUIRED=2.91.0 - -PKG_CHECK_MODULES([ZENITY],[gtk+-3.0 >= $GTK_REQUIRED glib-2.0]) -AC_SUBST([ZENITY_CFLAGS]) -AC_SUBST([ZENITY_LIBS]) - -dnl ************************* -dnl Check for the GTK+ backend, if it's X11, we -lX11 -dnl ************************* - -zenity_save_cflags="$CFLAGS" -# pull in the CFLAGS to locate gdkconfig.h -CFLAGS=`$PKG_CONFIG --cflags gtk+-3.0` -AC_COMPILE_IFELSE([ -#include - -int main(void) { -#ifndef GDK_WINDOWING_X11 -#error GDK_WINDOWING_X11 not defined -#endif - return 0; -} -], - GDK_BACKEND_X11=yes, - GDK_BACKEND_X11=no) - -CFLAGS="$zenity_save_cflags" - -if test "x$GDK_BACKEND_X11" = "xyes"; then - PKG_CHECK_MODULES(X, x11) - ZENITY_CFLAGS="$ZENITY_CFLAGS $X_CFLAGS" - ZENITY_LIBS="$ZENITY_LIBS $X_LIBS" -fi - -# ******************************* -# perl check -# ******************************* - -AC_PATH_PROG([PERL],[perl],) - -# ******************************* -# libnotify check -# ******************************* - -LIBNOTIFY_REQUIRED=0.6.1 - -AC_ARG_ENABLE([libnotify], - [AS_HELP_STRING([--enable-libnotify], - [Enable libnotify support])], - [], - [enable_libnotify=yes]) - -if test x$enable_libnotify = xyes; then - PKG_CHECK_MODULES([LIBNOTIFY], [libnotify >= $LIBNOTIFY_REQUIRED], - [HAVE_LIBNOTIFY="yes"],[HAVE_LIBNOTIFY="no"]) - AC_SUBST([LIBNOTIFY_CFLAGS]) - AC_SUBST([LIBNOTIFY_LIBS]) - if test "x$HAVE_LIBNOTIFY" = "xyes"; then - AC_DEFINE([HAVE_LIBNOTIFY], [1], [libnotify is available on this machine]) - fi -fi - -# ******************************* -# Debug -# ******************************* - -GNOME_DEBUG_CHECK -GNOME_COMPILE_WARNINGS([maximum]) - -# ******************************* -# Internationalization -# ******************************* -IT_PROG_INTLTOOL([0.40.0]) - -GETTEXT_PACKAGE=zenity -AC_SUBST([GETTEXT_PACKAGE]) -AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext domain]) - -AM_GLIB_GNU_GETTEXT - -# ******************************* -# User manual -# ******************************* -GNOME_DOC_INIT - -# ******************************* - -AC_SUBST([AM_CPPFLAGS]) -AC_SUBST([AM_CFLAGS]) -AC_SUBST([AM_LDFLAGS]) - -# ******************************* - -AC_CONFIG_FILES([ -Makefile -po/Makefile.in -src/Makefile -src/gdialog -data/Makefile -help/Makefile -]) - -AC_OUTPUT -- cgit