Commit 70d2667c authored by Owen Taylor's avatar Owen Taylor Committed by Owen Taylor

Add 3rd argument to remaining AC_DEFINES(), so we can get rid of

Tue Dec  3 21:10:28 2002  Owen Taylor  <otaylor@redhat.com>

        * configure.in: Add 3rd argument to remaining AC_DEFINES(),
        so we can get rid of acconfig.h. (#76334, Daniel Egger)

        * acconfig.h: Removed.
parent faa29f03
Tue Dec 3 21:10:28 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Add 3rd argument to remaining AC_DEFINES(),
so we can get rid of acconfig.h. (#76334, Daniel Egger)
* acconfig.h: Removed.
Tue Dec 3 20:22:27 2002 Owen Taylor <otaylor@redhat.com>
* glib/*.c: Patch from Sven Neumann to make the
......
Tue Dec 3 21:10:28 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Add 3rd argument to remaining AC_DEFINES(),
so we can get rid of acconfig.h. (#76334, Daniel Egger)
* acconfig.h: Removed.
Tue Dec 3 20:22:27 2002 Owen Taylor <otaylor@redhat.com>
* glib/*.c: Patch from Sven Neumann to make the
......
Tue Dec 3 21:10:28 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Add 3rd argument to remaining AC_DEFINES(),
so we can get rid of acconfig.h. (#76334, Daniel Egger)
* acconfig.h: Removed.
Tue Dec 3 20:22:27 2002 Owen Taylor <otaylor@redhat.com>
* glib/*.c: Patch from Sven Neumann to make the
......
Tue Dec 3 21:10:28 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Add 3rd argument to remaining AC_DEFINES(),
so we can get rid of acconfig.h. (#76334, Daniel Egger)
* acconfig.h: Removed.
Tue Dec 3 20:22:27 2002 Owen Taylor <otaylor@redhat.com>
* glib/*.c: Patch from Sven Neumann to make the
......
Tue Dec 3 21:10:28 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Add 3rd argument to remaining AC_DEFINES(),
so we can get rid of acconfig.h. (#76334, Daniel Egger)
* acconfig.h: Removed.
Tue Dec 3 20:22:27 2002 Owen Taylor <otaylor@redhat.com>
* glib/*.c: Patch from Sven Neumann to make the
......
Tue Dec 3 21:10:28 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Add 3rd argument to remaining AC_DEFINES(),
so we can get rid of acconfig.h. (#76334, Daniel Egger)
* acconfig.h: Removed.
Tue Dec 3 20:22:27 2002 Owen Taylor <otaylor@redhat.com>
* glib/*.c: Patch from Sven Neumann to make the
......
Tue Dec 3 21:10:28 2002 Owen Taylor <otaylor@redhat.com>
* configure.in: Add 3rd argument to remaining AC_DEFINES(),
so we can get rid of acconfig.h. (#76334, Daniel Egger)
* acconfig.h: Removed.
Tue Dec 3 20:22:27 2002 Owen Taylor <otaylor@redhat.com>
* glib/*.c: Patch from Sven Neumann to make the
......
/* GLIB - Library of useful routines for C programming
* Copyright (C) 1995-1997 Peter Mattis, Spencer Kimball and Josh MacDonald
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
* License as published by the Free Software Foundation; either
* version 2 of the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public
* License along with this library; if not, write to the
* Free Software Foundation, Inc., 59 Temple Place - Suite 330,
* Boston, MA 02111-1307, USA.
*/
/* acconfig.h
This file is in the public domain.
Descriptive text for the C preprocessor macros that
the distributed Autoconf macros can define.
No software package will use all of them; autoheader copies the ones
your configure.in uses into your configuration header file templates.
The entries are in sort -df order: alphabetical, case insensitive,
ignoring punctuation (such as underscores). Although this order
can split up related entries, it makes it easier to check whether
a given entry is in the file.
Leave the following blank line there!! Autoheader needs it. */
/* Other stuff */
/* #undef PACKAGE */
/* #undef VERSION */
/* Leave that blank line there!! Autoheader needs it.
If you're adding to this file, keep in mind:
The entries are in sort -df order: alphabetical, case insensitive,
ignoring punctuation (such as underscores). */
#undef ENABLE_NLS
#undef GETTEXT_PACKAGE
#undef GLIB_LOCALE_DIR
#undef HAVE_GETTEXT
#undef HAVE_LC_MESSAGES
#undef SANE_MALLOC_PROTOS
#undef USE_LIBICONV_GNU
#undef USE_LIBICONV_NATIVE
......@@ -348,12 +348,14 @@ LIBS="$LIBS $INTLLIBS"
GETTEXT_PACKAGE=glib20
AC_SUBST(GETTEXT_PACKAGE)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE")
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",
[Define the gettext package to be used])
# AM_GLIB_GNU_GETTEXT above substs $DATADIRNAME
# this is the directory where the *.{mo,gmo} files are installed
GLIB_LOCALE_DIR="${prefix}/${DATADIRNAME}/locale"
AC_DEFINE_UNQUOTED(GLIB_LOCALE_DIR,"$GLIB_LOCALE_DIR")
AC_DEFINE_UNQUOTED(GLIB_LOCALE_DIR, "$GLIB_LOCALE_DIR",
[Define the location where the catalogs will be installed])
AC_CHECK_FUNCS(bind_textdomain_codeset)
......@@ -371,10 +373,10 @@ AC_SUBST(ICONV_LIBS)
case $with_libiconv in
gnu)
AC_DEFINE(USE_LIBICONV_GNU, [Using GNU libiconv])
AC_DEFINE(USE_LIBICONV_GNU, 1, [Using GNU libiconv])
;;
native)
AC_DEFINE(USE_LIBICONV_NATIVE, [Using a native implementation of iconv in a separate library])
AC_DEFINE(USE_LIBICONV_NATIVE, 1, [Using a native implementation of iconv in a separate library])
;;
esac
......@@ -516,7 +518,8 @@ if test "x$GCC" = "xyes"; then
my_free_p = 0;
my_realloc_p = 0;
],
AC_DEFINE(SANE_MALLOC_PROTOS)
AC_DEFINE(SANE_MALLOC_PROTOS, 1,
[Define if you have correct malloc prototypes])
SANE_MALLOC_PROTOS=yes)
fi
AC_MSG_RESULT($SANE_MALLOC_PROTOS)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment