Enlightenment CVS committal
Author : raster
Project : e17
Module : libs/ecore
Dir : e17/libs/ecore
Modified Files:
configure.in
Log Message:
fix x build/link in some weird circumstnaces
===================================================================
RCS file: /cvs/e/e17/libs/ecore/configure.in,v
retrieving revision 1.146
retrieving revision 1.147
diff -u -3 -r1.146 -r1.147
--- configure.in 23 Jul 2006 21:40:02 -0000 1.146
+++ configure.in 7 Aug 2006 07:03:12 -0000 1.147
@@ -18,38 +18,34 @@
AM_PROG_LIBTOOL
AC_C___ATTRIBUTE__
-dnl Set PACKAGE_DATA_DIR in config.h.
-if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR,
"${ac_default_prefix}/share/${PACKAGE}", [Shared Data Directory])
-else
- AC_DEFINE_UNQUOTED(PACKAGE_DATA_DIR, "${prefix}/share/${PACKAGE}", [Shared
Data Directory])
-fi
-
-dnl Set PACKAGE_BIN_DIR in config.h.
if test "x${bindir}" = 'xNONE'; then
if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${ac_default_prefix}/bin",
[Installation Directory for User Executables])
+ PACKAGE_BIN_DIR="${ac_default_prefix}/bin"
else
- AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${prefix}/bin", [Installation
Directory for User Executables])
+ PACKAGE_BIN_DIR="${prefix}/bin"
fi
else
- AC_DEFINE_UNQUOTED(PACKAGE_BIN_DIR, "${bindir}", [Installation Directory for
User Executables])
+ PACKAGE_BIN_DIR="${bindir}"
fi
+AC_SUBST(PACKAGE_BIN_DIR)
-dnl Set PACKAGE_LIB_DIR in config.h.
if test "x${libdir}" = 'xNONE'; then
if test "x${prefix}" = "xNONE"; then
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${ac_default_prefix}/lib",
[Installation Directory for Libraries])
+ PACKAGE_LIB_DIR="${ac_default_prefix}/lib"
else
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${prefix}/lib", [Installation
Directory for Libraries])
+ PACKAGE_LIB_DIR="${prefix}/lib"
fi
else
- AC_DEFINE_UNQUOTED(PACKAGE_LIB_DIR, "${libdir}", [Installation Directory for
Libraries])
+ PACKAGE_LIB_DIR="${libdir}"
+fi
+AC_SUBST(PACKAGE_LIB_DIR)
+
+if test "x${prefix}" = "xNONE"; then
+ PACKAGE_DATA_DIR="${ac_default_prefix}/share/${PACKAGE}"
+else
+ PACKAGE_DATA_DIR="${prefix}/share/${PACKAGE}"
fi
-
-dnl Set PACKAGE_SOURCE_DIR in config.h.
-packagesrcdir=`cd $srcdir && pwd`
-AC_DEFINE_UNQUOTED(PACKAGE_SOURCE_DIR, "${packagesrcdir}", [Source Code
Directory])
+AC_SUBST(PACKAGE_DATA_DIR)
dnl Use -Wall if we have gcc.
changequote(,)dnl
@@ -177,7 +173,6 @@
x_includes="";
x_cflags="";
x_libs="";
-x_ldflags="";
if test "x$have_ecore_txt" = "xyes"; then
AC_MSG_CHECKING(whether ecore_x module is to be built)
@@ -208,7 +203,6 @@
x_dir=${x_dir:-/usr/X11R6}
x_cflags=${x_cflags:--I${x_includes:-$x_dir/include}}
x_libs="${x_libs:--L${x_libraries:-$x_dir/lib}} -lX11 -lXext"
- x_ldflags=" "$ecore_x_libs;
ecore_x_libs="-lecore_x";
],[
AM_CONDITIONAL(BUILD_ECORE_X, false)
@@ -220,7 +214,6 @@
AC_SUBST(x_cflags)
AC_SUBST(x_includes)
-AC_SUBST(x_ldflags)
AC_SUBST(x_libs)
if test "x$have_ecore_x" = "xyes"; then
@@ -242,7 +235,7 @@
Xcursor_libs=""
use_Xcursor="no"
], [
- $x_libs $x_ldflags -lXrender
+ $x_libs -lXrender
]
)
], [
@@ -276,7 +269,7 @@
Xprint_libs=""
use_Xprint="no"
], [
- $x_libs $x_ldflags
+ $x_libs
]
)
], [
@@ -310,7 +303,7 @@
Xinerama_libs=""
use_Xinerama="no"
], [
- $x_libs $x_ldflags
+ $x_libs
]
)
], [
@@ -344,7 +337,7 @@
Xrandr_libs=""
use_Xrandr="no"
], [
- $x_libs $x_ldflags
+ $x_libs
]
)
], [
@@ -378,7 +371,7 @@
Xss_libs=""
use_Xss="no"
], [
- $x_libs $x_ldflags
+ $x_libs
]
)
], [
@@ -412,7 +405,7 @@
Xrender_libs=""
use_Xrender="no"
], [
- $x_libs $x_ldflags
+ $x_libs
]
)
], [
@@ -446,7 +439,7 @@
Xfixes_libs=""
use_Xfixes="no"
], [
- $x_libs $x_ldflags
+ $x_libs
]
)
], [
@@ -480,7 +473,7 @@
Xdamage_libs=""
use_Xdamage="no"
], [
- $x_libs $x_ldflags
+ $x_libs
]
)
], [
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys -- and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
enlightenment-cvs mailing list
enlightenment-cvs@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-cvs
