Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v.in.dwg: Retire v.in.dwg infavor of v.in.redwg #4329

Merged
merged 1 commit into from
Sep 19, 2024
Merged

v.in.dwg: Retire v.in.dwg infavor of v.in.redwg #4329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
151 changes: 0 additions & 151 deletions configure
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -666,10 +666,6 @@ USE_PTHREAD
PTHREADLIB
PTHREADLIBPATH
PTHREADINCPATH
USE_OPENDWG
OPENDWGLIB
OPENDWGLIBPATH
OPENDWGINCPATH
HAVE_NLS
INTLLIB
FTLIB
Expand Down Expand Up @@ -912,7 +908,6 @@ with_cairo
with_freetype
with_nls
with_readline
with_opendwg
with_regex
with_pthread
with_openmp
Expand Down Expand Up @@ -964,8 +959,6 @@ with_freetype_libs
with_proj_includes
with_proj_libs
with_proj_share
with_opendwg_includes
with_opendwg_libs
with_regex_includes
with_regex_libs
with_pthread_includes
Expand Down Expand Up @@ -1647,7 +1640,6 @@ Optional Packages:
--with-freetype support FreeType functionality (default: yes)
--with-nls support NLS functionality (default: no)
--with-readline support Readline functionality (default: no)
--with-opendwg support openDWG functionality (default: no)
--with-regex support regex functionality (default: yes)
--with-pthread support POSIX threads functionality (default: no)
--with-openmp support OpenMP functionality (default: no)
Expand Down Expand Up @@ -1734,10 +1726,6 @@ Optional Packages:
External PROJ.4 include files are in DIRS
--with-proj-libs=DIRS External PROJ.4 library files are in DIRS
--with-proj-share=DIR External PROJ.4 data files are in DIR
--with-opendwg-includes=DIRS
openDWG include files are in DIRS
--with-opendwg-libs=DIRS
openDWG library files are in DIRS
--with-regex-includes=DIRS
regex include files are in DIRS
--with-regex-libs=DIRS regex library files are in DIRS
Expand Down Expand Up @@ -5566,17 +5554,6 @@ fi



# Check whether --with-opendwg was given.
if test ${with_opendwg+y}
then :
withval=$with_opendwg;
else $as_nop
with_opendwg=no
fi




# Check whether --with-regex was given.
if test ${with_regex+y}
then :
Expand Down Expand Up @@ -6069,25 +6046,6 @@ fi



# Check whether --with-opendwg-includes was given.
if test ${with_opendwg_includes+y}
then :
withval=$with_opendwg_includes;
fi




# Check whether --with-opendwg-libs was given.
if test ${with_opendwg_libs+y}
then :
withval=$with_opendwg_libs;
fi





# Check whether --with-regex-includes was given.
if test ${with_regex_includes+y}
then :
Expand Down Expand Up @@ -15207,113 +15165,6 @@ fi



# Enable openDWG option


{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether to use openDWG" >&5
printf %s "checking whether to use openDWG... " >&6; }
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: \"$with_opendwg\"" >&5
printf "%s\n" "\"$with_opendwg\"" >&6; }
case "$with_opendwg" in
"no") USE_OPENDWG= ;;
"yes") USE_OPENDWG="1" ;;
*) as_fn_error $? "*** You must answer yes or no." "$LINENO" 5 ;;
esac



OPENDWGINCPATH=
OPENDWGLIBPATH=
OPENDWGLIB=

if test -n "${USE_OPENDWG}"; then

# With OPENDWG includes directory


{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of openDGW includes" >&5
printf %s "checking for location of openDGW includes... " >&6; }
case "$with_opendwg_includes" in
y | ye | yes | n | no)
as_fn_error $? "*** You must supply a directory to --with-opendwg-includes." "$LINENO" 5
;;
esac
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_opendwg_includes" >&5
printf "%s\n" "$with_opendwg_includes" >&6; }

if test -n "$with_opendwg_includes" ; then
for dir in $with_opendwg_includes; do
if test -d "$dir"; then
OPENDWGINCPATH="$OPENDWGINCPATH -I$dir"
else
as_fn_error $? "*** openDGW includes directory $dir does not exist." "$LINENO" 5
fi
done
fi



ac_save_cppflags="$CPPFLAGS"
CPPFLAGS="$OPENDWGINCPATH $CPPFLAGS"
for ac_header in ad2.h
do :
ac_fn_c_check_header_compile "$LINENO" "ad2.h" "ac_cv_header_ad2_h" "$ac_includes_default"
if test "x$ac_cv_header_ad2_h" = xyes
then :
printf "%s\n" "#define HAVE_AD2_H 1" >>confdefs.h

else $as_nop

as_fn_error $? "*** Unable to locate openDWG includes." "$LINENO" 5

fi

done
CPPFLAGS=$ac_save_cppflags


# With OPENDWG library directory


{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for location of openDWG library" >&5
printf %s "checking for location of openDWG library... " >&6; }
case "$with_opendwg_libs" in
y | ye | yes | n | no)
as_fn_error $? "*** You must supply a directory to --with-opendwg-libs." "$LINENO" 5
;;
esac
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: result: $with_opendwg_libs" >&5
printf "%s\n" "$with_opendwg_libs" >&6; }

if test -n "$with_opendwg_libs"; then
for dir in $with_opendwg_libs; do
if test -d "$dir"; then
OPENDWGLIBPATH="$OPENDWGLIBPATH -L$dir"
else
as_fn_error $? "*** openDWG library directory $dir does not exist." "$LINENO" 5
fi
done
fi


#search for ad2.a, ad3.a ... in openDWG toolkit directory:
#FIX ME how to program this test??
#LOC_CHECK_LIBS(ad?.a,adSeekLayer,openDWG,$OPENDWGLIBPATH,OPENDWGLIB,,)
#
#for now hack (but working):
TRUEOPENDWGLIBPATH=`echo "$OPENDWGLIBPATH" | cut -b3-`
adlib=`ls -1 "$TRUEOPENDWGLIBPATH"/ad?.a | tail -1`
OPENDWGLIB="$adlib"

fi # $USE_OPENDWG






# Done checking OPENDWG

# Enable pthread option


Expand Down Expand Up @@ -17688,8 +17539,6 @@ echo " C++ support: `if test -n "${USE_CXX}" ; then echo yes ; e

echo " Cairo support: `if test -n "${USE_CAIRO}" ; then echo yes ; else echo no ; fi`"

echo " DWG support: `if test -n "${USE_OPENDWG}" ; then echo yes ; else echo no ; fi`"

echo " FFTW support: `if test -n "${USE_FFTW}" ; then echo yes ; else echo no ; fi`"

echo " FreeType support: `if test -n "${USE_FREETYPE}" ; then echo yes ; else echo no ; fi`"
Expand Down
43 changes: 0 additions & 43 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,7 +312,6 @@ LOC_ARG_WITH(cairo, Cairo)
LOC_ARG_WITH(freetype, FreeType)
LOC_ARG_WITH(nls, NLS, no)
LOC_ARG_WITH(readline, Readline, no)
LOC_ARG_WITH(opendwg, openDWG, no)
LOC_ARG_WITH(regex, regex)
LOC_ARG_WITH(pthread, POSIX threads, no)
LOC_ARG_WITH(openmp, OpenMP, no)
Expand Down Expand Up @@ -411,9 +410,6 @@ LOC_ARG_WITH_INC(proj, External PROJ.4)
LOC_ARG_WITH_LIB(proj, External PROJ.4)
LOC_ARG_WITH_SHARE(proj, External PROJ.4)

LOC_ARG_WITH_INC(opendwg, openDWG)
LOC_ARG_WITH_LIB(opendwg, openDWG)

LOC_ARG_WITH_INC(regex, regex)
LOC_ARG_WITH_LIB(regex, regex)

Expand Down Expand Up @@ -1860,44 +1856,6 @@ fi
AC_SUBST(INTLLIB)
AC_SUBST(HAVE_NLS)

# Enable openDWG option

LOC_CHECK_USE(opendwg,openDWG,USE_OPENDWG)

OPENDWGINCPATH=
OPENDWGLIBPATH=
OPENDWGLIB=

if test -n "${USE_OPENDWG}"; then

# With OPENDWG includes directory

LOC_CHECK_INC_PATH(opendwg,openDGW,OPENDWGINCPATH)

LOC_CHECK_INCLUDES(ad2.h,openDWG,$OPENDWGINCPATH)

# With OPENDWG library directory

LOC_CHECK_LIB_PATH(opendwg,openDWG,OPENDWGLIBPATH)

#search for ad2.a, ad3.a ... in openDWG toolkit directory:
#FIX ME how to program this test??
#LOC_CHECK_LIBS(ad?.a,adSeekLayer,openDWG,$OPENDWGLIBPATH,OPENDWGLIB,,)
#
#for now hack (but working):
TRUEOPENDWGLIBPATH=`echo "$OPENDWGLIBPATH" | cut -b3-`
adlib=`ls -1 "$TRUEOPENDWGLIBPATH"/ad?.a | tail -1`
OPENDWGLIB="$adlib"

fi # $USE_OPENDWG

AC_SUBST(OPENDWGINCPATH)
AC_SUBST(OPENDWGLIBPATH)
AC_SUBST(OPENDWGLIB)
AC_SUBST(USE_OPENDWG)

# Done checking OPENDWG

# Enable pthread option

LOC_CHECK_USE(pthread,POSIX threads,USE_PTHREAD)
Expand Down Expand Up @@ -2072,7 +2030,6 @@ LOC_MSG_USE(BLAS support,USE_BLAS)
LOC_MSG_USE(BZIP2 support,USE_BZIP2)
LOC_MSG_USE(C++ support,USE_CXX)
LOC_MSG_USE(Cairo support,USE_CAIRO)
LOC_MSG_USE(DWG support,USE_OPENDWG)
LOC_MSG_USE(FFTW support,USE_FFTW)
LOC_MSG_USE(FreeType support,USE_FREETYPE)
LOC_MSG_USE(GDAL support,USE_GDAL)
Expand Down
6 changes: 0 additions & 6 deletions include/Make/Platform.make.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -203,12 +203,6 @@ PROJINC = @PROJINC@
PROJLIB = @PROJLIB@
PROJSHARE = @PROJSHARE@

#OPENDWG:
OPENDWGINCPATH = @OPENDWGINCPATH@
OPENDWGLIBPATH = @OPENDWGLIBPATH@
OPENDWGLIB = @OPENDWGLIB@
USE_OPENDWG = @USE_OPENDWG@

#cairo
CAIROINC = @CAIROINC@
CAIROLIB = @CAIROLIB@
Expand Down
1 change: 0 additions & 1 deletion vector/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,6 @@ SUBDIRS = \
v.out.ogr \
v.in.ogr \
v.external \
v.in.dwg \
v.in.lidar \
v.external.out

Expand Down
31 changes: 0 additions & 31 deletions vector/v.in.dwg/Makefile
View file
Open in desktop

This file was deleted.

23 changes: 0 additions & 23 deletions vector/v.in.dwg/README
View file
Open in desktop

This file was deleted.

7 changes: 0 additions & 7 deletions vector/v.in.dwg/WARNING
View file
Open in desktop

This file was deleted.

Loading
Loading