Commit f6fcb5d6 authored by cristy's avatar cristy

--no commit message

--no commit message
parent e0c94289
......@@ -46,7 +46,7 @@ while test $# -gt 0; do
echo "-I${includedir} -fopenmp"
;;
--cxxflags)
echo '-g -O2 -pthread'
echo '-pthread'
;;
--cppflags)
echo '-I/usr/local/include/ImageMagick'
......
......@@ -2540,6 +2540,7 @@ libdir = @libdir@
libexecdir = @libexecdir@
localedir = @localedir@
localstatedir = @localstatedir@
lt_ECHO = @lt_ECHO@
ltdl_LIBOBJS = @ltdl_LIBOBJS@
ltdl_LTLIBOBJS = @ltdl_LTLIBOBJS@
mandir = @mandir@
......@@ -2739,7 +2740,7 @@ CONFIG_EXTRA_DIST = \
config/type-windows.xml.in \
config/type.xml.in
LTDL_VERSION_INFO = -version-info 9:2:2
LTDL_VERSION_INFO = -version-info 9:1:2
@INSTALL_LTDL_TRUE@ltdlincludedir = $(includedir)/libltdl
@INSTALL_LTDL_TRUE@ltdlinclude_HEADERS = ltdl/libltdl/lt_system.h \
@INSTALL_LTDL_TRUE@ ltdl/libltdl/lt_error.h \
......
......@@ -22,7 +22,7 @@
<configure name="LDFLAGS" value="-L/usr/local/lib "/>
<configure name="LIBS" value="-lMagickCore -ltiff -lfreetype -ljasper -ljpeg -lpng -lfontconfig -lXext -lXt -lSM -lICE -lX11 -lbz2 -lxml2 -lz -lm -lgomp -lpthread -lltdl"/>
<configure name="CXX" value="g++"/>
<configure name="CXXFLAGS" value="-g -O2 -pthread"/>
<configure name="CXXFLAGS" value="-pthread"/>
<configure name="DISTCHECK_CONFIG_FLAGS" value="--disable-deprecated --with-quantum-depth=16 --with-umem=no --with-autotrace=no --with-gslib=no --with-fontpath= --with-perl=no"/>
<configure name="HOST" value="x86_64-unknown-linux-gnu"/>
<configure name="FEATURES" value="OpenMP "/>
......
This source diff could not be displayed because it is too large. You can view the blob instead.
This diff is collapsed.
......@@ -375,7 +375,7 @@ AC_ARG_WITH([threads],
have_threads=no
if test "$with_threads" != 'no'; then
AX_PTHREAD([])
AX_PTHREAD()
if test "$ax_pthread_ok" = yes; then
have_threads=yes
DEF_THREAD="$PTHREAD_CFLAGS"
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -36,7 +36,7 @@ AM_CPPFLAGS += -DLT_CONFIG_H='<$(LT_CONFIG_H)>' \
-DLTDL -I. -I$(srcdir) -Iltdl \
-I$(srcdir)/ltdl -I$(srcdir)/ltdl/libltdl
AM_LDFLAGS += -no-undefined
LTDL_VERSION_INFO = -version-info 9:2:2
LTDL_VERSION_INFO = -version-info 9:1:2
noinst_LTLIBRARIES += $(LT_DLLOADERS)
......
......@@ -14,7 +14,24 @@ It supports the following dlopen interfaces:
This file is part of GNU Libtool.
Copying and distribution of this file, with or without modification,
are permitted in any medium without royalty provided the copyright
notice and this notice are preserved. This file is offered as-is,
without warranty of any kind.
GNU Libtool is free software; you can redistribute it and/or
modify it under the terms of the GNU General Public License as
published by the Free Software Foundation; either version 2 of
the License, or (at your option) any later version.
As a special exception to the GNU General Public License,
if you distribute this file as part of a program or library that
is built using GNU Libtool, you may include this file under the
same distribution terms that you use for the rest of that program.
GNU Libtool 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 General Public License for more details.
You should have received a copy of the GNU General Public License
along with GNU Libtool; see the file COPYING. If not, a copy
can be downloaded from http://www.gnu.org/licenses/gpl.html,
or obtained by writing to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
......@@ -73,8 +73,8 @@ typedef struct {
LT_SCOPE int lt_dlloader_add (const lt_dlvtable *vtable);
LT_SCOPE lt_dlloader lt_dlloader_next (const lt_dlloader loader);
LT_SCOPE lt_dlvtable * lt_dlloader_remove (const char *name);
LT_SCOPE const lt_dlvtable *lt_dlloader_find (const char *name);
LT_SCOPE lt_dlvtable * lt_dlloader_remove (char *name);
LT_SCOPE const lt_dlvtable *lt_dlloader_find (char *name);
LT_SCOPE const lt_dlvtable *lt_dlloader_get (lt_dlloader loader);
......
/* slist.h -- generalised singly linked lists
Copyright (C) 2000, 2004, 2009 Free Software Foundation, Inc.
Copyright (C) 2000, 2004 Free Software Foundation, Inc.
Written by Gary V. Vaughan, 2000
NOTE: The canonical source of this file is maintained with the
......@@ -48,8 +48,6 @@ or obtained by writing to the Free Software Foundation, Inc.,
# define LT_SCOPE
#endif
#include <stddef.h>
#if defined(__cplusplus)
extern "C" {
#endif
......@@ -67,7 +65,7 @@ LT_SCOPE SList *slist_concat (SList *head, SList *tail);
LT_SCOPE SList *slist_cons (SList *item, SList *slist);
LT_SCOPE SList *slist_delete (SList *slist, void (*delete_fct) (void *item));
LT_SCOPE SList *slist_remove (SList **phead, SListCallback *find,
LT_SCOPE void * slist_remove (SList **phead, SListCallback *find,
void *matchdata);
LT_SCOPE SList *slist_reverse (SList *slist);
LT_SCOPE SList *slist_sort (SList *slist, SListCompare *compare,
......
/* loader-loadlibrary.c -- dynamic linking for Win32
Copyright (C) 1998, 1999, 2000, 2004, 2005, 2006,
2007, 2008, 2010 Free Software Foundation, Inc.
2007, 2008 Free Software Foundation, Inc.
Written by Thomas Tanner, 1998
NOTE: The canonical source of this file is maintained with the
......@@ -98,32 +98,12 @@ get_vtable (lt_user_data loader_data)
#include <windows.h>
#define LOCALFREE(mem) LT_STMT_START { \
if (mem) { LocalFree ((void *)mem); mem = NULL; } } LT_STMT_END
#define LOADLIB__SETERROR(errmsg) LT__SETERRORSTR (loadlibraryerror (errmsg))
#define LOADLIB_SETERROR(errcode) LOADLIB__SETERROR (LT__STRERROR (errcode))
static const char *loadlibraryerror (const char *default_errmsg);
static DWORD WINAPI wrap_getthreaderrormode (void);
static DWORD WINAPI fallback_getthreaderrormode (void);
static BOOL WINAPI wrap_setthreaderrormode (DWORD mode, DWORD *oldmode);
static BOOL WINAPI fallback_setthreaderrormode (DWORD mode, DWORD *oldmode);
typedef DWORD (WINAPI getthreaderrormode_type) (void);
typedef BOOL (WINAPI setthreaderrormode_type) (DWORD, DWORD *);
static getthreaderrormode_type *getthreaderrormode = wrap_getthreaderrormode;
static setthreaderrormode_type *setthreaderrormode = wrap_setthreaderrormode;
static char *error_message = 0;
/* A function called through the vtable when this loader is no
longer needed by the application. */
static int
vl_exit (lt_user_data LT__UNUSED loader_data)
{
vtable = NULL;
LOCALFREE (error_message);
return 0;
}
......@@ -176,7 +156,7 @@ vm_open (lt_user_data LT__UNUSED loader_data, const char *filename,
/* Append a `.' to stop Windows from adding an
implicit `.dll' extension. */
if (!len)
len = strlen (wpath);
len = LT_STRLEN (wpath);
if (len + 1 >= MAX_PATH)
{
......@@ -190,18 +170,16 @@ vm_open (lt_user_data LT__UNUSED loader_data, const char *filename,
}
{
/* Silence dialog from LoadLibrary on some failures. */
DWORD errormode = getthreaderrormode ();
DWORD last_error;
setthreaderrormode (errormode | SEM_FAILCRITICALERRORS, NULL);
/* Silence dialog from LoadLibrary on some failures.
No way to get the error mode, but to set it,
so set it twice to preserve any previous flags. */
UINT errormode = SetErrorMode(SEM_FAILCRITICALERRORS);
SetErrorMode(errormode | SEM_FAILCRITICALERRORS);
module = LoadLibrary (wpath);
/* Restore the error mode. */
last_error = GetLastError ();
setthreaderrormode (errormode, NULL);
SetLastError (last_error);
SetErrorMode(errormode);
}
/* libltdl expects this function to fail if it is unable
......@@ -229,9 +207,7 @@ vm_open (lt_user_data LT__UNUSED loader_data, const char *filename,
}
}
if (!module)
LOADLIB_SETERROR (CANNOT_OPEN);
else if (cur)
if (cur || !module)
{
LT__SETERROR (CANNOT_OPEN);
module = 0;
......@@ -249,9 +225,9 @@ vm_close (lt_user_data LT__UNUSED loader_data, lt_module module)
{
int errors = 0;
if (FreeLibrary ((HMODULE) module) == 0)
if (FreeLibrary((HMODULE) module) == 0)
{
LOADLIB_SETERROR (CANNOT_CLOSE);
LT__SETERROR (CANNOT_CLOSE);
++errors;
}
......@@ -268,102 +244,8 @@ vm_sym (lt_user_data LT__UNUSED loader_data, lt_module module, const char *name)
if (!address)
{
LOADLIB_SETERROR (SYMBOL_NOT_FOUND);
LT__SETERROR (SYMBOL_NOT_FOUND);
}
return address;
}
/* --- HELPER FUNCTIONS --- */
/* Return the windows error message, or the passed in error message on
failure. */
static const char *
loadlibraryerror (const char *default_errmsg)
{
size_t len;
LOCALFREE (error_message);
FormatMessageA (FORMAT_MESSAGE_ALLOCATE_BUFFER |
FORMAT_MESSAGE_FROM_SYSTEM |
FORMAT_MESSAGE_IGNORE_INSERTS,
NULL,
GetLastError (),
0,
(char *) &error_message,
0, NULL);
/* Remove trailing CRNL */
len = LT_STRLEN (error_message);
if (len && error_message[len - 1] == '\n')
error_message[--len] = LT_EOS_CHAR;
if (len && error_message[len - 1] == '\r')
error_message[--len] = LT_EOS_CHAR;
return len ? error_message : default_errmsg;
}
/* A function called through the getthreaderrormode variable which checks
if the system supports GetThreadErrorMode (or GetErrorMode) and arranges
for it or a fallback implementation to be called directly in the future.
The selected version is then called. */
static DWORD WINAPI
wrap_getthreaderrormode (void)
{
HMODULE kernel32 = GetModuleHandleA ("kernel32.dll");
getthreaderrormode
= (getthreaderrormode_type *) GetProcAddress (kernel32,
"GetThreadErrorMode");
if (!getthreaderrormode)
getthreaderrormode
= (getthreaderrormode_type *) GetProcAddress (kernel32,
"GetErrorMode");
if (!getthreaderrormode)
getthreaderrormode = fallback_getthreaderrormode;
return getthreaderrormode ();
}
/* A function called through the getthreaderrormode variable for cases
where the system does not support GetThreadErrorMode or GetErrorMode */
static DWORD WINAPI
fallback_getthreaderrormode (void)
{
/* Prior to Windows Vista, the only way to get the current error
mode was to set a new one. In our case, we are setting a new
error mode right after "getting" it while ignoring the error
mode in effect when setting the new error mode, so that's
fairly ok. */
return (DWORD) SetErrorMode (SEM_FAILCRITICALERRORS);
}
/* A function called through the setthreaderrormode variable which checks
if the system supports SetThreadErrorMode and arranges for it or a
fallback implementation to be called directly in the future.
The selected version is then called. */
static BOOL WINAPI
wrap_setthreaderrormode (DWORD mode, DWORD *oldmode)
{
HMODULE kernel32 = GetModuleHandleA ("kernel32.dll");
setthreaderrormode
= (setthreaderrormode_type *) GetProcAddress (kernel32,
"SetThreadErrorMode");
if (!setthreaderrormode)
setthreaderrormode = fallback_setthreaderrormode;
return setthreaderrormode (mode, oldmode);
}
/* A function called through the setthreaderrormode variable for cases
where the system does not support SetThreadErrorMode. */
static BOOL WINAPI
fallback_setthreaderrormode (DWORD mode, DWORD *oldmode)
{
/* Prior to Windows 7, there was no way to set the thread local error
mode, so set the process global error mode instead. */
DWORD old = (DWORD) SetErrorMode (mode);
if (oldmode)
*oldmode = old;
return TRUE;
}
......@@ -150,7 +150,7 @@ lt_dlloader_get (lt_dlloader loader)
modules need this loader; in either case, the loader list is not
changed if NULL is returned. */
lt_dlvtable *
lt_dlloader_remove (const char *name)
lt_dlloader_remove (char *name)
{
const lt_dlvtable * vtable = lt_dlloader_find (name);
static const char id_string[] = "lt_dlloader_remove";
......@@ -199,12 +199,12 @@ lt_dlloader_remove (const char *name)
/* If we got this far, remove the loader from our global list. */
return (lt_dlvtable *)
slist_unbox ((SList *) slist_remove (&loaders, loader_callback, (void *) name));
slist_unbox ((SList *) slist_remove (&loaders, loader_callback, name));
}
const lt_dlvtable *
lt_dlloader_find (const char *name)
lt_dlloader_find (char *name)
{
return lt_dlloader_get (slist_find (loaders, loader_callback, (void *) name));
return lt_dlloader_get (slist_find (loaders, loader_callback, name));
}
......@@ -208,7 +208,7 @@ LT_BEGIN_C_DECLS
LT_SCOPE const lt_dlvtable * get_vtable (lt_user_data data);
LT_END_C_DECLS
#ifdef HAVE_LIBDLLOADER
extern lt_dlsymlist preloaded_symbols[];
extern lt_dlsymlist preloaded_symbols;
#endif
/* Initialize libltdl. */
......@@ -234,7 +234,7 @@ lt_dlinit (void)
#ifdef HAVE_LIBDLLOADER
if (!errors)
{
errors += lt_dlpreload (preloaded_symbols);
errors += lt_dlpreload (&preloaded_symbols);
}
if (!errors)
......@@ -994,7 +994,7 @@ trim (char **dest, const char *str)
FREE (*dest);
if (!end || end == str)
if (!end)
return 1;
if (len > 3 && str[0] == '\'')
......@@ -1076,17 +1076,12 @@ parse_dotla_file(FILE *file, char **dlname, char **libdir, char **deplibs,
{
errors += trim (old_name, &line[sizeof (STR_OLD_LIBRARY) - 1]);
}
/* Windows native tools do not understand the POSIX paths we store
in libdir. */
#ifndef __WINDOWS__
#undef STR_LIBDIR
#define STR_LIBDIR "libdir="
else if (strncmp (line, STR_LIBDIR, sizeof (STR_LIBDIR) - 1) == 0)
{
errors += trim (libdir, &line[sizeof(STR_LIBDIR) - 1]);
}
#endif
#undef STR_DL_DEPLIBS
#define STR_DL_DEPLIBS "dependency_libs="
......@@ -1270,7 +1265,7 @@ try_dlopen (lt_dlhandle *phandle, const char *filename, const char *ext,
if (vtable)
{
/* name + "." + libext + NULL */
archive_name = MALLOC (char, LT_STRLEN (name) + strlen (libext) + 2);
archive_name = MALLOC (char, LT_STRLEN (name) + LT_STRLEN (libext) + 2);
*phandle = (lt_dlhandle) lt__zalloc (sizeof (struct lt__handle));
if ((*phandle == NULL) || (archive_name == NULL))
......@@ -1492,7 +1487,7 @@ try_dlopen (lt_dlhandle *phandle, const char *filename, const char *ext,
}
/* If the last error message stored was `FILE_NOT_FOUND', then return
/* If the last error messge store was `FILE_NOT_FOUND', then return
non-zero. */
static int
file_not_found (void)
......@@ -1512,7 +1507,7 @@ file_not_found (void)
static int
has_library_ext (const char *filename)
{
const char * ext = 0;
char * ext = 0;
assert (filename);
......@@ -1620,9 +1615,6 @@ lt_dlopenadvise (const char *filename, lt_dladvise advise)
{
lt_dlhandle handle = 0;
int errors = 0;
const char * saved_error = 0;
LT__GETERROR (saved_error);
/* Can't have symbols hidden and visible at the same time! */
if (advise && advise->is_symlocal && advise->is_symglobal)
......@@ -1659,7 +1651,6 @@ lt_dlopenadvise (const char *filename, lt_dladvise advise)
#if defined(LT_MODULE_EXT)
/* Try appending SHLIB_EXT. */
LT__SETERRORSTR (saved_error);
errors = try_dlopen (&handle, filename, shlib_ext, advise);
/* As before, if the file was found but loading failed, return now
......@@ -2071,7 +2062,7 @@ lt_dlerror (void)
LT__GETERROR (error);
LT__SETERRORSTR (0);
return error;
return error ? error : NULL;
}
static int
......
/* slist.c -- generalised singly linked lists
Copyright (C) 2000, 2004, 2007, 2008, 2009 Free Software Foundation, Inc.
Copyright (C) 2000, 2004, 2007, 2008 Free Software Foundation, Inc.
Written by Gary V. Vaughan, 2000
NOTE: The canonical source of this file is maintained with the
......@@ -32,7 +32,6 @@ or obtained by writing to the Free Software Foundation, Inc.,
#include "slist.h"
#include <stddef.h>
#include <stdlib.h>
static SList * slist_sort_merge (SList *left, SList *right,
SListCompare *compare, void *userdata);
......@@ -74,7 +73,7 @@ slist_delete (SList *head, void (*delete_fct) (void *item))
the stale item, you should probably return that from FIND if
it makes a successful match. Don't forget to slist_unbox()
every item in a boxed list before operating on its contents. */
SList *
void *
slist_remove (SList **phead, SListCallback *find, void *matchdata)
{
SList *stale = 0;
......@@ -108,7 +107,7 @@ slist_remove (SList **phead, SListCallback *find, void *matchdata)
}
}
return (SList *) result;
return result;
}
/* Call FIND repeatedly with each element of SLIST and MATCHDATA, until
......@@ -315,9 +314,6 @@ slist_sort (SList *slist, SListCompare *compare, void *userdata)
left = slist;
right = slist->next;
if (!right)
return left;
/* Skip two items with RIGHT and one with SLIST, until RIGHT falls off
the end. SLIST must be about half way along. */
while (right && (right = right->next))
......
This diff is collapsed.
......@@ -7,7 +7,7 @@
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
# serial 18 LTDL_INIT
# serial 17 LTDL_INIT
# LT_CONFIG_LTDL_DIR(DIRECTORY, [LTDL-MODE])
# ------------------------------------------
......@@ -407,7 +407,6 @@ AC_CHECK_HEADERS([unistd.h dl.h sys/dl.h dld.h mach-o/dyld.h dirent.h],
AC_CHECK_FUNCS([closedir opendir readdir], [], [AC_LIBOBJ([lt__dirent])])
AC_CHECK_FUNCS([strlcat strlcpy], [], [AC_LIBOBJ([lt__strl])])
m4_pattern_allow([LT_LIBEXT])dnl
AC_DEFINE_UNQUOTED([LT_LIBEXT],["$libext"],[The archive extension])
name=ltdl
......@@ -468,7 +467,7 @@ AC_CACHE_CHECK([whether deplibs are loaded by dlopen],
freebsd* | dragonfly*)
lt_cv_sys_dlopen_deplibs=yes
;;
gnu* | linux* | k*bsd*-gnu | kopensolaris*-gnu)
gnu* | linux* | k*bsd*-gnu)
# GNU and its variants, using gnu ld.so (Glibc)
lt_cv_sys_dlopen_deplibs=yes
;;
......
# Helper functions for option handling. -*- Autoconf -*-
#
# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
# Inc.
# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# 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.
# serial 7 ltoptions.m4
# serial 6 ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
......@@ -126,7 +125,7 @@ LT_OPTION_DEFINE([LT_INIT], [win32-dll],
[enable_win32_dll=yes
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
AC_CHECK_TOOL(AS, as, false)
AC_CHECK_TOOL(DLLTOOL, dlltool, false)
AC_CHECK_TOOL(OBJDUMP, objdump, false)
......@@ -134,13 +133,13 @@ case $host in
esac
test -z "$AS" && AS=as
_LT_DECL([], [AS], [1], [Assembler program])dnl
_LT_DECL([], [AS], [0], [Assembler program])dnl
test -z "$DLLTOOL" && DLLTOOL=dlltool
_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
test -z "$OBJDUMP" && OBJDUMP=objdump
_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
])# win32-dll
AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
......
......@@ -9,15 +9,15 @@
# Generated from ltversion.in.
# serial 3175 ltversion.m4
# serial 3017 ltversion.m4
# This file is part of GNU Libtool
m4_define([LT_PACKAGE_VERSION], [2.2.10])
m4_define([LT_PACKAGE_REVISION], [1.3175])
m4_define([LT_PACKAGE_VERSION], [2.2.6b])
m4_define([LT_PACKAGE_REVISION], [1.3017])
AC_DEFUN([LTVERSION_VERSION],
[macro_version='2.2.10'
macro_revision='1.3175'
[macro_version='2.2.6b'
macro_revision='1.3017'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
# Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
# 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.
# serial 5 lt~obsolete.m4
# serial 4 lt~obsolete.m4
# These exist entirely to fool aclocal when bootstrapping libtool.
#
......@@ -77,6 +77,7 @@ m4_ifndef([AC_DISABLE_FAST_INSTALL], [AC_DEFUN([AC_DISABLE_FAST_INSTALL])])
m4_ifndef([_LT_AC_LANG_CXX], [AC_DEFUN([_LT_AC_LANG_CXX])])
m4_ifndef([_LT_AC_LANG_F77], [AC_DEFUN([_LT_AC_LANG_F77])])
m4_ifndef([_LT_AC_LANG_GCJ], [AC_DEFUN([_LT_AC_LANG_GCJ])])
m4_ifndef([AC_LIBTOOL_RC], [AC_DEFUN([AC_LIBTOOL_RC])])
m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
m4_ifndef([_LT_AC_LANG_C_CONFIG], [AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
......@@ -89,10 +90,3 @@ m4_ifndef([AC_LIBTOOL_LANG_RC_CONFIG], [AC_DEFUN([AC_LIBTOOL_LANG_RC_CONFIG])])
m4_ifndef([_LT_AC_LANG_RC_CONFIG], [AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
m4_ifndef([AC_LIBTOOL_CONFIG], [AC_DEFUN([AC_LIBTOOL_CONFIG])])
m4_ifndef([_LT_AC_FILE_LTDLL_C], [AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS], [AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
m4_ifndef([_LT_AC_PROG_CXXCPP], [AC_DEFUN([_LT_AC_PROG_CXXCPP])])
m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS], [AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
m4_ifndef([_LT_PROG_ECHO_BACKSLASH], [AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
m4_ifndef([_LT_PROG_F77], [AC_DEFUN([_LT_PROG_F77])])
m4_ifndef([_LT_PROG_FC], [AC_DEFUN([_LT_PROG_FC])])
m4_ifndef([_LT_PROG_CXX], [AC_DEFUN([_LT_PROG_CXX])])
......@@ -43,7 +43,7 @@ while test $# -gt 0; do
echo "-I${includedir} -fopenmp"
;;
--cxxflags)
echo '-g -O2 -pthread'
echo '-pthread'
;;
--cppflags)
echo '-I/usr/local/include/ImageMagick'
......
......@@ -161,9 +161,7 @@
#endif
/* define if bool is a built-in type */
#ifndef MAGICKCORE_HAVE_BOOL
#define MAGICKCORE_HAVE_BOOL /**/
#endif
/* #undef HAVE_BOOL */
/* Define to 1 if you have the `cimag' function. */
#ifndef MAGICKCORE_HAVE_CIMAG
......@@ -447,9 +445,7 @@
#endif
/* define if the compiler implements L"widestring" */
#ifndef MAGICKCORE_HAVE_LSTRING
#define MAGICKCORE_HAVE_LSTRING /**/
#endif
/* #undef HAVE_LSTRING */
/* Define this if a modern libltdl is already installed */
#ifndef MAGICKCORE_HAVE_LTDL
......@@ -498,14 +494,10 @@
#endif
/* define if the compiler implements namespaces */
#ifndef MAGICKCORE_HAVE_NAMESPACES
#define MAGICKCORE_HAVE_NAMESPACES /**/
#endif
/* #undef HAVE_NAMESPACES */
/* Define if g++ supports namespace std. */
#ifndef MAGICKCORE_HAVE_NAMESPACE_STD
#define MAGICKCORE_HAVE_NAMESPACE_STD /**/
#endif
/* #undef HAVE_NAMESPACE_STD */
/* Define to 1 if you have the `nanosleep' function. */
#ifndef MAGICKCORE_HAVE_NANOSLEEP
......@@ -706,9 +698,7 @@
#endif
/* define if the compiler supports ISO C++ standard library */
#ifndef MAGICKCORE_HAVE_STD_LIBS
#define MAGICKCORE_HAVE_STD_LIBS /**/
#endif
/* #undef HAVE_STD_LIBS */
/* Define to 1 if you have the `strcasecmp' function. */
#ifndef MAGICKCORE_HAVE_STRCASECMP
......
......@@ -43,7 +43,7 @@ while test $# -gt 0; do
echo "-I${includedir} -fopenmp"
;;
--cxxflags)
echo '-g -O2 -pthread'
echo '-pthread'
;;
--cppflags)
echo '-I/usr/local/include/ImageMagick'
......
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