(no commit message)

diff --git a/Makefile.am b/Makefile.am
index 529361254385e83a48700c9bf14fc4afda8d4fa7..201e3bddd082e5f0d402fccda0d3cdd0234b5c06 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,7 +25,7 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir)
 
 ACLOCAL_AMFLAGS = -I m4
 
-MODULECOMMONFLAGS = -no-undefined -export-symbols-regex ".*" -module -avoid-version
+MODULECOMMONFLAGS = -no-undefined -export-symbols-regex ".*" -shared -module -avoid-version
 
 # Options to pass when running configure in the distcheck target.
 #

diff --git a/Makefile.in b/Makefile.in
index d61088adfa40d51069ff8be4a4dd374804275941..4208286915d0ec989da1f6e8fac3993eec1939ed 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2543,7 +2543,7 @@ AM_CPPFLAGS = -I$(top_builddir) -I$(top_srcdir) \
        -I$(srcdir)/ltdl -I$(srcdir)/ltdl/libltdl \
        -I$(top_srcdir)/Magick++/lib
 ACLOCAL_AMFLAGS = -I m4
-MODULECOMMONFLAGS = -no-undefined -export-symbols-regex ".*" -module -avoid-version
+MODULECOMMONFLAGS = -no-undefined -export-symbols-regex ".*" -shared -module -avoid-version
 
 # Options to pass when running configure in the distcheck target.
 #

diff --git a/magick/utility.c b/magick/utility.c
index 196f94f651b593510ee3bed323e14d55c0a1434c..3e242bfa44e139828f80beda0f5ccf3f362e9c61 100644 (file)
--- a/magick/utility.c
+++ b/magick/utility.c
@@ -702,7 +702,6 @@ MagickExport MagickBooleanType ExpandFilenames(int *number_arguments,
     Expand any wildcard filenames.
   */
   *home_directory='\0';
-  cwd=getcwd(home_directory,MaxTextExtent);
   count=0;
   for (i=0; i < (long) *number_arguments; i++)
   {
@@ -758,6 +757,8 @@ MagickExport MagickBooleanType ExpandFilenames(int *number_arguments,
         GetPathComponent(option,HeadPath,path);
         GetPathComponent(option,SubimagePath,subimage);
         ExpandFilename(path);
+        if (*home_directory == '\0')
+          cwd=getcwd(home_directory,MaxTextExtent-1);
         filelist=ListFiles(*path == '\0' ? home_directory : path,filename,
           &number_files);
       }