From 0686de0f159bff6e8b1c2e510384b1c6dde80108 Mon Sep 17 00:00:00 2001 From: Nathan Scott Date: Thu, 15 May 2003 01:38:57 +0000 Subject: [PATCH] Additional uuid changes - last round didnt work with all autoconf versions. --- aclocal.m4 | 42 +++++++++++++++++++++++------------------- configure.in | 5 +++-- include/builddefs.in | 1 - m4/package_uuiddev.m4 | 23 ++++++++++++++--------- 4 files changed, 40 insertions(+), 31 deletions(-) diff --git a/aclocal.m4 b/aclocal.m4 index 5cc135cf7..2679de5f1 100644 --- a/aclocal.m4 +++ b/aclocal.m4 @@ -1,15 +1,14 @@ -# aclocal.m4 generated automatically by aclocal 1.6.3 -*- Autoconf -*- +dnl aclocal.m4 generated automatically by aclocal 1.4-p6 -# Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2002 -# Free Software Foundation, Inc. -# This file is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. +dnl Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. +dnl This file is free software; the Free Software Foundation +dnl gives unlimited permission to copy and/or distribute it, +dnl with or without modifications, as long as this notice is preserved. -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. +dnl This program is distributed in the hope that it will be useful, +dnl but WITHOUT ANY WARRANTY, to the extent permitted by law; without +dnl even the implied warranty of MERCHANTABILITY or FITNESS FOR A +dnl PARTICULAR PURPOSE. # # Generic macro, sets up all of the global packaging variables. @@ -173,28 +172,33 @@ AC_DEFUN([AC_PACKAGE_UTILITIES], AC_SUBST(rpmbuild) ]) -AC_DEFUN([AC_PACKAGE_NEED_UUID_UUID_H], - [ AC_CHECK_HEADERS(uuid/uuid.h,, [ - AC_CHECK_HEADER(uuid.h,, [ +AC_DEFUN([AC_PACKAGE_NEED_UUID_H], + [ AC_CHECK_HEADERS(uuid.h) + if test $ac_cv_header_uuid_h = no; then + AC_CHECK_HEADERS(uuid/uuid.h,, [ echo echo 'FATAL ERROR: could not find a valid UUID header.' echo 'Install the Universally Unique Identifiers development package.' exit 1]) - ]) + fi ]) -AC_DEFUN([AC_PACKAGE_NEED_UUIDCOMPARE_LIBUUID], - [ AC_CHECK_LIB(uuid, uuid_compare,, [ - AC_CHECK_FUNCS(uuid_compare,, [ +AC_DEFUN([AC_PACKAGE_NEED_UUIDCOMPARE], + [ AC_CHECK_FUNCS(uuid_compare) + if test $ac_cv_func_uuid_compare = no; then + AC_CHECK_LIB(uuid, uuid_compare, [libuuid=/usr/lib/libuuid.a], [ echo echo 'FATAL ERROR: could not find a valid UUID library.' echo 'Install the Universally Unique Identifiers library package.' exit 1]) - ]) - libuuid="/usr/lib/libuuid.a" + fi AC_SUBST(libuuid) ]) +AC_DEFUN([AC_PACKAGE_CHECK_LIBUUID], + [ test $pkg_platform = freebsd && libuuid="" + ]) + # # Check if we have a type for the pointer's size integer (__psint_t) # diff --git a/configure.in b/configure.in index 226714002..b091a4796 100644 --- a/configure.in +++ b/configure.in @@ -28,13 +28,14 @@ AC_SUBST(enable_editline) AC_PACKAGE_GLOBALS(xfsprogs) AC_PACKAGE_UTILITIES(xfsprogs) -AC_PACKAGE_NEED_UUID_UUID_H -AC_PACKAGE_NEED_UUIDCOMPARE_LIBUUID +AC_PACKAGE_NEED_UUID_H +AC_PACKAGE_NEED_UUIDCOMPARE AC_ARG_ENABLE(shared-uuid, [ --enable-shared-uuid=[yes/no] Link shared libuuid [default=no].], libuuid="/usr/lib/libuuid.a" test "$enable_shared_uuid" = yes && libuuid="-luuid", libuuid="/usr/lib/libuuid.a") +AC_PACKAGE_CHECK_LIBUUID AC_SUBST(libuuid) AC_TYPE_PSINT diff --git a/include/builddefs.in b/include/builddefs.in index 17e9db49a..b6ed182ce 100644 --- a/include/builddefs.in +++ b/include/builddefs.in @@ -107,7 +107,6 @@ endif ifeq ($(PKG_PLATFORM),freebsd) PLDLIBS = -L/usr/local/lib -lintl PCFLAGS = -I/usr/local/include -LIBUUID = endif GCFLAGS += -O1 $(OPTIMIZER) $(DEBUG) -funsigned-char -Wall -I$(TOPDIR)/include \ diff --git a/m4/package_uuiddev.m4 b/m4/package_uuiddev.m4 index ef33dc7ca..1e406772c 100644 --- a/m4/package_uuiddev.m4 +++ b/m4/package_uuiddev.m4 @@ -1,21 +1,26 @@ -AC_DEFUN([AC_PACKAGE_NEED_UUID_UUID_H], - [ AC_CHECK_HEADERS(uuid/uuid.h,, [ - AC_CHECK_HEADER(uuid.h,, [ +AC_DEFUN([AC_PACKAGE_NEED_UUID_H], + [ AC_CHECK_HEADERS(uuid.h) + if test $ac_cv_header_uuid_h = no; then + AC_CHECK_HEADERS(uuid/uuid.h,, [ echo echo 'FATAL ERROR: could not find a valid UUID header.' echo 'Install the Universally Unique Identifiers development package.' exit 1]) - ]) + fi ]) -AC_DEFUN([AC_PACKAGE_NEED_UUIDCOMPARE_LIBUUID], - [ AC_CHECK_LIB(uuid, uuid_compare,, [ - AC_CHECK_FUNCS(uuid_compare,, [ +AC_DEFUN([AC_PACKAGE_NEED_UUIDCOMPARE], + [ AC_CHECK_FUNCS(uuid_compare) + if test $ac_cv_func_uuid_compare = no; then + AC_CHECK_LIB(uuid, uuid_compare, [libuuid=/usr/lib/libuuid.a], [ echo echo 'FATAL ERROR: could not find a valid UUID library.' echo 'Install the Universally Unique Identifiers library package.' exit 1]) - ]) - libuuid="/usr/lib/libuuid.a" + fi AC_SUBST(libuuid) ]) + +AC_DEFUN([AC_PACKAGE_CHECK_LIBUUID], + [ test $pkg_platform = freebsd && libuuid="" + ]) -- 2.47.2