Bug #622598: Complete quoting for macro parameters
Some square brackets were added to be more explicit where macro expansion will not be required. http://autogen.sourceforge.net/acquoting.html http://www.gnu.org/software/autoconf/manual/m4/Quoting-Arguments.html Signed-off-by: Markus Elfring <elfring@users.sourceforge.net>
This commit is contained in:
Markus Elfring
Curtis Gedak
parent
a30f991ca5
commit
c1e72d04ca
42
configure.in
42
configure.in
|
|
@ -1,6 +1,6 @@
|
|||
AC_INIT([gparted],[0.6.2-git],[https://bugzilla.gnome.org/enter_bug.cgi?product=gparted])
|
||||
|
||||
AC_CONFIG_SRCDIR(src/main.cc)
|
||||
AC_CONFIG_SRCDIR([src/main.cc])
|
||||
AC_CONFIG_HEADERS([config.h])
|
||||
AC_CONFIG_MACRO_DIR([m4])
|
||||
|
||||
|
|
@ -19,15 +19,15 @@ AM_PROG_LIBTOOL
|
|||
dnl======================
|
||||
dnl checks for other programs
|
||||
dnl======================
|
||||
AC_CHECK_PROG(GKSUPROG, gksu, gksu)
|
||||
AC_CHECK_PROG([GKSUPROG], [gksu], [gksu])
|
||||
|
||||
|
||||
dnl======================
|
||||
dnl i18n stuff
|
||||
dnl======================
|
||||
GETTEXT_PACKAGE=gparted
|
||||
AC_SUBST(GETTEXT_PACKAGE)
|
||||
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE",[description])
|
||||
AC_SUBST([GETTEXT_PACKAGE])
|
||||
AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE], "$GETTEXT_PACKAGE", [description])
|
||||
|
||||
AM_GLIB_GNU_GETTEXT
|
||||
IT_PROG_INTLTOOL([0.35.5])
|
||||
|
|
@ -36,16 +36,16 @@ IT_PROG_INTLTOOL([0.35.5])
|
|||
dnl======================
|
||||
dnl checks for libs
|
||||
dnl======================
|
||||
AC_CHECK_LIB(uuid, uuid_generate, [], AC_MSG_ERROR([*** uuid library (libuuid) not found]))
|
||||
AC_CHECK_LIB(dl, dlopen, [], AC_MSG_ERROR([*** dl library (libdl) not found]))
|
||||
AC_CHECK_LIB([uuid], [uuid_generate], [], AC_MSG_ERROR([*** uuid library (libuuid) not found]))
|
||||
AC_CHECK_LIB([dl], [dlopen], [], AC_MSG_ERROR([*** dl library (libdl) not found]))
|
||||
|
||||
|
||||
dnl libparted
|
||||
LIBPARTED_VERSION=1.7.1
|
||||
AC_MSG_CHECKING(for libparted >= $LIBPARTED_VERSION)
|
||||
AC_MSG_CHECKING([for libparted >= $LIBPARTED_VERSION])
|
||||
LIBS_save="$LIBS"
|
||||
LIBS="-lparted -luuid -ldl"
|
||||
AC_TRY_RUN(
|
||||
AC_TRY_RUN([
|
||||
#include <stdio.h>
|
||||
#include <parted/parted.h>
|
||||
|
||||
|
|
@ -78,7 +78,7 @@ int main ()
|
|||
|
||||
return 1 ;
|
||||
}
|
||||
,AC_MSG_RESULT(OK),AC_MSG_ERROR(*** Requires libparted >= $LIBPARTED_VERSION. Perhaps development header files missing?) )
|
||||
], AC_MSG_RESULT([OK]), AC_MSG_ERROR([*** Requires libparted >= $LIBPARTED_VERSION. Perhaps development header files missing?]))
|
||||
LIBS="$LIBS_save"
|
||||
|
||||
|
||||
|
|
@ -86,11 +86,11 @@ dnl======================
|
|||
dnl check whether libparted >= 2.2 (has improved partition table re-read code)
|
||||
dnl======================
|
||||
LIBPARTED_VERSION=2.2
|
||||
AC_MSG_CHECKING(if libparted >= $LIBPARTED_VERSION (has improved pt re-read))
|
||||
AC_MSG_CHECKING([if libparted >= $LIBPARTED_VERSION (has improved pt re-read)])
|
||||
LIBS_save="$LIBS"
|
||||
LIBS="-lparted -luuid -ldl"
|
||||
need_work_around=yes
|
||||
AC_TRY_RUN(
|
||||
AC_TRY_RUN([
|
||||
#include <stdio.h>
|
||||
#include <parted/parted.h>
|
||||
|
||||
|
|
@ -122,37 +122,37 @@ int main ()
|
|||
|
||||
return 1 ;
|
||||
}
|
||||
,[AC_MSG_RESULT(yes)
|
||||
], [AC_MSG_RESULT([yes])
|
||||
AC_DEFINE([HAVE_LIBPARTED_2_2_0_PLUS], [1], [Define to 1 if libparted contains improved partition table re-read code])
|
||||
need_pt_reread_work_around=no; support_sector_size_gt_512=yes]
|
||||
,[AC_MSG_RESULT(no)
|
||||
, [AC_MSG_RESULT([no])
|
||||
need_pt_reread_work_around=yes; support_sector_size_gt_512=no]
|
||||
)
|
||||
LIBS="$LIBS_save"
|
||||
|
||||
|
||||
dnl GTKMM
|
||||
PKG_CHECK_MODULES(GTKMM, gtkmm-2.4 > 2.8 )
|
||||
AC_SUBST(GTKMM_LIBS)
|
||||
AC_SUBST(GTKMM_CFLAGS)
|
||||
PKG_CHECK_MODULES([GTKMM], [gtkmm-2.4 > 2.8])
|
||||
AC_SUBST([GTKMM_LIBS])
|
||||
AC_SUBST([GTKMM_CFLAGS])
|
||||
|
||||
|
||||
dnl GTKMM 2.16 needed for gtk_show_uri()
|
||||
PKG_CHECK_EXISTS(gtkmm-2.4 >= 2.16.0,
|
||||
[AC_DEFINE(HAVE_GTK_SHOW_URI, 1, [Define to 1 if you have gtk_show_uri])],
|
||||
PKG_CHECK_EXISTS([gtkmm-2.4 >= 2.16.0],
|
||||
[AC_DEFINE([HAVE_GTK_SHOW_URI], 1, [Define to 1 if you have gtk_show_uri])],
|
||||
[])
|
||||
|
||||
|
||||
dnl======================
|
||||
dnl check whether to build documentation - Gnome-Doc-Utils
|
||||
dnl======================
|
||||
AC_ARG_ENABLE(doc,
|
||||
AC_ARG_ENABLE([doc],
|
||||
[ --disable-doc do not build documentation],,)
|
||||
if test "x${enable_doc}" = "x" ; then
|
||||
enable_doc=yes
|
||||
fi
|
||||
|
||||
AC_MSG_CHECKING(whether documentation should be built)
|
||||
AC_MSG_CHECKING([whether documentation should be built])
|
||||
if test ${enable_doc} = no; then
|
||||
AC_MSG_RESULT([no])
|
||||
else
|
||||
|
|
@ -168,7 +168,7 @@ else
|
|||
AC_DEFINE([HAVE_DISABLE_DOC], [1], [Define to 1 if --disable-doc specified])
|
||||
fi
|
||||
|
||||
AM_CONDITIONAL(DISABLE_DOC, test ${enable_doc} = no)
|
||||
AM_CONDITIONAL([DISABLE_DOC], [test ${enable_doc} = no])
|
||||
|
||||
|
||||
AC_CONFIG_FILES([
|
||||
|
|
|
|||
Loading…
Reference in New Issue