[as-devel] PATCH: fix install paths for libAfter{Image,Base}.a

CaT (cat@zip.com.au)
Mon, 23 Jun 2003 17:36:59 +1000



--d6Gm4EdcadzBjdND
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Not sure if this is the best way to do this but it's what I managed to
figure out and it works. :)

Currently there is a problem where if you choose a prefix other then
/usr/local for your afterstep install, the configure script will ignore
your selection for libAfter{Image,Base} so that they wind up getting
installed in /usr/local regardless. The attached patch fixes that
behaviour.

-- 
Martin's distress was in contrast to the bitter satisfaction of some
of his fellow marines as they surveyed the scene. "The Iraqis are sick
people and we are the chemotherapy," said Corporal Ryan Dupre. "I am
starting to hate this country. Wait till I get hold of a friggin' Iraqi.
No, I won't get hold of one. I'll just kill him."
	- http://www.informationclearinghouse.info/article2479.htm

--d6Gm4EdcadzBjdND
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="afterstep-cvs20030823.configlibpathsfix.patch"

--- afterstep-stable.static/autoconf/configure.in	Thu Jun 19 12:31:48 2003
+++ afterstep-stable/autoconf/configure.in	Mon Jun 23 17:33:27 2003
@@ -239,32 +239,47 @@
 FROM_AFTERSTEP_CONFIGURE=yes
 export FROM_AFTERSTEP_CONFIGURE
 
+_def_lib_conf_opts=" \
+	--prefix=${prefix} \
+	--exec-prefix=${exec_prefix} \
+	--bindir=${bindir} \
+	--sbindir=${sbindir} \
+	--libexecdir=${libexecdir} \
+	--datadir=${datadir} \
+	--sysconfdir=${sysconfdir} \
+	--sharedstatedir=${sharedstatedir} \
+	--localstatedir=${localstatedir} \
+	--libdir=${libdir} \
+	--includedir=${includedir} \
+	--oldincludedir=${oldincludedir} \
+	--infodir=${infodir} \
+	--mandir=${mandir} \
+	--with-x-includes=${x_includes} \
+	--with-x=${with_x} \
+	--enable-audit=${enable_audit} \
+	--enable-trace=${enable_trace} \
+"
+
 if test -d libAfterBase; then
   AC_CHECKING(libAfterBase)
-  cd libAfterBase ; \
-  ./configure --with-x-includes=$x_includes \
-   --with-x=$with_x \
-   --enable-audit=$enable_audit \
-   --enable-trace=$enable_trace \
-   --enable-trace-x=$enable_trace_x ; \
-  cd ../ ;
-  afterbase_includes=".. -I../.." ;
+  cd libAfterBase; \
+  ./configure $_def_lib_conf_opts \
+   --enable-trace-x=$enable_trace_x; \
+  cd ../
+  afterbase_includes=".. -I../.."
   afterbase_lib=
 fi
 
 if test -d libAfterBase; then
   AC_CHECKING(libAfterImage)
-  cd libAfterImage ; \
-  ./configure --with-x-includes=$x_includes \
-   --with-x=$with_x \
+  cd libAfterImage; \
+  ./configure $_def_lib_conf_opts \
    --with-xpm=$with_xpm   --with-builtin-xpm=$with_builtin_xpm  --with-xpm-includes=$xpm_includes \
    --with-jpeg=$with_jpeg --with-jpeg-includes=$jpeg_includes \
    --with-png=$with_png   --with-png-includes=$png_includes \
    --with-gif-includes=$gif_includes \
    --with-tiff=$with_tiff --with-tiff-includes=$tiff_includes \
    --with-ttf=$with_ttf   --with-ttf-includes=$ttf_includes \
-   --enable-audit=$enable_audit \
-   --enable-trace=$enable_trace \
    --enable-mmx-optimization=$enable_mmx_optimization \
    --with-ungif=$with_ungif --with-gif=$with_gif; \
    cd ../

--d6Gm4EdcadzBjdND--