(no commit message)

diff --git a/Makefile.in b/Makefile.in
index 4e38cb2b5aeac68358b00db5906cce7abd7875e3..1847b2eef9498a4b2e0e96e331fcbc5411727a15 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2316,6 +2316,7 @@ CGMDecodeDelegate = @CGMDecodeDelegate@
 CL_CFLAGS = @CL_CFLAGS@
 CL_LIBS = @CL_LIBS@
 CODER_PATH = @CODER_PATH@
+CONFIGDIR_ARCH = @CONFIGDIR_ARCH@
 CONFIGURE_ARGS = @CONFIGURE_ARGS@
 CONFIGURE_PATH = @CONFIGURE_PATH@
 CONFIG_STATUS_DEPENDENCIES = @CONFIG_STATUS_DEPENDENCIES@
@@ -2383,6 +2384,7 @@ HTMLDecodeDelegate = @HTMLDecodeDelegate@
 ILBMDecodeDelegate = @ILBMDecodeDelegate@
 ILBMEncodeDelegate = @ILBMEncodeDelegate@
 INCLTDL = @INCLTDL@
+INCLUDEDIR_ARCH = @INCLUDEDIR_ARCH@
 INCLUDE_DIR = @INCLUDE_DIR@
 INFO_DIR = @INFO_DIR@
 INSTALL = @INSTALL@

diff --git a/config/configure.xml b/config/configure.xml
index 09db7bf033bc78f60193d0edb8c7c2eec1c03c7f..1aff39a8e4a61a243eff3919a169ff438a77b847 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -20,6 +20,8 @@
   <configure name="DOCUMENTATION_PATH" value="/usr/local/share/doc/ImageMagick/"/>
   <configure name="EXECUTABLE_PATH" value="/usr/local/bin"/>
   <configure name="LIBRARY_PATH" value="/usr/local/lib/ImageMagick-7.0.0"/>
+  <configure name="INCLUDEDIR_ARCH" value="/usr/local/include"/>
+  <configure name="CONFIGDIR_ARCH" value="/usr/local/lib/ImageMagick-7.0.0"/>
   <configure name="CODER_PATH" value="/usr/local/lib/ImageMagick-7.0.0/modules-Q16/coders"/>
   <configure name="FILTER_PATH" value="/usr/local/lib/ImageMagick-7.0.0/modules-Q16/filters"/>
   <configure name="CC" value="gcc -std=gnu99 -std=gnu99"/>

diff --git a/config/configure.xml.in b/config/configure.xml.in
index 42600b4074c8e7dba46967b454c7c3031b694cfc..0aac08f9c4cec0ca699181e30de6024c0fa6d732 100644 (file)
--- a/config/configure.xml.in
+++ b/config/configure.xml.in
@@ -20,6 +20,8 @@
   <configure name="DOCUMENTATION_PATH" value="@DOCUMENTATION_PATH@"/>
   <configure name="EXECUTABLE_PATH" value="@EXECUTABLE_PATH@"/>
   <configure name="LIBRARY_PATH" value="@LIBRARY_PATH@"/>
+  <configure name="INCLUDEDIR_ARCH" value="@INCLUDEDIR_ARCH@"/>
+  <configure name="CONFIGDIR_ARCH" value="@CONFIGDIR_ARCH@"/>
   <configure name="CODER_PATH" value="@CODER_PATH@"/>
   <configure name="FILTER_PATH" value="@FILTER_PATH@"/>
   <configure name="CC" value="@CC@"/>

diff --git a/configure b/configure
index 78752d3ee016bf6e050ff8ff00ffad50ba547eb8..0d13684e7a776618ee50c4d6fb8f542b889ac708 100755 (executable)
--- a/configure
+++ b/configure
@@ -917,6 +917,8 @@ PTHREAD_CFLAGS
 PTHREAD_LIBS
 PTHREAD_CC
 ax_pthread_config
+CONFIGDIR_ARCH
+INCLUDEDIR_ARCH
 WinPathScript
 USING_CL_FALSE
 USING_CL_TRUE
@@ -8270,6 +8272,8 @@ cat >>confdefs.h <<_ACEOF
 #define INCLUDEDIR_ARCH "$includedir_arch"
 _ACEOF
 
+INCLUDEDIR_ARCH="$includedir_arch"
+
 
 #
 # ARCH specific configuration directory
@@ -8288,6 +8292,8 @@ cat >>confdefs.h <<_ACEOF
 #define CONFIGDIR_ARCH "$configdir_arch"
 _ACEOF
 
+CONFIGDIR_ARCH="$configdir_arch"
+
 
 #
 # Enable support for threads

diff --git a/configure.ac b/configure.ac
index 0826a07cd6dbb4c3689a4517b804d1cecc8c3168..523fc646023ce4b19b0ef0fb987276c908b431ba 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -386,6 +386,8 @@ AC_ARG_WITH([includedir-arch],
                     [includedir_arch=$INCLUDE_DIR])
 
 AC_DEFINE_UNQUOTED(INCLUDEDIR_ARCH,"$includedir_arch",[ARCH specific include directory])
+INCLUDEDIR_ARCH="$includedir_arch"
+AC_SUBST(INCLUDEDIR_ARCH)
 
 #
 # ARCH specific configuration directory
@@ -397,6 +399,8 @@ AC_ARG_WITH([configdir-arch],
                     [configdir_arch="${LIB_DIR}/${PACKAGE_NAME}-${PACKAGE_VERSION}"])
 
 AC_DEFINE_UNQUOTED(CONFIGDIR_ARCH,"$configdir_arch",[ARCH specific config directory])
+CONFIGDIR_ARCH="$configdir_arch"
+AC_SUBST(CONFIGDIR_ARCH)
 
 #
 # Enable support for threads