Remove enlightenment-config source of miscompilation. You should use pkg-config now.

SVN revision: 36712

diff --git a/Makefile.am b/Makefile.am
index 925ce83..8df5af8 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,8 +6,6 @@ MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.guess \
                       stamp-h.in acconfig.h \
                       enlightenment.spec enlightenment.pc
 
-bin_SCRIPTS = enlightenment-config
-
 EXTRA_DIST = config.rpath  README AUTHORS COPYING COPYING-PLAIN \
              enlightenment.spec.in enlightenment.spec enlightenment.pc
 

diff --git a/configure.ac b/configure.ac
index 8f9f9d3..5561e22 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -458,7 +458,4 @@ doc/Makefile
 config/Makefile
 config/default/Makefile
 po/Makefile.in
-enlightenment-config
-],[
-chmod +x enlightenment-config
 ])

diff --git a/data/other/enlightenment_remote b/data/other/enlightenment_remote
index e25abef..cb0f44b 100644 (file)
--- a/data/other/enlightenment_remote
+++ b/data/other/enlightenment_remote
@@ -233,8 +233,8 @@ _enlightenment_remote() {
                return 0
                ;;
        -module-load)
-               extra_dir=$(enlightenment-config --module-dir)
-               # This is a hack. enlightenment-config should return extra dir and standard dir
+               extra_dir=$(pkg-config --variable=modules enlightenment)
+               # This is a hack. pkg-config should return extra dir and standard dir
                dir=${extra_dir%_extra}
                modules=$(cd ${dir} && /bin/ls && cd ${extra_dir} && /bin/ls)
                COMPREPLY=($(compgen -W "${modules}" -- "${cur}"))

diff --git a/debian/e17-dev.install b/debian/e17-dev.install
index b591f85..97f88c7 100644 (file)
--- a/debian/e17-dev.install
+++ b/debian/e17-dev.install
@@ -1,2 +1 @@
-debian/tmp/usr/bin/enlightenment-config
 debian/tmp/usr/include/enlightenment/*.h

diff --git a/debian/rules b/debian/rules
index a97c66c..fad6409 100644 (file)
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,6 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk
 DEB_FIXPERMS_EXCLUDE := enlightenment_sys freqset tempget batget
 DEB_MAKE_CLEAN_TARGET := clean
 DEB_INSTALL_MANPAGES_e17 := $(DEB_SRCDIR)/debian/enlightenment.1 $(DEB_SRCDIR)/debian/enlightenment_*.1
-DEB_INSTALL_MANPAGES_e17-dev := $(DEB_SRCDIR)/debian/enlightenment-config.1
 DEB_DH_STRIP_ARGS := --dbg-package=e17-dbg
 DEB_CONFIGURE_EXTRA_FLAGS := --disable-rpath
 

diff --git a/enlightenment-config.in b/enlightenment-config.in
deleted file mode 100644 (file)
index 9c2207b..0000000
--- a/enlightenment-config.in
+++ /dev/null
@@ -1,65 +0,0 @@
-#!/bin/sh
-
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-exec_prefix_set=no
-
-usage="\
-Usage: $0 [--prefix[=DIR]] [--exec-prefix[=DIR]] [--version] [--libs] [--cflags]"
-
-if test $# -eq 0; then
-      echo "${usage}" 1>&2
-      exit 1
-fi
-
-while test $# -gt 0; do
-  case "$1" in
-  -*=*) optarg=`echo "$1" | sed 's/[-_a-zA-Z0-9]*=//'` ;;
-  *) optarg= ;;
-  esac
-
-  case $1 in
-    --prefix=*)
-      prefix=$optarg
-      if test $exec_prefix_set = no ; then
-        exec_prefix=$optarg
-      fi
-      ;;
-    --prefix)
-      echo $prefix
-      ;;
-    --exec-prefix=*)
-      exec_prefix=$optarg
-      exec_prefix_set=yes
-      ;;
-    --exec-prefix)
-      echo $exec_prefix
-      ;;
-    --version)
-      echo @VERSION@
-      ;;
-    --cflags)
-      includes="-I@prefix@/include/enlightenment"
-      echo $includes @e_cflags@
-      ;;
-    --libs)
-      libdirs="-L@libdir@"
-      echo $libdirs
-      ;;
-    --module-dir)
-      dir="@libdir@/@PACKAGE@/modules"
-      echo $dir
-      ;;
-    --config-apps-dir)
-      dir="@prefix@/share/@PACKAGE@/config-apps"
-      echo $dir
-      ;;
-    *)
-      echo "${usage}" 1>&2
-      exit 1
-      ;;
-  esac
-  shift
-done
-
-exit 0

diff --git a/enlightenment.spec.in b/enlightenment.spec.in
index e6bdc78..99a360e 100644 (file)
--- a/enlightenment.spec.in
+++ b/enlightenment.spec.in
@@ -68,7 +68,6 @@ test "x$RPM_BUILD_ROOT" != "x/" && rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %defattr(-, root, root)
-%{_bindir}/enlightenment-config
 %{_includedir}/enlightenment
 %{_libdir}/pkgconfig/*.pc